diff options
210 files changed, 2684 insertions, 2147 deletions
diff --git a/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF index a081ec4fe..41a28b28e 100644 --- a/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.gmf.ecore.editor/META-INF/MANIFEST.MF @@ -32,5 +32,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.edit;visibility:=reexport, org.eclipse.emf.query.ocl;visibility:=reexport, - org.eclipse.emf.ocl;visibility:=reexport + org.eclipse.emf.ocl;visibility:=reexport, + org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport, + org.eclipse.draw2d;visibility:=reexport Eclipse-LazyStart: true diff --git a/examples/org.eclipse.gmf.ecore.editor/models/ecore.gmfgen b/examples/org.eclipse.gmf.ecore.editor/models/ecore.gmfgen index eceace8dd..75387623a 100644 --- a/examples/org.eclipse.gmf.ecore.editor/models/ecore.gmfgen +++ b/examples/org.eclipse.gmf.ecore.editor/models/ecore.gmfgen @@ -12,6 +12,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAttribute"/> @@ -20,7 +22,10 @@ </modelFacet> <labels visualID="4001" editPartClassName="EAttribute_nameEditPart" itemSemanticEditPolicyClassName="EAttribute_nameItemSemanticEditPolicy" notationViewFactoryClassName="EAttribute_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" editPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -31,6 +36,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EOperation"/> @@ -39,7 +46,10 @@ </modelFacet> <labels visualID="4002" editPartClassName="EOperation_nameEditPart" itemSemanticEditPolicyClassName="EOperation_nameItemSemanticEditPolicy" notationViewFactoryClassName="EOperation_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -50,6 +60,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAnnotation"/> @@ -58,7 +70,10 @@ </modelFacet> <labels visualID="4003" editPartClassName="EAnnotation_sourceEditPart" itemSemanticEditPolicyClassName="EAnnotation_sourceItemSemanticEditPolicy" notationViewFactoryClassName="EAnnotation_sourceViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAnnotation/source"/> </modelFacet> @@ -69,6 +84,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@topLevelNodes.0/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EClass"/> @@ -77,7 +94,10 @@ </modelFacet> <labels visualID="4005" editPartClassName="EClass_name2EditPart" itemSemanticEditPolicyClassName="EClass_name2ItemSemanticEditPolicy" notationViewFactoryClassName="EClass_name2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" editPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -88,6 +108,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EPackage"/> @@ -96,7 +118,10 @@ </modelFacet> <labels visualID="4006" editPartClassName="EPackage_nameEditPart" itemSemanticEditPolicyClassName="EPackage_nameItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -107,6 +132,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EDataType"/> @@ -115,7 +142,10 @@ </modelFacet> <labels visualID="4007" editPartClassName="EDataType_nameEditPart" itemSemanticEditPolicyClassName="EDataType_nameItemSemanticEditPolicy" notationViewFactoryClassName="EDataType_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -126,6 +156,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EEnum"/> @@ -134,7 +166,10 @@ </modelFacet> <labels visualID="4008" editPartClassName="EEnum_nameEditPart" itemSemanticEditPolicyClassName="EEnum_nameItemSemanticEditPolicy" notationViewFactoryClassName="EEnum_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -145,6 +180,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EStringToStringMapEntry"/> @@ -153,7 +190,10 @@ </modelFacet> <labels visualID="4010" editPartClassName="EStringToStringMapEntry_keyEditPart" itemSemanticEditPolicyClassName="EStringToStringMapEntry_keyItemSemanticEditPolicy" notationViewFactoryClassName="EStringToStringMapEntry_keyViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" editPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EStringToStringMapEntry/key"/> </modelFacet> @@ -164,6 +204,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNodeRectangle" classBody="

/**
 * @generated
 */
public class ChildNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public ChildNodeRectangle() {	
		

		
		this.setOutline(false);
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childChildNode_NameLabelFigure = createFigureChildNode_NameLabelFigure();
		setFigureChildNode_NameLabelFigure(childChildNode_NameLabelFigure);
		add(childChildNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fChildNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureChildNode_NameLabelFigure() {
		return fChildNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureChildNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fChildNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureChildNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel ChildNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return ChildNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EEnumLiteral"/> @@ -172,7 +214,10 @@ </modelFacet> <labels visualID="4013" editPartClassName="EEnumLiteral_nameEditPart" itemSemanticEditPolicyClassName="EEnumLiteral_nameItemSemanticEditPolicy" notationViewFactoryClassName="EEnumLiteral_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="ChildNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class ChildNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public ChildNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" editPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -183,6 +228,8 @@ <elementType xsi:type="gmfgen:MetamodelType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNodeRectangle" classBody="

/**
 * @generated
 */
public class NamedNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public NamedNodeRectangle() {	
		

		
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childNamedNode_NameLabelFigure = createFigureNamedNode_NameLabelFigure();
		setFigureNamedNode_NameLabelFigure(childNamedNode_NameLabelFigure);
		add(childNamedNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNamedNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNamedNode_NameLabelFigure() {
		return fNamedNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureNamedNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fNamedNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureNamedNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel NamedNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return NamedNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EClass"/> @@ -191,7 +238,10 @@ </modelFacet> <labels visualID="4004" editPartClassName="EClass_nameEditPart" itemSemanticEditPolicyClassName="EClass_nameItemSemanticEditPolicy" notationViewFactoryClassName="EClass_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -202,6 +252,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNodeRectangle" classBody="

/**
 * @generated
 */
public class NamedNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public NamedNodeRectangle() {	
		

		
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childNamedNode_NameLabelFigure = createFigureNamedNode_NameLabelFigure();
		setFigureNamedNode_NameLabelFigure(childNamedNode_NameLabelFigure);
		add(childNamedNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNamedNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNamedNode_NameLabelFigure() {
		return fNamedNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureNamedNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fNamedNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureNamedNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel NamedNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return NamedNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EPackage"/> @@ -210,7 +262,10 @@ </modelFacet> <labels visualID="4009" editPartClassName="EPackage_name2EditPart" itemSemanticEditPolicyClassName="EPackage_name2ItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_name2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -221,6 +276,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@childNodes.2/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNodeRectangle" classBody="

/**
 * @generated
 */
public class NamedNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public NamedNodeRectangle() {	
		

		
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childNamedNode_NameLabelFigure = createFigureNamedNode_NameLabelFigure();
		setFigureNamedNode_NameLabelFigure(childNamedNode_NameLabelFigure);
		add(childNamedNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNamedNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNamedNode_NameLabelFigure() {
		return fNamedNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureNamedNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fNamedNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureNamedNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel NamedNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return NamedNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAnnotation"/> @@ -229,7 +286,10 @@ </modelFacet> <labels visualID="4011" editPartClassName="EAnnotation_source2EditPart" itemSemanticEditPolicyClassName="EAnnotation_source2ItemSemanticEditPolicy" notationViewFactoryClassName="EAnnotation_source2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAnnotation/source"/> </modelFacet> @@ -240,6 +300,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@childNodes.5/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNodeRectangle" classBody="

/**
 * @generated
 */
public class NamedNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public NamedNodeRectangle() {	
		

		
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childNamedNode_NameLabelFigure = createFigureNamedNode_NameLabelFigure();
		setFigureNamedNode_NameLabelFigure(childNamedNode_NameLabelFigure);
		add(childNamedNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNamedNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNamedNode_NameLabelFigure() {
		return fNamedNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureNamedNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fNamedNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureNamedNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel NamedNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return NamedNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EDataType"/> @@ -248,7 +310,10 @@ </modelFacet> <labels visualID="4012" editPartClassName="EDataType_name2EditPart" itemSemanticEditPolicyClassName="EDataType_name2ItemSemanticEditPolicy" notationViewFactoryClassName="EDataType_name2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -259,6 +324,8 @@ <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@childNodes.6/@elementType"/> <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNodeRectangle" classBody="

/**
 * @generated
 */
public class NamedNodeRectangle extends org.eclipse.draw2d.RectangleFigure {

	/**
	 * @generated
	 */
	public NamedNodeRectangle() {	
		

		
		
		org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel childNamedNode_NameLabelFigure = createFigureNamedNode_NameLabelFigure();
		setFigureNamedNode_NameLabelFigure(childNamedNode_NameLabelFigure);
		add(childNamedNode_NameLabelFigure);
		
		
	}


	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel fNamedNode_NameLabelFigure; 

	/**
	 * @generated
	 */
	public org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel getFigureNamedNode_NameLabelFigure() {
		return fNamedNode_NameLabelFigure;
	}

	/**
	 * @generated
	 */
	protected void setFigureNamedNode_NameLabelFigure(org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel figure) {
		fNamedNode_NameLabelFigure = figure;
	}

	/**
	 * @generated
	 */
	private org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel createFigureNamedNode_NameLabelFigure() {
org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel NamedNode_NameLabelFigure = new org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel();






		return NamedNode_NameLabelFigure;
	}



	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> <attributes xsi:type="gmfgen:ResizeConstraints" resizeHandles="29"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> </viewmap> <modelFacet> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EEnum"/> @@ -267,7 +334,10 @@ </modelFacet> <labels visualID="4014" editPartClassName="EEnum_name2EditPart" itemSemanticEditPolicyClassName="EEnum_name2ItemSemanticEditPolicy" notationViewFactoryClassName="EEnum_name2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="NamedNode_NameLabelFigure" classBody="

/**
 * @generated
 */
public class NamedNode_NameLabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public NamedNode_NameLabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -276,7 +346,10 @@ <links visualID="3001" editPartClassName="ReferencesEditPart" itemSemanticEditPolicyClassName="ReferencesItemSemanticEditPolicy" notationViewFactoryClassName="ReferencesViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLineConnection" classBody="

/**
 * @generated
 */
public class DashedLineConnection extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public DashedLineConnection() {

		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);
	}


}"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="DashedLineConnection" classBody="

/**
 * @generated
 */
public class DashedLineConnection extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public DashedLineConnection() {

		this.setLineStyle(org.eclipse.draw2d.Graphics.LINE_DASH);
	}


}"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EAnnotation/references"/> </modelFacet> @@ -284,7 +357,10 @@ <links visualID="3002" editPartClassName="EReferenceEditPart" itemSemanticEditPolicyClassName="EReferenceItemSemanticEditPolicy" notationViewFactoryClassName="EReferenceViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:MetamodelType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWDstArrow" classBody="

/**
 * @generated
 */
public class SolidLineWDstArrow extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWDstArrow() {

		setTargetDecoration(createTargetDecoration());
	}


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {
org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();
// dispatchNext?

		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(-1, 1);
		pl.addPoint(0, 0);
		pl.addPoint(-1, -1);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}
}"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWDstArrow" classBody="

/**
 * @generated
 */
public class SolidLineWDstArrow extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWDstArrow() {

		setTargetDecoration(createTargetDecoration());
	}


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolylineDecoration createTargetDecoration() {
org.eclipse.draw2d.PolylineDecoration df = new org.eclipse.draw2d.PolylineDecoration();
// dispatchNext?

		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(-1, 1);
		pl.addPoint(0, 0);
		pl.addPoint(-1, -1);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}
}"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:TypeLinkModelFacet"> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EReference"/> <containmentMetaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EClass/eStructuralFeatures"/> @@ -299,7 +375,11 @@ </modelFacet> <labels visualID="4015" editPartClassName="EReference_nameEditPart" itemSemanticEditPolicyClassName="EReference_nameItemSemanticEditPolicy" notationViewFactoryClassName="EReference_nameViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LabelFigure" classBody="

/**
 * @generated
 */
public class LabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public LabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LabelFigure" classBody="

/**
 * @generated
 */
public class LabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public LabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" viewPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -308,7 +388,10 @@ <links visualID="3003" editPartClassName="EReference2EditPart" itemSemanticEditPolicyClassName="EReference2ItemSemanticEditPolicy" notationViewFactoryClassName="EReference2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType" metamodelType="//@diagram/@links.1/@elementType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWSrcDiamond" classBody="

/**
 * @generated
 */
public class SolidLineWSrcDiamond extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWSrcDiamond() {

		setSourceDecoration(createSourceDecoration());
	}

	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolygonDecoration createSourceDecoration() {
org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
// dispatchNext?
		df.setFill(true);
		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(-1, 1);
		pl.addPoint(0, 0);
		pl.addPoint(-1, -1);
		pl.addPoint(-2, 0);
		pl.addPoint(-1, 1);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}

}"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWSrcDiamond" classBody="

/**
 * @generated
 */
public class SolidLineWSrcDiamond extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWSrcDiamond() {

		setSourceDecoration(createSourceDecoration());
	}

	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolygonDecoration createSourceDecoration() {
org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
// dispatchNext?
		df.setFill(true);
		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(-1, 1);
		pl.addPoint(0, 0);
		pl.addPoint(-1, -1);
		pl.addPoint(-2, 0);
		pl.addPoint(-1, 1);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}

}"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:TypeLinkModelFacet"> <metaClass href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EReference"/> <containmentMetaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EClass/eStructuralFeatures"/> @@ -323,7 +406,11 @@ </modelFacet> <labels visualID="4016" editPartClassName="EReference_name2EditPart" itemSemanticEditPolicyClassName="EReference_name2ItemSemanticEditPolicy" notationViewFactoryClassName="EReference_name2ViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LabelFigure" classBody="

/**
 * @generated
 */
public class LabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public LabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="LabelFigure" classBody="

/**
 * @generated
 */
public class LabelFigure extends org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel {

	/**
	 * @generated
	 */
	public LabelFigure() {
		
	
		
		

	}

	/**
	 * @generated
	 */
	private boolean myUseLocalCoordinates = false;

	/**
	 * @generated
	 */
	protected boolean useLocalCoordinates() {
		return myUseLocalCoordinates;
	}

	/**
	 * @generated
	 */
	protected void setUseLocalCoordinates(boolean useLocalCoordinates) {
		myUseLocalCoordinates = useLocalCoordinates;
	}
	
}
"> + <attributes xsi:type="gmfgen:LabelOffsetAttributes" y="20"/> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLabelModelFacet" viewPattern=""> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/ENamedElement/name"/> </modelFacet> @@ -332,7 +419,10 @@ <links visualID="3004" editPartClassName="ESuperTypesEditPart" itemSemanticEditPolicyClassName="ESuperTypesItemSemanticEditPolicy" notationViewFactoryClassName="ESuperTypesViewFactory"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/> <elementType xsi:type="gmfgen:SpecializationType"/> - <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWDstClosedArrow" classBody="

/**
 * @generated
 */
public class SolidLineWDstClosedArrow extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWDstClosedArrow() {

		setTargetDecoration(createTargetDecoration());
	}


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolygonDecoration createTargetDecoration() {
org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
// dispatchNext?
		df.setFill(true);
		df.setBackgroundColor(org.eclipse.draw2d.ColorConstants.white);
		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(0, 0);
		pl.addPoint(-2, 2);
		pl.addPoint(-2, -2);
		pl.addPoint(0, 0);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}
}"/> + <viewmap xsi:type="gmfgen:InnerClassViewmap" className="SolidLineWDstClosedArrow" classBody="

/**
 * @generated
 */
public class SolidLineWDstClosedArrow extends org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx {

	/**
	 * @generated
	 */
	public SolidLineWDstClosedArrow() {

		setTargetDecoration(createTargetDecoration());
	}


	/**
	 * @generated
	 */
	private org.eclipse.draw2d.PolygonDecoration createTargetDecoration() {
org.eclipse.draw2d.PolygonDecoration df = new org.eclipse.draw2d.PolygonDecoration();
// dispatchNext?
		df.setFill(true);
		df.setBackgroundColor(org.eclipse.draw2d.ColorConstants.white);
		org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
		pl.addPoint(0, 0);
		pl.addPoint(-2, 2);
		pl.addPoint(-2, -2);
		pl.addPoint(0, 0);
		df.setTemplate(pl);
		df.setScale(getMapMode().DPtoLP(7), getMapMode().DPtoLP(3));




		return df;
	}
}"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + <requiredPluginIDs>org.eclipse.gmf.runtime.draw2d.ui</requiredPluginIDs> + </viewmap> <modelFacet xsi:type="gmfgen:FeatureLinkModelFacet"> <metaFeature href="../../../plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore/EClass/eSuperTypes"/> </modelFacet> @@ -342,71 +432,95 @@ </links> <compartments visualID="5001" editPartClassName="EClass_attributesEditPart" itemSemanticEditPolicyClassName="EClass_attributesItemSemanticEditPolicy" notationViewFactoryClassName="EClass_attributesViewFactory" childNodes="//@diagram/@childNodes.0" canonicalEditPolicyClassName="EClass_attributesCanonicalEditPolicy" title="attributes" node="//@diagram/@topLevelNodes.0"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5002" editPartClassName="EClass_operationsEditPart" itemSemanticEditPolicyClassName="EClass_operationsItemSemanticEditPolicy" notationViewFactoryClassName="EClass_operationsViewFactory" childNodes="//@diagram/@childNodes.1" canonicalEditPolicyClassName="EClass_operationsCanonicalEditPolicy" title="operations" node="//@diagram/@topLevelNodes.0"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5003" editPartClassName="EClass_classannotationsEditPart" itemSemanticEditPolicyClassName="EClass_classannotationsItemSemanticEditPolicy" notationViewFactoryClassName="EClass_classannotationsViewFactory" childNodes="//@diagram/@childNodes.2" canonicalEditPolicyClassName="EClass_classannotationsCanonicalEditPolicy" title="class annotations" node="//@diagram/@topLevelNodes.0"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5004" editPartClassName="EPackage_classesEditPart" itemSemanticEditPolicyClassName="EPackage_classesItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_classesViewFactory" childNodes="//@diagram/@childNodes.3" canonicalEditPolicyClassName="EPackage_classesCanonicalEditPolicy" title="classes" node="//@diagram/@topLevelNodes.1"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5005" editPartClassName="EPackage_packagesEditPart" itemSemanticEditPolicyClassName="EPackage_packagesItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_packagesViewFactory" childNodes="//@diagram/@childNodes.4" canonicalEditPolicyClassName="EPackage_packagesCanonicalEditPolicy" title="packages" node="//@diagram/@topLevelNodes.1"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5006" editPartClassName="EPackage_datatypesEditPart" itemSemanticEditPolicyClassName="EPackage_datatypesItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_datatypesViewFactory" childNodes="//@diagram/@childNodes.5" canonicalEditPolicyClassName="EPackage_datatypesCanonicalEditPolicy" title="data types" node="//@diagram/@topLevelNodes.1"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5007" editPartClassName="EPackage_enumsEditPart" itemSemanticEditPolicyClassName="EPackage_enumsItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_enumsViewFactory" childNodes="//@diagram/@childNodes.6" canonicalEditPolicyClassName="EPackage_enumsCanonicalEditPolicy" title="enums" node="//@diagram/@topLevelNodes.1"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5008" editPartClassName="EPackage_packageannotationsEditPart" itemSemanticEditPolicyClassName="EPackage_packageannotationsItemSemanticEditPolicy" notationViewFactoryClassName="EPackage_packageannotationsViewFactory" childNodes="//@diagram/@childNodes.2" canonicalEditPolicyClassName="EPackage_packageannotationsCanonicalEditPolicy" title="package annotations" node="//@diagram/@topLevelNodes.1"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5009" editPartClassName="EAnnotation_detailsEditPart" itemSemanticEditPolicyClassName="EAnnotation_detailsItemSemanticEditPolicy" notationViewFactoryClassName="EAnnotation_detailsViewFactory" childNodes="//@diagram/@childNodes.7" canonicalEditPolicyClassName="EAnnotation_detailsCanonicalEditPolicy" title="details" node="//@diagram/@topLevelNodes.2"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5010" editPartClassName="EDataType_datatypeannotationsEditPart" itemSemanticEditPolicyClassName="EDataType_datatypeannotationsItemSemanticEditPolicy" notationViewFactoryClassName="EDataType_datatypeannotationsViewFactory" childNodes="//@diagram/@childNodes.2" canonicalEditPolicyClassName="EDataType_datatypeannotationsCanonicalEditPolicy" title="data type annotations" node="//@diagram/@topLevelNodes.3"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5011" editPartClassName="EEnum_literalsEditPart" itemSemanticEditPolicyClassName="EEnum_literalsItemSemanticEditPolicy" notationViewFactoryClassName="EEnum_literalsViewFactory" childNodes="//@diagram/@childNodes.8" canonicalEditPolicyClassName="EEnum_literalsCanonicalEditPolicy" title="literals" node="//@diagram/@topLevelNodes.4"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <compartments visualID="5012" editPartClassName="EEnum_enumannotationsEditPart" itemSemanticEditPolicyClassName="EEnum_enumannotationsItemSemanticEditPolicy" notationViewFactoryClassName="EEnum_enumannotationsViewFactory" childNodes="//@diagram/@childNodes.2" canonicalEditPolicyClassName="EEnum_enumannotationsCanonicalEditPolicy" title="enum annotations" node="//@diagram/@topLevelNodes.4"> <diagramRunTimeClass href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/> - <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"/> + <viewmap xsi:type="gmfgen:FigureViewmap" figureQualifiedClassName="XXX"> + <requiredPluginIDs>org.eclipse.draw2d</requiredPluginIDs> + </viewmap> </compartments> <palette> <groups title="Nodes" description="Diagram Nodes"> - <entries xsi:type="gmfgen:ToolEntry" title="EClass" description="Create Class" genNodes="//@diagram/@topLevelNodes.0 //@diagram/@childNodes.3"/> - <entries xsi:type="gmfgen:ToolEntry" title="EPackage" description="Create Package" genNodes="//@diagram/@topLevelNodes.1 //@diagram/@childNodes.4"/> + <entries xsi:type="gmfgen:ToolEntry" title="EClass" description="Create Class" genNodes="//@diagram/@topLevelNodes.0 //@diagram/@childNodes.3"/> + <entries xsi:type="gmfgen:ToolEntry" title="EPackage" description="Create Package" genNodes="//@diagram/@topLevelNodes.1 //@diagram/@childNodes.4"/> <entries xsi:type="gmfgen:ToolEntry" title="EAnnotation" description="Create Annotation" genNodes="//@diagram/@childNodes.2 //@diagram/@topLevelNodes.2"/> <entries xsi:type="gmfgen:ToolEntry" title="EDataType" description="Create DataType" genNodes="//@diagram/@childNodes.5 //@diagram/@topLevelNodes.3"/> <entries xsi:type="gmfgen:ToolEntry" title="EEnum" description="Create Enumeration" genNodes="//@diagram/@childNodes.6 //@diagram/@topLevelNodes.4"/> </groups> <groups title="Child Nodes" description="Child Nodes"> - <entries xsi:type="gmfgen:ToolEntry" title="EAttribute" description="Create Attribute" genNodes="//@diagram/@childNodes.0"/> - <entries xsi:type="gmfgen:ToolEntry" title="EOperation" description="Create Operation" genNodes="//@diagram/@childNodes.1"/> - <entries xsi:type="gmfgen:ToolEntry" title="Annotation details" description="Create Annotation details" genNodes="//@diagram/@childNodes.7"/> - <entries xsi:type="gmfgen:ToolEntry" title="EEnumLiteral" description="Create Enumeration literal" genNodes="//@diagram/@childNodes.8"/> + <entries xsi:type="gmfgen:ToolEntry" title="EAttribute" description="Create Attribute" genNodes="//@diagram/@childNodes.0"/> + <entries xsi:type="gmfgen:ToolEntry" title="EOperation" description="Create Operation" genNodes="//@diagram/@childNodes.1"/> + <entries xsi:type="gmfgen:ToolEntry" title="Annotation details" description="Create Annotation details" genNodes="//@diagram/@childNodes.7"/> + <entries xsi:type="gmfgen:ToolEntry" title="EEnumLiteral" description="Create Enumeration literal" genNodes="//@diagram/@childNodes.8"/> </groups> <groups title="Links" description="Links"> - <entries xsi:type="gmfgen:ToolEntry" title="EAnnotation reference" description="Create Annotation reference link" genLinks="//@diagram/@links.0"/> - <entries xsi:type="gmfgen:ToolEntry" title="Association" description="Create Association link" genLinks="//@diagram/@links.1"/> - <entries xsi:type="gmfgen:ToolEntry" title="Aggregation" description="Create Aggregation link" genLinks="//@diagram/@links.2"/> - <entries xsi:type="gmfgen:ToolEntry" title="Generalization" description="Create Generalization link" genLinks="//@diagram/@links.3"/> + <entries xsi:type="gmfgen:ToolEntry" title="EAnnotation reference" description="Create Annotation reference link" genLinks="//@diagram/@links.0"/> + <entries xsi:type="gmfgen:ToolEntry" title="Association" description="Create Association link" genLinks="//@diagram/@links.1"/> + <entries xsi:type="gmfgen:ToolEntry" title="Aggregation" description="Create Aggregation link" genLinks="//@diagram/@links.2"/> + <entries xsi:type="gmfgen:ToolEntry" title="Generalization" description="Create Generalization link" genLinks="//@diagram/@links.3"/> </groups> </palette> </diagram> diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation2EditPart.java index 7d72dc180..3e1fa0116 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation2EditPart.java @@ -22,6 +22,8 @@ import org.eclipse.gmf.ecore.edit.policies.EAnnotation2GraphicalNodeEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EAnnotation2ItemSemanticEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -53,7 +55,7 @@ public class EAnnotation2EditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1003"; + public static final int VISUAL_ID = 1003; /** * @generated @@ -84,7 +86,7 @@ public class EAnnotation2EditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == EcoreElementTypes.EStringToStringMapEntry_2008) { - EditPart compartmentEditPart = getChildBySemanticHint(EAnnotation_detailsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EAnnotation_detailsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -226,7 +228,7 @@ public class EAnnotation2EditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(EAnnotation_source2EditPart.VISUAL_ID); + return getChildBySemanticHint(EcoreVisualIDRegistry.getType(EAnnotation_source2EditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotationEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotationEditPart.java index 78d6e9d06..8d4fad729 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotationEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotationEditPart.java @@ -88,7 +88,7 @@ public class EAnnotationEditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ - public static String VISUAL_ID = "2003"; + public static final int VISUAL_ID = 2003; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_detailsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_detailsEditPart.java index 6a3c11f51..11daf09ff 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_detailsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_detailsEditPart.java @@ -35,7 +35,7 @@ public class EAnnotation_detailsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5009"; + public static final int VISUAL_ID = 5009; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_source2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_source2EditPart.java index 388b379a3..d6676b293 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_source2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAnnotation_source2EditPart.java @@ -85,7 +85,7 @@ public class EAnnotation_source2EditPart extends CompartmentEditPart implements /** * @generated */ - public static String VISUAL_ID = "4011"; + public static final int VISUAL_ID = 4011; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAttributeEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAttributeEditPart.java index 6acd2cafb..aab77943d 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAttributeEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EAttributeEditPart.java @@ -88,7 +88,7 @@ public class EAttributeEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ - public static String VISUAL_ID = "2001"; + public static final int VISUAL_ID = 2001; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass2EditPart.java index 5411f8f89..eadeee152 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass2EditPart.java @@ -88,7 +88,7 @@ public class EClass2EditPart extends CompartmentEditPart implements ITextAwareEd /** * @generated */ - public static String VISUAL_ID = "2004"; + public static final int VISUAL_ID = 2004; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClassEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClassEditPart.java index 37ac3f1fa..1d3201feb 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClassEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClassEditPart.java @@ -22,6 +22,8 @@ import org.eclipse.gmf.ecore.edit.policies.EClassGraphicalNodeEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EClassItemSemanticEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -50,10 +52,19 @@ import org.eclipse.gmf.runtime.notation.View; */ public class EClassEditPart extends ShapeNodeEditPart { + public static class MyClass { + + public int myValue; + + public MyClass(int value) { + myValue = value; + } + } + /** * @generated */ - public static String VISUAL_ID = "1001"; + public static final int VISUAL_ID = 1001; /** * @generated @@ -84,15 +95,15 @@ public class EClassEditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == EcoreElementTypes.EAttribute_2001) { - EditPart compartmentEditPart = getChildBySemanticHint(EClass_attributesEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EClass_attributesEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EOperation_2002) { - EditPart compartmentEditPart = getChildBySemanticHint(EClass_operationsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EClass_operationsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EAnnotation_2003) { - EditPart compartmentEditPart = getChildBySemanticHint(EClass_classannotationsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EClass_classannotationsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -234,7 +245,7 @@ public class EClassEditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(EClass_nameEditPart.VISUAL_ID); + return getChildBySemanticHint(EcoreVisualIDRegistry.getType(EClass_nameEditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_attributesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_attributesEditPart.java index 194b75dd9..e2a15262e 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_attributesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_attributesEditPart.java @@ -35,7 +35,7 @@ public class EClass_attributesEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5001"; + public static final int VISUAL_ID = 5001; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_classannotationsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_classannotationsEditPart.java index dd76210a6..f12c1640d 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_classannotationsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_classannotationsEditPart.java @@ -35,7 +35,7 @@ public class EClass_classannotationsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5003"; + public static final int VISUAL_ID = 5003; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_nameEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_nameEditPart.java index b1ce1ca1f..a9d6dfc60 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_nameEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_nameEditPart.java @@ -85,7 +85,7 @@ public class EClass_nameEditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ - public static String VISUAL_ID = "4004"; + public static final int VISUAL_ID = 4004; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_operationsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_operationsEditPart.java index 5ddc81fc3..05fae7153 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_operationsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EClass_operationsEditPart.java @@ -35,7 +35,7 @@ public class EClass_operationsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5002"; + public static final int VISUAL_ID = 5002; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType2EditPart.java index b69973325..1901adaeb 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType2EditPart.java @@ -22,6 +22,8 @@ import org.eclipse.gmf.ecore.edit.policies.EDataType2GraphicalNodeEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EDataType2ItemSemanticEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -53,7 +55,7 @@ public class EDataType2EditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1004"; + public static final int VISUAL_ID = 1004; /** * @generated @@ -84,7 +86,7 @@ public class EDataType2EditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == EcoreElementTypes.EAnnotation_2003) { - EditPart compartmentEditPart = getChildBySemanticHint(EDataType_datatypeannotationsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EDataType_datatypeannotationsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -226,7 +228,7 @@ public class EDataType2EditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(EDataType_name2EditPart.VISUAL_ID); + return getChildBySemanticHint(EcoreVisualIDRegistry.getType(EDataType_name2EditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataTypeEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataTypeEditPart.java index 2a5663111..4f64e1ee5 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataTypeEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataTypeEditPart.java @@ -88,7 +88,7 @@ public class EDataTypeEditPart extends CompartmentEditPart implements ITextAware /** * @generated */ - public static String VISUAL_ID = "2006"; + public static final int VISUAL_ID = 2006; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_datatypeannotationsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_datatypeannotationsEditPart.java index 252fa7830..9c537999b 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_datatypeannotationsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_datatypeannotationsEditPart.java @@ -35,7 +35,7 @@ public class EDataType_datatypeannotationsEditPart extends ListCompartmentEditPa /** * @generated */ - public static String VISUAL_ID = "5010"; + public static final int VISUAL_ID = 5010; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_name2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_name2EditPart.java index 1b6dcac16..6c8088d42 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_name2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EDataType_name2EditPart.java @@ -85,7 +85,7 @@ public class EDataType_name2EditPart extends CompartmentEditPart implements ITex /** * @generated */ - public static String VISUAL_ID = "4012"; + public static final int VISUAL_ID = 4012; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum2EditPart.java index 369fef6ca..8286ed7c5 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum2EditPart.java @@ -22,6 +22,8 @@ import org.eclipse.gmf.ecore.edit.policies.EEnum2GraphicalNodeEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EEnum2ItemSemanticEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -53,7 +55,7 @@ public class EEnum2EditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1005"; + public static final int VISUAL_ID = 1005; /** * @generated @@ -84,11 +86,11 @@ public class EEnum2EditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == EcoreElementTypes.EEnumLiteral_2009) { - EditPart compartmentEditPart = getChildBySemanticHint(EEnum_literalsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EEnum_literalsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EAnnotation_2003) { - EditPart compartmentEditPart = getChildBySemanticHint(EEnum_enumannotationsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EEnum_enumannotationsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -230,7 +232,7 @@ public class EEnum2EditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(EEnum_name2EditPart.VISUAL_ID); + return getChildBySemanticHint(EcoreVisualIDRegistry.getType(EEnum_name2EditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumEditPart.java index 601e5d4e3..65fbe17d8 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumEditPart.java @@ -88,7 +88,7 @@ public class EEnumEditPart extends CompartmentEditPart implements ITextAwareEdit /** * @generated */ - public static String VISUAL_ID = "2007"; + public static final int VISUAL_ID = 2007; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumLiteralEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumLiteralEditPart.java index 06d414356..0014048ff 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumLiteralEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnumLiteralEditPart.java @@ -88,7 +88,7 @@ public class EEnumLiteralEditPart extends CompartmentEditPart implements ITextAw /** * @generated */ - public static String VISUAL_ID = "2009"; + public static final int VISUAL_ID = 2009; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_enumannotationsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_enumannotationsEditPart.java index 7c24147a9..4bc689025 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_enumannotationsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_enumannotationsEditPart.java @@ -35,7 +35,7 @@ public class EEnum_enumannotationsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5012"; + public static final int VISUAL_ID = 5012; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_literalsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_literalsEditPart.java index 75cd73570..cf9125d82 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_literalsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_literalsEditPart.java @@ -35,7 +35,7 @@ public class EEnum_literalsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5011"; + public static final int VISUAL_ID = 5011; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_name2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_name2EditPart.java index a5130fe41..6b862f030 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_name2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EEnum_name2EditPart.java @@ -85,7 +85,7 @@ public class EEnum_name2EditPart extends CompartmentEditPart implements ITextAwa /** * @generated */ - public static String VISUAL_ID = "4014"; + public static final int VISUAL_ID = 4014; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EOperationEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EOperationEditPart.java index af17fa954..783b10609 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EOperationEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EOperationEditPart.java @@ -88,7 +88,7 @@ public class EOperationEditPart extends CompartmentEditPart implements ITextAwar /** * @generated */ - public static String VISUAL_ID = "2002"; + public static final int VISUAL_ID = 2002; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage2EditPart.java index 0dfd32ff2..c34742e94 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage2EditPart.java @@ -22,6 +22,8 @@ import org.eclipse.gmf.ecore.edit.policies.EPackage2ItemSemanticEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EPackageGraphicalNodeEditPolicy; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -53,7 +55,7 @@ public class EPackage2EditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1002"; + public static final int VISUAL_ID = 1002; /** * @generated @@ -84,23 +86,23 @@ public class EPackage2EditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == EcoreElementTypes.EClass_2004) { - EditPart compartmentEditPart = getChildBySemanticHint(EPackage_classesEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_classesEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EPackage_2005) { - EditPart compartmentEditPart = getChildBySemanticHint(EPackage_packagesEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_packagesEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EDataType_2006) { - EditPart compartmentEditPart = getChildBySemanticHint(EPackage_datatypesEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_datatypesEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EEnum_2007) { - EditPart compartmentEditPart = getChildBySemanticHint(EPackage_enumsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_enumsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } if (type == EcoreElementTypes.EAnnotation_2003) { - EditPart compartmentEditPart = getChildBySemanticHint(EPackage_packageannotationsEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_packageannotationsEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -242,7 +244,7 @@ public class EPackage2EditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(EPackage_name2EditPart.VISUAL_ID); + return getChildBySemanticHint(EcoreVisualIDRegistry.getType(EPackage_name2EditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage3EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage3EditPart.java index 4782f5d8a..6ef8c80bb 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage3EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage3EditPart.java @@ -88,7 +88,7 @@ public class EPackage3EditPart extends CompartmentEditPart implements ITextAware /** * @generated */ - public static String VISUAL_ID = "2005"; + public static final int VISUAL_ID = 2005; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackageEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackageEditPart.java index c317013ab..a98d1abfd 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackageEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackageEditPart.java @@ -19,6 +19,11 @@ public class EPackageEditPart extends DiagramEditPart { /** * @generated */ + public static final int VISUAL_ID = 79; + + /** + * @generated + */ public EPackageEditPart(View view) { super(view); } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_classesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_classesEditPart.java index 8f663150a..2c110ef69 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_classesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_classesEditPart.java @@ -35,7 +35,7 @@ public class EPackage_classesEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5004"; + public static final int VISUAL_ID = 5004; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_datatypesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_datatypesEditPart.java index 41201983a..fb01716b7 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_datatypesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_datatypesEditPart.java @@ -35,7 +35,7 @@ public class EPackage_datatypesEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5006"; + public static final int VISUAL_ID = 5006; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_enumsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_enumsEditPart.java index df91f8843..d59e13b57 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_enumsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_enumsEditPart.java @@ -35,7 +35,7 @@ public class EPackage_enumsEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5007"; + public static final int VISUAL_ID = 5007; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_name2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_name2EditPart.java index 218f2e952..53dd89629 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_name2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_name2EditPart.java @@ -85,7 +85,7 @@ public class EPackage_name2EditPart extends CompartmentEditPart implements IText /** * @generated */ - public static String VISUAL_ID = "4009"; + public static final int VISUAL_ID = 4009; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packageannotationsEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packageannotationsEditPart.java index cb839b071..7eb227f69 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packageannotationsEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packageannotationsEditPart.java @@ -35,7 +35,7 @@ public class EPackage_packageannotationsEditPart extends ListCompartmentEditPart /** * @generated */ - public static String VISUAL_ID = "5008"; + public static final int VISUAL_ID = 5008; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packagesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packagesEditPart.java index 4c304e20f..cff6285fa 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packagesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EPackage_packagesEditPart.java @@ -35,7 +35,7 @@ public class EPackage_packagesEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5005"; + public static final int VISUAL_ID = 5005; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference2EditPart.java index 485c64e9b..0a68b1a9b 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference2EditPart.java @@ -14,7 +14,7 @@ public class EReference2EditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3003"; + public static final int VISUAL_ID = 3003; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReferenceEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReferenceEditPart.java index 80f5bf49f..a22ad3047 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReferenceEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReferenceEditPart.java @@ -14,7 +14,7 @@ public class EReferenceEditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3002"; + public static final int VISUAL_ID = 3002; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_name2EditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_name2EditPart.java index 765025293..0a53b7eec 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_name2EditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_name2EditPart.java @@ -28,6 +28,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -81,7 +83,7 @@ public class EReference_name2EditPart extends LabelEditPart implements ITextAwar /** * @generated */ - public static String VISUAL_ID = "4016"; + public static final int VISUAL_ID = 4016; /** * @generated @@ -107,7 +109,7 @@ public class EReference_name2EditPart extends LabelEditPart implements ITextAwar * @generated */ static { - registerSnapBackPosition(EReference_name2EditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(EcoreVisualIDRegistry.getType(EReference_name2EditPart.VISUAL_ID), new Point(0, 20)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_nameEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_nameEditPart.java index 39716047e..1d6a910a8 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_nameEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EReference_nameEditPart.java @@ -28,6 +28,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.ecore.edit.policies.EcoreTextSelectionEditPolicy; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + import org.eclipse.gmf.ecore.providers.EcoreElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -81,7 +83,7 @@ public class EReference_nameEditPart extends LabelEditPart implements ITextAware /** * @generated */ - public static String VISUAL_ID = "4015"; + public static final int VISUAL_ID = 4015; /** * @generated @@ -107,7 +109,7 @@ public class EReference_nameEditPart extends LabelEditPart implements ITextAware * @generated */ static { - registerSnapBackPosition(EReference_nameEditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(EcoreVisualIDRegistry.getType(EReference_nameEditPart.VISUAL_ID), new Point(0, 20)); } /** diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EStringToStringMapEntryEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EStringToStringMapEntryEditPart.java index cc0526797..9e3cd245c 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EStringToStringMapEntryEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EStringToStringMapEntryEditPart.java @@ -88,7 +88,7 @@ public class EStringToStringMapEntryEditPart extends CompartmentEditPart impleme /** * @generated */ - public static String VISUAL_ID = "2008"; + public static final int VISUAL_ID = 2008; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ESuperTypesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ESuperTypesEditPart.java index 01a82eb69..c7d23bfb3 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ESuperTypesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ESuperTypesEditPart.java @@ -14,7 +14,7 @@ public class ESuperTypesEditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3004"; + public static final int VISUAL_ID = 3004; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EcoreEditPartFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EcoreEditPartFactory.java index 3ab9464ed..5b68b69ae 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EcoreEditPartFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/EcoreEditPartFactory.java @@ -38,81 +38,81 @@ public class EcoreEditPartFactory implements EditPartFactory { int viewVisualID = EcoreVisualIDRegistry.getVisualID(view); switch (viewVisualID) { - case 1001: + case EClassEditPart.VISUAL_ID: return new EClassEditPart(view); - case 4004: + case EClass_nameEditPart.VISUAL_ID: return new EClass_nameEditPart(view); - case 1002: + case EPackage2EditPart.VISUAL_ID: return new EPackage2EditPart(view); - case 4009: + case EPackage_name2EditPart.VISUAL_ID: return new EPackage_name2EditPart(view); - case 1003: + case EAnnotation2EditPart.VISUAL_ID: return new EAnnotation2EditPart(view); - case 4011: + case EAnnotation_source2EditPart.VISUAL_ID: return new EAnnotation_source2EditPart(view); - case 1004: + case EDataType2EditPart.VISUAL_ID: return new EDataType2EditPart(view); - case 4012: + case EDataType_name2EditPart.VISUAL_ID: return new EDataType_name2EditPart(view); - case 1005: + case EEnum2EditPart.VISUAL_ID: return new EEnum2EditPart(view); - case 4014: + case EEnum_name2EditPart.VISUAL_ID: return new EEnum_name2EditPart(view); - case 2001: + case EAttributeEditPart.VISUAL_ID: return new EAttributeEditPart(view); - case 2002: + case EOperationEditPart.VISUAL_ID: return new EOperationEditPart(view); - case 2003: + case EAnnotationEditPart.VISUAL_ID: return new EAnnotationEditPart(view); - case 2004: + case EClass2EditPart.VISUAL_ID: return new EClass2EditPart(view); - case 2005: + case EPackage3EditPart.VISUAL_ID: return new EPackage3EditPart(view); - case 2006: + case EDataTypeEditPart.VISUAL_ID: return new EDataTypeEditPart(view); - case 2007: + case EEnumEditPart.VISUAL_ID: return new EEnumEditPart(view); - case 2008: + case EStringToStringMapEntryEditPart.VISUAL_ID: return new EStringToStringMapEntryEditPart(view); - case 2009: + case EEnumLiteralEditPart.VISUAL_ID: return new EEnumLiteralEditPart(view); - case 5001: + case EClass_attributesEditPart.VISUAL_ID: return new EClass_attributesEditPart(view); - case 5002: + case EClass_operationsEditPart.VISUAL_ID: return new EClass_operationsEditPart(view); - case 5003: + case EClass_classannotationsEditPart.VISUAL_ID: return new EClass_classannotationsEditPart(view); - case 5004: + case EPackage_classesEditPart.VISUAL_ID: return new EPackage_classesEditPart(view); - case 5005: + case EPackage_packagesEditPart.VISUAL_ID: return new EPackage_packagesEditPart(view); - case 5006: + case EPackage_datatypesEditPart.VISUAL_ID: return new EPackage_datatypesEditPart(view); - case 5007: + case EPackage_enumsEditPart.VISUAL_ID: return new EPackage_enumsEditPart(view); - case 5008: + case EPackage_packageannotationsEditPart.VISUAL_ID: return new EPackage_packageannotationsEditPart(view); - case 5009: + case EAnnotation_detailsEditPart.VISUAL_ID: return new EAnnotation_detailsEditPart(view); - case 5010: + case EDataType_datatypeannotationsEditPart.VISUAL_ID: return new EDataType_datatypeannotationsEditPart(view); - case 5011: + case EEnum_literalsEditPart.VISUAL_ID: return new EEnum_literalsEditPart(view); - case 5012: + case EEnum_enumannotationsEditPart.VISUAL_ID: return new EEnum_enumannotationsEditPart(view); - case 79: + case EPackageEditPart.VISUAL_ID: return new EPackageEditPart(view); - case 3001: + case ReferencesEditPart.VISUAL_ID: return new ReferencesEditPart(view); - case 3002: + case EReferenceEditPart.VISUAL_ID: return new EReferenceEditPart(view); - case 4015: + case EReference_nameEditPart.VISUAL_ID: return new EReference_nameEditPart(view); - case 3003: + case EReference2EditPart.VISUAL_ID: return new EReference2EditPart(view); - case 4016: + case EReference_name2EditPart.VISUAL_ID: return new EReference_name2EditPart(view); - case 3004: + case ESuperTypesEditPart.VISUAL_ID: return new ESuperTypesEditPart(view); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ReferencesEditPart.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ReferencesEditPart.java index 0f1ef3798..62bc8fde4 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ReferencesEditPart.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/parts/ReferencesEditPart.java @@ -14,7 +14,7 @@ public class ReferencesEditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3001"; + public static final int VISUAL_ID = 3001; /** * @generated diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EAnnotation_detailsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EAnnotation_detailsCanonicalEditPolicy.java index d44c78a14..41b6d1ef3 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EAnnotation_detailsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EAnnotation_detailsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EAnnotation; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EAnnotation_detailsCanonicalEditPolicy extends CanonicalEditPolicy for (Iterator values = ((EAnnotation) modelObject).getDetails().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2008 == nodeVID) { + if (EStringToStringMapEntryEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_attributesCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_attributesCanonicalEditPolicy.java index 760d96ba8..95ce4d8c1 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_attributesCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_attributesCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EAttributeEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EClass_attributesCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EClass) modelObject).getEAttributes().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2001 == nodeVID) { + if (EAttributeEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_classannotationsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_classannotationsCanonicalEditPolicy.java index b471b890c..f38bb2245 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_classannotationsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_classannotationsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EClass_classannotationsCanonicalEditPolicy extends CanonicalEditPol for (Iterator values = ((EModelElement) modelObject).getEAnnotations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2003 == nodeVID) { + if (EAnnotationEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_operationsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_operationsCanonicalEditPolicy.java index cebb0ae9d..470828857 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_operationsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EClass_operationsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EOperationEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EClass_operationsCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EClass) modelObject).getEOperations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2002 == nodeVID) { + if (EOperationEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EDataType_datatypeannotationsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EDataType_datatypeannotationsCanonicalEditPolicy.java index d8ab4ea9b..84af4ed3a 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EDataType_datatypeannotationsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EDataType_datatypeannotationsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EDataType_datatypeannotationsCanonicalEditPolicy extends CanonicalE for (Iterator values = ((EModelElement) modelObject).getEAnnotations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2003 == nodeVID) { + if (EAnnotationEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_enumannotationsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_enumannotationsCanonicalEditPolicy.java index 32128cc90..62a254f93 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_enumannotationsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_enumannotationsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EEnum_enumannotationsCanonicalEditPolicy extends CanonicalEditPolic for (Iterator values = ((EModelElement) modelObject).getEAnnotations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2003 == nodeVID) { + if (EAnnotationEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_literalsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_literalsCanonicalEditPolicy.java index efe4b2a27..1ee9f391c 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_literalsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EEnum_literalsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EEnum; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EEnumLiteralEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EEnum_literalsCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EEnum) modelObject).getELiterals().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2009 == nodeVID) { + if (EEnumLiteralEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackageCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackageCanonicalEditPolicy.java index 3890e65a3..c5d552366 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackageCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackageCanonicalEditPolicy.java @@ -25,6 +25,26 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.commands.Command; +import org.eclipse.gmf.ecore.edit.parts.EAnnotation2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; +import org.eclipse.gmf.ecore.edit.parts.EAttributeEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EClassEditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataType2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataTypeEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnum2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnumEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnumLiteralEditPart; +import org.eclipse.gmf.ecore.edit.parts.EOperationEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage3EditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackageEditPart; +import org.eclipse.gmf.ecore.edit.parts.EReference2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EReferenceEditPart; +import org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart; +import org.eclipse.gmf.ecore.edit.parts.ESuperTypesEditPart; +import org.eclipse.gmf.ecore.edit.parts.ReferencesEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; import org.eclipse.gmf.ecore.providers.EcoreElementTypes; @@ -62,15 +82,15 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); switch (nodeVID) { - case 1001: { + case EClassEditPart.VISUAL_ID: { result.add(nextValue); break; } - case 1004: { + case EDataType2EditPart.VISUAL_ID: { result.add(nextValue); break; } - case 1005: { + case EEnum2EditPart.VISUAL_ID: { result.add(nextValue); break; } @@ -79,14 +99,14 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { for (Iterator values = ((EPackage) modelObject).getESubpackages().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (1002 == nodeVID) { + if (EPackage2EditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } for (Iterator values = ((EModelElement) modelObject).getEAnnotations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (1003 == nodeVID) { + if (EAnnotation2EditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } @@ -191,21 +211,21 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { EObject modelElement = view.getElement(); int diagramElementVisualID = EcoreVisualIDRegistry.getVisualID(view); switch (diagramElementVisualID) { - case 1001: - case 1002: - case 1003: - case 1004: - case 1005: - case 2001: - case 2002: - case 2003: - case 2004: - case 2005: - case 2006: - case 2007: - case 2008: - case 2009: - case 79: { + case EClassEditPart.VISUAL_ID: + case EPackage2EditPart.VISUAL_ID: + case EAnnotation2EditPart.VISUAL_ID: + case EDataType2EditPart.VISUAL_ID: + case EEnum2EditPart.VISUAL_ID: + case EAttributeEditPart.VISUAL_ID: + case EOperationEditPart.VISUAL_ID: + case EAnnotationEditPart.VISUAL_ID: + case EClass2EditPart.VISUAL_ID: + case EPackage3EditPart.VISUAL_ID: + case EDataTypeEditPart.VISUAL_ID: + case EEnumEditPart.VISUAL_ID: + case EStringToStringMapEntryEditPart.VISUAL_ID: + case EEnumLiteralEditPart.VISUAL_ID: + case EPackageEditPart.VISUAL_ID: { myEObject2ViewMap.put(modelElement, view); storeLinks(modelElement, getDiagram()); } @@ -281,7 +301,7 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { EObject dst = (EObject) structuralFeatureResult; EObject src = container; int linkVID = EcoreVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(nextValue); - if (3002 == linkVID) { + if (EReferenceEditPart.VISUAL_ID == linkVID) { myLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID)); } } @@ -295,7 +315,7 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { EObject dst = (EObject) structuralFeatureResult; EObject src = container; int linkVID = EcoreVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(nextValue); - if (3003 == linkVID) { + if (EReference2EditPart.VISUAL_ID == linkVID) { myLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID)); } } @@ -311,7 +331,7 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { if (EcorePackage.eINSTANCE.getEAnnotation().isSuperTypeOf(containerMetaclass)) { for (Iterator destinations = ((EAnnotation) container).getReferences().iterator(); destinations.hasNext();) { EObject nextDestination = (EObject) destinations.next(); - myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, EcoreElementTypes.EAnnotationReferences_3001, 3001)); + myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, EcoreElementTypes.EAnnotationReferences_3001, ReferencesEditPart.VISUAL_ID)); } } @@ -319,7 +339,7 @@ public class EPackageCanonicalEditPolicy extends CanonicalConnectionEditPolicy { if (EcorePackage.eINSTANCE.getEClass().isSuperTypeOf(containerMetaclass)) { for (Iterator destinations = ((EClass) container).getESuperTypes().iterator(); destinations.hasNext();) { EObject nextDestination = (EObject) destinations.next(); - myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, EcoreElementTypes.EClassESuperTypes_3004, 3004)); + myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, EcoreElementTypes.EClassESuperTypes_3004, ESuperTypesEditPart.VISUAL_ID)); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_classesCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_classesCanonicalEditPolicy.java index 9086da52c..98700683e 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_classesCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_classesCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.gmf.ecore.edit.parts.EClass2EditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EPackage_classesCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EPackage) modelObject).getEClassifiers().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2004 == nodeVID) { + if (EClass2EditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_datatypesCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_datatypesCanonicalEditPolicy.java index 55a3d10f1..abc697ae1 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_datatypesCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_datatypesCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.gmf.ecore.edit.parts.EDataTypeEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EPackage_datatypesCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EPackage) modelObject).getEClassifiers().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2006 == nodeVID) { + if (EDataTypeEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_enumsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_enumsCanonicalEditPolicy.java index f8443e63a..3d7ba2196 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_enumsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_enumsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.gmf.ecore.edit.parts.EEnumEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EPackage_enumsCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EPackage) modelObject).getEClassifiers().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2007 == nodeVID) { + if (EEnumEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packageannotationsCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packageannotationsCanonicalEditPolicy.java index 921788215..494f46594 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packageannotationsCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packageannotationsCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EModelElement; import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EPackage_packageannotationsCanonicalEditPolicy extends CanonicalEdi for (Iterator values = ((EModelElement) modelObject).getEAnnotations().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2003 == nodeVID) { + if (EAnnotationEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packagesCanonicalEditPolicy.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packagesCanonicalEditPolicy.java index bd6347e38..27f557523 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packagesCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/edit/policies/EPackage_packagesCanonicalEditPolicy.java @@ -9,6 +9,8 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.gmf.ecore.edit.parts.EPackage3EditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; /** @@ -28,7 +30,7 @@ public class EPackage_packagesCanonicalEditPolicy extends CanonicalEditPolicy { for (Iterator values = ((EPackage) modelObject).getESubpackages().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2005 == nodeVID) { + if (EPackage3EditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreNewDiagramFileWizard.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreNewDiagramFileWizard.java index ba0b4432c..02485bf16 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreNewDiagramFileWizard.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreNewDiagramFileWizard.java @@ -130,7 +130,7 @@ public class EcoreNewDiagramFileWizard extends Wizard { protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { int diagramVID = EcoreVisualIDRegistry.INSTANCE.getDiagramVisualID(diagramModelObject); - if (diagramVID != 79) { + if (diagramVID != EPackageEditPart.VISUAL_ID) { return CommandResult.newErrorCommandResult("Incorrect model object stored as a root resource object"); //$NON-NLS-1$ } Diagram diagram = ViewService.createDiagram(diagramModelObject, EPackageEditPart.MODEL_ID, EcoreDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreVisualIDRegistry.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreVisualIDRegistry.java index 6b6d89d12..33a508cfc 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreVisualIDRegistry.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/part/EcoreVisualIDRegistry.java @@ -47,10 +47,15 @@ import org.eclipse.gmf.ecore.edit.parts.EPackage_enumsEditPart; import org.eclipse.gmf.ecore.edit.parts.EPackage_name2EditPart; import org.eclipse.gmf.ecore.edit.parts.EPackage_packageannotationsEditPart; import org.eclipse.gmf.ecore.edit.parts.EPackage_packagesEditPart; +import org.eclipse.gmf.ecore.edit.parts.EReference2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EReferenceEditPart; import org.eclipse.gmf.ecore.edit.parts.EReference_name2EditPart; import org.eclipse.gmf.ecore.edit.parts.EReference_nameEditPart; import org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart; +import org.eclipse.gmf.ecore.edit.parts.ESuperTypesEditPart; +import org.eclipse.gmf.ecore.edit.parts.ReferencesEditPart; + import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; @@ -74,17 +79,12 @@ public class EcoreVisualIDRegistry { public static int getVisualID(View view) { if (view instanceof Diagram) { if (EPackageEditPart.MODEL_ID.equals(view.getType())) { - return 79; + return EPackageEditPart.VISUAL_ID; } else { return -1; } } - try { - return Integer.parseInt(view.getType()); - } catch (NumberFormatException e) { - EcoreDiagramEditorPlugin.getInstance().logInfo("Unable to parse view type as a visualID number: " + view.getType()); - } - return -1; + return getVisualID(view.getType()); } /** @@ -105,6 +105,25 @@ public class EcoreVisualIDRegistry { /** * @generated */ + public static int getVisualID(String type) { + try { + return Integer.parseInt(type); + } catch (NumberFormatException e) { + EcoreDiagramEditorPlugin.getInstance().logInfo("Unable to parse view type as a visualID number: " + type); + } + return -1; + } + + /** + * @generated + */ + public static String getType(int visualID) { + return String.valueOf(visualID); + } + + /** + * @generated + */ public int getDiagramVisualID(EObject domainElement) { if (domainElement == null) { return -1; @@ -118,7 +137,7 @@ public class EcoreVisualIDRegistry { */ public int getDiagramVisualID(EObject domainElement, EClass domainElementMetaclass) { if (EcorePackage.eINSTANCE.getEPackage().equals(domainElementMetaclass) && (domainElement == null || isDiagramEPackage_79((EPackage) domainElement))) { - return 79; + return EPackageEditPart.VISUAL_ID; } return getUnrecognizedDiagramID(domainElement); } @@ -147,198 +166,199 @@ public class EcoreVisualIDRegistry { containerVisualID = getVisualID(containerView); } else { if (containerView instanceof Diagram) { - containerVisualID = 79; + containerVisualID = EPackageEditPart.VISUAL_ID; } else { return -1; } } + int nodeVisualID = getVisualID(semanticHint); switch (containerVisualID) { - case 1001: - if (EClass_nameEditPart.VISUAL_ID.equals(semanticHint)) { - return 4004; + case EClassEditPart.VISUAL_ID: + if (EClass_nameEditPart.VISUAL_ID == nodeVisualID) { + return EClass_nameEditPart.VISUAL_ID; } - if (EClass_attributesEditPart.VISUAL_ID.equals(semanticHint)) { - return 5001; + if (EClass_attributesEditPart.VISUAL_ID == nodeVisualID) { + return EClass_attributesEditPart.VISUAL_ID; } - if (EClass_operationsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5002; + if (EClass_operationsEditPart.VISUAL_ID == nodeVisualID) { + return EClass_operationsEditPart.VISUAL_ID; } - if (EClass_classannotationsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5003; + if (EClass_classannotationsEditPart.VISUAL_ID == nodeVisualID) { + return EClass_classannotationsEditPart.VISUAL_ID; } return getUnrecognizedEClass_1001ChildNodeID(domainElement, semanticHint); - case 1002: - if (EPackage_name2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4009; + case EPackage2EditPart.VISUAL_ID: + if (EPackage_name2EditPart.VISUAL_ID == nodeVisualID) { + return EPackage_name2EditPart.VISUAL_ID; } - if (EPackage_classesEditPart.VISUAL_ID.equals(semanticHint)) { - return 5004; + if (EPackage_classesEditPart.VISUAL_ID == nodeVisualID) { + return EPackage_classesEditPart.VISUAL_ID; } - if (EPackage_packagesEditPart.VISUAL_ID.equals(semanticHint)) { - return 5005; + if (EPackage_packagesEditPart.VISUAL_ID == nodeVisualID) { + return EPackage_packagesEditPart.VISUAL_ID; } - if (EPackage_datatypesEditPart.VISUAL_ID.equals(semanticHint)) { - return 5006; + if (EPackage_datatypesEditPart.VISUAL_ID == nodeVisualID) { + return EPackage_datatypesEditPart.VISUAL_ID; } - if (EPackage_enumsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5007; + if (EPackage_enumsEditPart.VISUAL_ID == nodeVisualID) { + return EPackage_enumsEditPart.VISUAL_ID; } - if (EPackage_packageannotationsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5008; + if (EPackage_packageannotationsEditPart.VISUAL_ID == nodeVisualID) { + return EPackage_packageannotationsEditPart.VISUAL_ID; } return getUnrecognizedEPackage_1002ChildNodeID(domainElement, semanticHint); - case 1003: - if (EAnnotation_source2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4011; + case EAnnotation2EditPart.VISUAL_ID: + if (EAnnotation_source2EditPart.VISUAL_ID == nodeVisualID) { + return EAnnotation_source2EditPart.VISUAL_ID; } - if (EAnnotation_detailsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5009; + if (EAnnotation_detailsEditPart.VISUAL_ID == nodeVisualID) { + return EAnnotation_detailsEditPart.VISUAL_ID; } return getUnrecognizedEAnnotation_1003ChildNodeID(domainElement, semanticHint); - case 1004: - if (EDataType_name2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4012; + case EDataType2EditPart.VISUAL_ID: + if (EDataType_name2EditPart.VISUAL_ID == nodeVisualID) { + return EDataType_name2EditPart.VISUAL_ID; } - if (EDataType_datatypeannotationsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5010; + if (EDataType_datatypeannotationsEditPart.VISUAL_ID == nodeVisualID) { + return EDataType_datatypeannotationsEditPart.VISUAL_ID; } return getUnrecognizedEDataType_1004ChildNodeID(domainElement, semanticHint); - case 1005: - if (EEnum_name2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4014; + case EEnum2EditPart.VISUAL_ID: + if (EEnum_name2EditPart.VISUAL_ID == nodeVisualID) { + return EEnum_name2EditPart.VISUAL_ID; } - if (EEnum_literalsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5011; + if (EEnum_literalsEditPart.VISUAL_ID == nodeVisualID) { + return EEnum_literalsEditPart.VISUAL_ID; } - if (EEnum_enumannotationsEditPart.VISUAL_ID.equals(semanticHint)) { - return 5012; + if (EEnum_enumannotationsEditPart.VISUAL_ID == nodeVisualID) { + return EEnum_enumannotationsEditPart.VISUAL_ID; } return getUnrecognizedEEnum_1005ChildNodeID(domainElement, semanticHint); - case 2001: + case EAttributeEditPart.VISUAL_ID: return getUnrecognizedEAttribute_2001ChildNodeID(domainElement, semanticHint); - case 2002: + case EOperationEditPart.VISUAL_ID: return getUnrecognizedEOperation_2002ChildNodeID(domainElement, semanticHint); - case 2003: + case EAnnotationEditPart.VISUAL_ID: return getUnrecognizedEAnnotation_2003ChildNodeID(domainElement, semanticHint); - case 2004: + case EClass2EditPart.VISUAL_ID: return getUnrecognizedEClass_2004ChildNodeID(domainElement, semanticHint); - case 2005: + case EPackage3EditPart.VISUAL_ID: return getUnrecognizedEPackage_2005ChildNodeID(domainElement, semanticHint); - case 2006: + case EDataTypeEditPart.VISUAL_ID: return getUnrecognizedEDataType_2006ChildNodeID(domainElement, semanticHint); - case 2007: + case EEnumEditPart.VISUAL_ID: return getUnrecognizedEEnum_2007ChildNodeID(domainElement, semanticHint); - case 2008: + case EStringToStringMapEntryEditPart.VISUAL_ID: return getUnrecognizedEStringToStringMapEntry_2008ChildNodeID(domainElement, semanticHint); - case 2009: + case EEnumLiteralEditPart.VISUAL_ID: return getUnrecognizedEEnumLiteral_2009ChildNodeID(domainElement, semanticHint); - case 5001: - if ((semanticHint == null || EAttributeEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAttribute().equals(domainElementMetaclass) + case EClass_attributesEditPart.VISUAL_ID: + if ((semanticHint == null || EAttributeEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAttribute().equals(domainElementMetaclass) && (domainElement == null || isNodeEAttribute_2001((EAttribute) domainElement))) { - return 2001; + return EAttributeEditPart.VISUAL_ID; } return getUnrecognizedAttributes_5001ChildNodeID(domainElement, semanticHint); - case 5002: - if ((semanticHint == null || EOperationEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEOperation().equals(domainElementMetaclass) + case EClass_operationsEditPart.VISUAL_ID: + if ((semanticHint == null || EOperationEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEOperation().equals(domainElementMetaclass) && (domainElement == null || isNodeEOperation_2002((EOperation) domainElement))) { - return 2002; + return EOperationEditPart.VISUAL_ID; } return getUnrecognizedOperations_5002ChildNodeID(domainElement, semanticHint); - case 5003: - if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) + case EClass_classannotationsEditPart.VISUAL_ID: + if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) && (domainElement == null || isNodeEAnnotation_2003((EAnnotation) domainElement))) { - return 2003; + return EAnnotationEditPart.VISUAL_ID; } return getUnrecognizedClass_annotations_5003ChildNodeID(domainElement, semanticHint); - case 5004: - if ((semanticHint == null || EClass2EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEClass().equals(domainElementMetaclass) + case EPackage_classesEditPart.VISUAL_ID: + if ((semanticHint == null || EClass2EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEClass().equals(domainElementMetaclass) && (domainElement == null || isNodeEClass_2004((EClass) domainElement))) { - return 2004; + return EClass2EditPart.VISUAL_ID; } return getUnrecognizedClasses_5004ChildNodeID(domainElement, semanticHint); - case 5005: - if ((semanticHint == null || EPackage3EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEPackage().equals(domainElementMetaclass) + case EPackage_packagesEditPart.VISUAL_ID: + if ((semanticHint == null || EPackage3EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEPackage().equals(domainElementMetaclass) && (domainElement == null || isNodeEPackage_2005((EPackage) domainElement))) { - return 2005; + return EPackage3EditPart.VISUAL_ID; } return getUnrecognizedPackages_5005ChildNodeID(domainElement, semanticHint); - case 5006: - if ((semanticHint == null || EDataTypeEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEDataType().equals(domainElementMetaclass) + case EPackage_datatypesEditPart.VISUAL_ID: + if ((semanticHint == null || EDataTypeEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEDataType().equals(domainElementMetaclass) && (domainElement == null || isNodeEDataType_2006((EDataType) domainElement))) { - return 2006; + return EDataTypeEditPart.VISUAL_ID; } return getUnrecognizedData_types_5006ChildNodeID(domainElement, semanticHint); - case 5007: - if ((semanticHint == null || EEnumEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEEnum().equals(domainElementMetaclass) + case EPackage_enumsEditPart.VISUAL_ID: + if ((semanticHint == null || EEnumEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEEnum().equals(domainElementMetaclass) && (domainElement == null || isNodeEEnum_2007((EEnum) domainElement))) { - return 2007; + return EEnumEditPart.VISUAL_ID; } return getUnrecognizedEnums_5007ChildNodeID(domainElement, semanticHint); - case 5008: - if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) + case EPackage_packageannotationsEditPart.VISUAL_ID: + if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) && (domainElement == null || isNodeEAnnotation_2003((EAnnotation) domainElement))) { - return 2003; + return EAnnotationEditPart.VISUAL_ID; } return getUnrecognizedPackage_annotations_5008ChildNodeID(domainElement, semanticHint); - case 5009: - if ((semanticHint == null || EStringToStringMapEntryEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEStringToStringMapEntry().equals(domainElementMetaclass) + case EAnnotation_detailsEditPart.VISUAL_ID: + if ((semanticHint == null || EStringToStringMapEntryEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEStringToStringMapEntry().equals(domainElementMetaclass) && (domainElement == null || isNodeEStringToStringMapEntry_2008((Entry) domainElement))) { - return 2008; + return EStringToStringMapEntryEditPart.VISUAL_ID; } return getUnrecognizedDetails_5009ChildNodeID(domainElement, semanticHint); - case 5010: - if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) + case EDataType_datatypeannotationsEditPart.VISUAL_ID: + if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) && (domainElement == null || isNodeEAnnotation_2003((EAnnotation) domainElement))) { - return 2003; + return EAnnotationEditPart.VISUAL_ID; } return getUnrecognizedData_type_annotations_5010ChildNodeID(domainElement, semanticHint); - case 5011: - if ((semanticHint == null || EEnumLiteralEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEEnumLiteral().equals(domainElementMetaclass) + case EEnum_literalsEditPart.VISUAL_ID: + if ((semanticHint == null || EEnumLiteralEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEEnumLiteral().equals(domainElementMetaclass) && (domainElement == null || isNodeEEnumLiteral_2009((EEnumLiteral) domainElement))) { - return 2009; + return EEnumLiteralEditPart.VISUAL_ID; } return getUnrecognizedLiterals_5011ChildNodeID(domainElement, semanticHint); - case 5012: - if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) + case EEnum_enumannotationsEditPart.VISUAL_ID: + if ((semanticHint == null || EAnnotationEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) && (domainElement == null || isNodeEAnnotation_2003((EAnnotation) domainElement))) { - return 2003; + return EAnnotationEditPart.VISUAL_ID; } return getUnrecognizedEnum_annotations_5012ChildNodeID(domainElement, semanticHint); - case 79: - if ((semanticHint == null || EClassEditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEClass().equals(domainElementMetaclass) + case EPackageEditPart.VISUAL_ID: + if ((semanticHint == null || EClassEditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEClass().equals(domainElementMetaclass) && (domainElement == null || isNodeEClass_1001((EClass) domainElement))) { - return 1001; + return EClassEditPart.VISUAL_ID; } - if ((semanticHint == null || EPackage2EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEPackage().equals(domainElementMetaclass) + if ((semanticHint == null || EPackage2EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEPackage().equals(domainElementMetaclass) && (domainElement == null || isNodeEPackage_1002((EPackage) domainElement))) { - return 1002; + return EPackage2EditPart.VISUAL_ID; } - if ((semanticHint == null || EAnnotation2EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) + if ((semanticHint == null || EAnnotation2EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEAnnotation().equals(domainElementMetaclass) && (domainElement == null || isNodeEAnnotation_1003((EAnnotation) domainElement))) { - return 1003; + return EAnnotation2EditPart.VISUAL_ID; } - if ((semanticHint == null || EDataType2EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEDataType().equals(domainElementMetaclass) + if ((semanticHint == null || EDataType2EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEDataType().equals(domainElementMetaclass) && (domainElement == null || isNodeEDataType_1004((EDataType) domainElement))) { - return 1004; + return EDataType2EditPart.VISUAL_ID; } - if ((semanticHint == null || EEnum2EditPart.VISUAL_ID.equals(semanticHint)) && EcorePackage.eINSTANCE.getEEnum().equals(domainElementMetaclass) + if ((semanticHint == null || EEnum2EditPart.VISUAL_ID == nodeVisualID) && EcorePackage.eINSTANCE.getEEnum().equals(domainElementMetaclass) && (domainElement == null || isNodeEEnum_1005((EEnum) domainElement))) { - return 1005; + return EEnum2EditPart.VISUAL_ID; } return getUnrecognizedEPackage_79ChildNodeID(domainElement, semanticHint); - case 3001: + case ReferencesEditPart.VISUAL_ID: return getUnrecognizedEAnnotationReferences_3001LinkLabelID(semanticHint); - case 3002: - if (EReference_nameEditPart.VISUAL_ID.equals(semanticHint)) { - return 4015; + case EReferenceEditPart.VISUAL_ID: + if (EReference_nameEditPart.VISUAL_ID == nodeVisualID) { + return EReference_nameEditPart.VISUAL_ID; } return getUnrecognizedEReference_3002LinkLabelID(semanticHint); - case 3003: - if (EReference_name2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4016; + case EReference2EditPart.VISUAL_ID: + if (EReference_name2EditPart.VISUAL_ID == nodeVisualID) { + return EReference_name2EditPart.VISUAL_ID; } return getUnrecognizedEReference_3003LinkLabelID(semanticHint); - case 3004: + case ESuperTypesEditPart.VISUAL_ID: return getUnrecognizedEClassESuperTypes_3004LinkLabelID(semanticHint); } return -1; @@ -357,9 +377,9 @@ public class EcoreVisualIDRegistry { */ public int getLinkWithClassVisualID(EObject domainElement, EClass domainElementMetaclass) { if (EcorePackage.eINSTANCE.getEReference().equals(domainElementMetaclass) && (domainElement == null || isLinkWithClassEReference_3002((EReference) domainElement))) { - return 3002; + return EReferenceEditPart.VISUAL_ID; } else if (EcorePackage.eINSTANCE.getEReference().equals(domainElementMetaclass) && (domainElement == null || isLinkWithClassEReference_3003((EReference) domainElement))) { - return 3003; + return EReference2EditPart.VISUAL_ID; } else { return getUnrecognizedLinkWithClassID(domainElement); } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreParserProvider.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreParserProvider.java index 725885887..cbf0dd561 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreParserProvider.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreParserProvider.java @@ -19,6 +19,8 @@ import org.eclipse.gmf.ecore.edit.parts.EPackage_name2EditPart; import org.eclipse.gmf.ecore.edit.parts.EReference_name2EditPart; import org.eclipse.gmf.ecore.edit.parts.EReference_nameEditPart; +import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; + /** * @generated */ @@ -424,37 +426,37 @@ public class EcoreParserProvider extends AbstractProvider implements IParserProv return getEEnumLiteralEEnumLiteralName_4013Parser(); } if (EcoreElementTypes.EClass_1001 == type) { - if (EClass_nameEditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EClass_nameEditPart.VISUAL_ID).equals(viewType)) { return getEClassEClassName_4004Parser(); } } if (EcoreElementTypes.EPackage_1002 == type) { - if (EPackage_name2EditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EPackage_name2EditPart.VISUAL_ID).equals(viewType)) { return getEPackageEPackageName_4009Parser(); } } if (EcoreElementTypes.EAnnotation_1003 == type) { - if (EAnnotation_source2EditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EAnnotation_source2EditPart.VISUAL_ID).equals(viewType)) { return getEAnnotationEAnnotationSource_4011Parser(); } } if (EcoreElementTypes.EDataType_1004 == type) { - if (EDataType_name2EditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EDataType_name2EditPart.VISUAL_ID).equals(viewType)) { return getEDataTypeEDataTypeName_4012Parser(); } } if (EcoreElementTypes.EEnum_1005 == type) { - if (EEnum_name2EditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EEnum_name2EditPart.VISUAL_ID).equals(viewType)) { return getEEnumEEnumName_4014Parser(); } } if (EcoreElementTypes.EReference_3002 == type) { - if (EReference_nameEditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EReference_nameEditPart.VISUAL_ID).equals(viewType)) { return getEReferenceEReferenceName_4015Parser(); } } if (EcoreElementTypes.EReference_3003 == type) { - if (EReference_name2EditPart.VISUAL_ID.equals(viewType)) { + if (EcoreVisualIDRegistry.getType(EReference_name2EditPart.VISUAL_ID).equals(viewType)) { return getEReferenceEReferenceName_4016Parser(); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreViewProvider.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreViewProvider.java index c73f004fd..0eac14dfb 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreViewProvider.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/providers/EcoreViewProvider.java @@ -5,8 +5,44 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider; import org.eclipse.gmf.runtime.notation.View; +import org.eclipse.gmf.ecore.edit.parts.EAnnotation2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart; +import org.eclipse.gmf.ecore.edit.parts.EAnnotation_detailsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EAnnotation_source2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EAttributeEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EClassEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass_attributesEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass_classannotationsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass_nameEditPart; +import org.eclipse.gmf.ecore.edit.parts.EClass_operationsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataType2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataTypeEditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataType_datatypeannotationsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EDataType_name2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnum2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnumEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnumLiteralEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnum_enumannotationsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnum_literalsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EEnum_name2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EOperationEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage3EditPart; import org.eclipse.gmf.ecore.edit.parts.EPackageEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_classesEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_datatypesEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_enumsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_name2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_packageannotationsEditPart; +import org.eclipse.gmf.ecore.edit.parts.EPackage_packagesEditPart; +import org.eclipse.gmf.ecore.edit.parts.EReference2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EReferenceEditPart; +import org.eclipse.gmf.ecore.edit.parts.EReference_name2EditPart; +import org.eclipse.gmf.ecore.edit.parts.EReference_nameEditPart; +import org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart; + import org.eclipse.gmf.ecore.part.EcoreVisualIDRegistry; import org.eclipse.gmf.ecore.view.factories.EAnnotation2ViewFactory; @@ -79,71 +115,71 @@ public class EcoreViewProvider extends AbstractViewProvider { int nodeVID = EcoreVisualIDRegistry.INSTANCE.getNodeVisualID(containerView, semanticElement, semanticType, semanticHint); switch (nodeVID) { - case 1001: + case EClassEditPart.VISUAL_ID: return EClassViewFactory.class; - case 4004: + case EClass_nameEditPart.VISUAL_ID: return EClass_nameViewFactory.class; - case 1002: + case EPackage2EditPart.VISUAL_ID: return EPackage2ViewFactory.class; - case 4009: + case EPackage_name2EditPart.VISUAL_ID: return EPackage_name2ViewFactory.class; - case 1003: + case EAnnotation2EditPart.VISUAL_ID: return EAnnotation2ViewFactory.class; - case 4011: + case EAnnotation_source2EditPart.VISUAL_ID: return EAnnotation_source2ViewFactory.class; - case 1004: + case EDataType2EditPart.VISUAL_ID: return EDataType2ViewFactory.class; - case 4012: + case EDataType_name2EditPart.VISUAL_ID: return EDataType_name2ViewFactory.class; - case 1005: + case EEnum2EditPart.VISUAL_ID: return EEnum2ViewFactory.class; - case 4014: + case EEnum_name2EditPart.VISUAL_ID: return EEnum_name2ViewFactory.class; - case 2001: + case EAttributeEditPart.VISUAL_ID: return EAttributeViewFactory.class; - case 2002: + case EOperationEditPart.VISUAL_ID: return EOperationViewFactory.class; - case 2003: + case EAnnotationEditPart.VISUAL_ID: return EAnnotationViewFactory.class; - case 2004: + case EClass2EditPart.VISUAL_ID: return EClass2ViewFactory.class; - case 2005: + case EPackage3EditPart.VISUAL_ID: return EPackage3ViewFactory.class; - case 2006: + case EDataTypeEditPart.VISUAL_ID: return EDataTypeViewFactory.class; - case 2007: + case EEnumEditPart.VISUAL_ID: return EEnumViewFactory.class; - case 2008: + case EStringToStringMapEntryEditPart.VISUAL_ID: return EStringToStringMapEntryViewFactory.class; - case 2009: + case EEnumLiteralEditPart.VISUAL_ID: return EEnumLiteralViewFactory.class; - case 5001: + case EClass_attributesEditPart.VISUAL_ID: return EClass_attributesViewFactory.class; - case 5002: + case EClass_operationsEditPart.VISUAL_ID: return EClass_operationsViewFactory.class; - case 5003: + case EClass_classannotationsEditPart.VISUAL_ID: return EClass_classannotationsViewFactory.class; - case 5004: + case EPackage_classesEditPart.VISUAL_ID: return EPackage_classesViewFactory.class; - case 5005: + case EPackage_packagesEditPart.VISUAL_ID: return EPackage_packagesViewFactory.class; - case 5006: + case EPackage_datatypesEditPart.VISUAL_ID: return EPackage_datatypesViewFactory.class; - case 5007: + case EPackage_enumsEditPart.VISUAL_ID: return EPackage_enumsViewFactory.class; - case 5008: + case EPackage_packageannotationsEditPart.VISUAL_ID: return EPackage_packageannotationsViewFactory.class; - case 5009: + case EAnnotation_detailsEditPart.VISUAL_ID: return EAnnotation_detailsViewFactory.class; - case 5010: + case EDataType_datatypeannotationsEditPart.VISUAL_ID: return EDataType_datatypeannotationsViewFactory.class; - case 5011: + case EEnum_literalsEditPart.VISUAL_ID: return EEnum_literalsViewFactory.class; - case 5012: + case EEnum_enumannotationsEditPart.VISUAL_ID: return EEnum_enumannotationsViewFactory.class; - case 4015: + case EReference_nameEditPart.VISUAL_ID: return EReference_nameViewFactory.class; - case 4016: + case EReference_name2EditPart.VISUAL_ID: return EReference_name2ViewFactory.class; } return null; @@ -167,9 +203,9 @@ public class EcoreViewProvider extends AbstractViewProvider { int linkVID = EcoreVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(semanticElement, semanticType); switch (linkVID) { - case 3002: + case EReferenceEditPart.VISUAL_ID: return EReferenceViewFactory.class; - case 3003: + case EReference2EditPart.VISUAL_ID: return EReference2ViewFactory.class; } return getUnrecognizedConnectorViewClass(semanticAdapter, containerView, semanticHint); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation2ViewFactory.java index 864170ea8..3cb9798f2 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation2ViewFactory.java @@ -27,7 +27,7 @@ public class EAnnotation2ViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EAnnotation2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EAnnotation2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -36,7 +36,7 @@ public class EAnnotation2ViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EAnnotation_source2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EAnnotation_detailsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EAnnotation_source2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EAnnotation_detailsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotationViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotationViewFactory.java index f2104b723..f557088a4 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotationViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotationViewFactory.java @@ -23,7 +23,7 @@ public class EAnnotationViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EAnnotationEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation_detailsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation_detailsViewFactory.java index cb731bac6..a0416eab6 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation_detailsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAnnotation_detailsViewFactory.java @@ -23,7 +23,7 @@ public class EAnnotation_detailsViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EAnnotation_detailsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EAnnotation_detailsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAttributeViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAttributeViewFactory.java index da3919ed0..e85e8ce79 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAttributeViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EAttributeViewFactory.java @@ -23,7 +23,7 @@ public class EAttributeViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EAttributeEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EAttributeEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass2ViewFactory.java index 006545326..2ced31fde 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass2ViewFactory.java @@ -23,7 +23,7 @@ public class EClass2ViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EClass2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EClass2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClassViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClassViewFactory.java index 1b5ae1a77..362797ef2 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClassViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClassViewFactory.java @@ -29,7 +29,7 @@ public class EClassViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EClassEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EClassEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -38,9 +38,9 @@ public class EClassViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EClass_nameEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EClass_attributesEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EClass_operationsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EClass_classannotationsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EClass_nameEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EClass_attributesEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EClass_operationsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EClass_classannotationsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_attributesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_attributesViewFactory.java index 898d7c3e2..5cba348ff 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_attributesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_attributesViewFactory.java @@ -23,7 +23,7 @@ public class EClass_attributesViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EClass_attributesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EClass_attributesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_classannotationsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_classannotationsViewFactory.java index d3db139c3..2930877be 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_classannotationsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_classannotationsViewFactory.java @@ -23,7 +23,7 @@ public class EClass_classannotationsViewFactory extends ListCompartmentViewFacto */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EClass_classannotationsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EClass_classannotationsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_operationsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_operationsViewFactory.java index f74fa318b..b862f646f 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_operationsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EClass_operationsViewFactory.java @@ -23,7 +23,7 @@ public class EClass_operationsViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EClass_operationsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EClass_operationsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType2ViewFactory.java index 3fd0a4882..15c394270 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType2ViewFactory.java @@ -27,7 +27,7 @@ public class EDataType2ViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EDataType2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EDataType2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -36,7 +36,7 @@ public class EDataType2ViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EDataType_name2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EDataType_datatypeannotationsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EDataType_name2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EDataType_datatypeannotationsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataTypeViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataTypeViewFactory.java index 903d15e44..bfdaad7f7 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataTypeViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataTypeViewFactory.java @@ -23,7 +23,7 @@ public class EDataTypeViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EDataTypeEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EDataTypeEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType_datatypeannotationsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType_datatypeannotationsViewFactory.java index b5b169dbb..71dde595b 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType_datatypeannotationsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EDataType_datatypeannotationsViewFactory.java @@ -23,7 +23,7 @@ public class EDataType_datatypeannotationsViewFactory extends ListCompartmentVie */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EDataType_datatypeannotationsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EDataType_datatypeannotationsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum2ViewFactory.java index f25864443..50abb0297 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum2ViewFactory.java @@ -28,7 +28,7 @@ public class EEnum2ViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EEnum2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EEnum2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -37,8 +37,8 @@ public class EEnum2ViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EEnum_name2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EEnum_literalsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EEnum_enumannotationsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EEnum_name2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EEnum_literalsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EEnum_enumannotationsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumLiteralViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumLiteralViewFactory.java index 7aab19b18..4156f062f 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumLiteralViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumLiteralViewFactory.java @@ -23,7 +23,7 @@ public class EEnumLiteralViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EEnumLiteralEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EEnumLiteralEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumViewFactory.java index cc2205e1b..1773997cf 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnumViewFactory.java @@ -23,7 +23,7 @@ public class EEnumViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EEnumEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EEnumEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_enumannotationsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_enumannotationsViewFactory.java index face8d2ee..f216f655a 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_enumannotationsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_enumannotationsViewFactory.java @@ -23,7 +23,7 @@ public class EEnum_enumannotationsViewFactory extends ListCompartmentViewFactory */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EEnum_enumannotationsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EEnum_enumannotationsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_literalsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_literalsViewFactory.java index 5b25c172a..f1d611b72 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_literalsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EEnum_literalsViewFactory.java @@ -23,7 +23,7 @@ public class EEnum_literalsViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EEnum_literalsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EEnum_literalsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EOperationViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EOperationViewFactory.java index 7c568a189..93ae11a6c 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EOperationViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EOperationViewFactory.java @@ -23,7 +23,7 @@ public class EOperationViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EOperationEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EOperationEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage2ViewFactory.java index 8602ef7e9..65cd31df2 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage2ViewFactory.java @@ -31,7 +31,7 @@ public class EPackage2ViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -40,11 +40,11 @@ public class EPackage2ViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EPackage_name2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EPackage_classesEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EPackage_packagesEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EPackage_datatypesEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EPackage_enumsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, EPackage_packageannotationsEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_name2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_classesEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_packagesEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_datatypesEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_enumsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EPackage_packageannotationsEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage3ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage3ViewFactory.java index 4166d22e2..05501b5c1 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage3ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage3ViewFactory.java @@ -23,7 +23,7 @@ public class EPackage3ViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage3EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage3EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_classesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_classesViewFactory.java index b4d4f7423..3d9e647b9 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_classesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_classesViewFactory.java @@ -23,7 +23,7 @@ public class EPackage_classesViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage_classesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage_classesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_datatypesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_datatypesViewFactory.java index a88a523ee..14c3634cb 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_datatypesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_datatypesViewFactory.java @@ -23,7 +23,7 @@ public class EPackage_datatypesViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage_datatypesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage_datatypesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_enumsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_enumsViewFactory.java index d2f356cc3..a991ca7a9 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_enumsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_enumsViewFactory.java @@ -23,7 +23,7 @@ public class EPackage_enumsViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage_enumsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage_enumsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packageannotationsViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packageannotationsViewFactory.java index 0544362ef..f688c7717 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packageannotationsViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packageannotationsViewFactory.java @@ -23,7 +23,7 @@ public class EPackage_packageannotationsViewFactory extends ListCompartmentViewF */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage_packageannotationsEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage_packageannotationsEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packagesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packagesViewFactory.java index 6c250497e..9acc5a9a3 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packagesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EPackage_packagesViewFactory.java @@ -23,7 +23,7 @@ public class EPackage_packagesViewFactory extends ListCompartmentViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EPackage_packagesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EPackage_packagesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReference2ViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReference2ViewFactory.java index eb0be52f9..c11c81909 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReference2ViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReference2ViewFactory.java @@ -26,7 +26,7 @@ public class EReference2ViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EReference2EditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EReference2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -35,6 +35,6 @@ public class EReference2ViewFactory extends ConnectionViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EReference_name2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EReference_name2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReferenceViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReferenceViewFactory.java index 80f33820f..6dfb4500d 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReferenceViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EReferenceViewFactory.java @@ -26,7 +26,7 @@ public class EReferenceViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EReferenceEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EReferenceEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -35,6 +35,6 @@ public class EReferenceViewFactory extends ConnectionViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", EPackageEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, EReference_nameEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, EcoreVisualIDRegistry.getType(EReference_nameEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EStringToStringMapEntryViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EStringToStringMapEntryViewFactory.java index 132d3941a..509e47512 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EStringToStringMapEntryViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/EStringToStringMapEntryViewFactory.java @@ -23,7 +23,7 @@ public class EStringToStringMapEntryViewFactory extends AbstractLabelViewFactory */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.EStringToStringMapEntryEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ESuperTypesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ESuperTypesViewFactory.java index 2d9a92431..a5e5056ab 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ESuperTypesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ESuperTypesViewFactory.java @@ -23,7 +23,7 @@ public class ESuperTypesViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.ESuperTypesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.ESuperTypesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ReferencesViewFactory.java b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ReferencesViewFactory.java index a101ba726..d1fda7b71 100644 --- a/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ReferencesViewFactory.java +++ b/examples/org.eclipse.gmf.ecore.editor/src/org/eclipse/gmf/ecore/view/factories/ReferencesViewFactory.java @@ -23,7 +23,7 @@ public class ReferencesViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.ecore.edit.parts.ReferencesEditPart.VISUAL_ID; + semanticHint = EcoreVisualIDRegistry.getType(org.eclipse.gmf.ecore.edit.parts.ReferencesEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml index f30b78414..e3aac5cec 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/plugin.xml @@ -2,14 +2,14 @@ <?eclipse version="3.0"?> <!-- -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:
+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: Dmitry Stadnik (Borland) - initial API and implementation --> <plugin> @@ -339,4 +339,4 @@ Contributors: </metamodel> </extension> -</plugin> +</plugin>
\ No newline at end of file diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/AquatoryEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/AquatoryEditPart.java index 3ca3ab056..8c1ddd3c0 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/AquatoryEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/AquatoryEditPart.java @@ -30,6 +30,11 @@ public class AquatoryEditPart extends DiagramEditPart { /** * @generated */ + public static final int VISUAL_ID = 79; + + /** + * @generated + */ public AquatoryEditPart(View view) { super(view); } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/DestinationEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/DestinationEditPart.java index c20d74828..fd40747ef 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/DestinationEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/DestinationEditPart.java @@ -26,7 +26,7 @@ public class DestinationEditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3001"; + public static final int VISUAL_ID = 3001; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java index ed065ee82..5fe1c9b1b 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Destination_UnknownEditPart.java @@ -39,6 +39,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -92,7 +94,7 @@ public class Destination_UnknownEditPart extends LabelEditPart implements ITextA /** * @generated */ - public static String VISUAL_ID = "4004"; + public static final int VISUAL_ID = 4004; /** * @generated @@ -118,7 +120,7 @@ public class Destination_UnknownEditPart extends LabelEditPart implements ITextA * @generated */ static { - registerSnapBackPosition(Destination_UnknownEditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Destination_UnknownEditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ItemEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ItemEditPart.java index f4aa3ce0e..18e4485cf 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ItemEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ItemEditPart.java @@ -99,7 +99,7 @@ public class ItemEditPart extends CompartmentEditPart implements ITextAwareEditP /** * @generated */ - public static String VISUAL_ID = "2001"; + public static final int VISUAL_ID = 2001; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java index 209f30c2f..3d329e0c2 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/PortEditPart.java @@ -28,6 +28,8 @@ import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.PortGraphicalNod import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.PortItemSemanticEditPolicy; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart; import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart; @@ -51,7 +53,7 @@ public class PortEditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1001"; + public static final int VISUAL_ID = 1001; /** * @generated @@ -180,7 +182,7 @@ public class PortEditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(Port_locationEditPart.VISUAL_ID); + return getChildBySemanticHint(TaiPanVisualIDRegistry.getType(Port_locationEditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java index 00051c6bc..5ade999c5 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Port_locationEditPart.java @@ -36,6 +36,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -89,7 +91,7 @@ public class Port_locationEditPart extends TaiPanExternalNodeLabelEditPart imple /** * @generated */ - public static String VISUAL_ID = "4001"; + public static final int VISUAL_ID = 4001; /** * @generated @@ -115,7 +117,7 @@ public class Port_locationEditPart extends TaiPanExternalNodeLabelEditPart imple * @generated */ static { - registerSnapBackPosition(Port_locationEditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Port_locationEditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route2EditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route2EditPart.java index 27370045f..c2ea1264b 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route2EditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route2EditPart.java @@ -25,7 +25,7 @@ public class Route2EditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3003"; + public static final int VISUAL_ID = 3003; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/RouteEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/RouteEditPart.java index 56abd0d1e..7d179a6f6 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/RouteEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/RouteEditPart.java @@ -26,7 +26,7 @@ public class RouteEditPart extends ConnectionNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "3002"; + public static final int VISUAL_ID = 3002; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_description2EditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_description2EditPart.java index f1343c5cb..371350eec 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_description2EditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_description2EditPart.java @@ -39,6 +39,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -92,7 +94,7 @@ public class Route_description2EditPart extends LabelEditPart implements ITextAw /** * @generated */ - public static String VISUAL_ID = "4007"; + public static final int VISUAL_ID = 4007; /** * @generated @@ -118,7 +120,7 @@ public class Route_description2EditPart extends LabelEditPart implements ITextAw * @generated */ static { - registerSnapBackPosition(Route_description2EditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Route_description2EditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java index 31b38d592..5750cd075 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_descriptionEditPart.java @@ -39,6 +39,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -92,7 +94,7 @@ public class Route_descriptionEditPart extends LabelEditPart implements ITextAwa /** * @generated */ - public static String VISUAL_ID = "4005"; + public static final int VISUAL_ID = 4005; /** * @generated @@ -118,7 +120,7 @@ public class Route_descriptionEditPart extends LabelEditPart implements ITextAwa * @generated */ static { - registerSnapBackPosition(Route_descriptionEditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Route_descriptionEditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliability2EditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliability2EditPart.java index e9917e5a7..a47969399 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliability2EditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliability2EditPart.java @@ -39,6 +39,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -92,7 +94,7 @@ public class Route_reliability2EditPart extends LabelEditPart implements ITextAw /** * @generated */ - public static String VISUAL_ID = "4008"; + public static final int VISUAL_ID = 4008; /** * @generated @@ -118,7 +120,7 @@ public class Route_reliability2EditPart extends LabelEditPart implements ITextAw * @generated */ static { - registerSnapBackPosition(Route_reliability2EditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Route_reliability2EditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java index b2978f416..00df1f72b 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Route_reliabilityEditPart.java @@ -39,6 +39,8 @@ import org.eclipse.gef.tools.DirectEditManager; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.common.ui.services.parser.IParser; @@ -92,7 +94,7 @@ public class Route_reliabilityEditPart extends LabelEditPart implements ITextAwa /** * @generated */ - public static String VISUAL_ID = "4006"; + public static final int VISUAL_ID = 4006; /** * @generated @@ -118,7 +120,7 @@ public class Route_reliabilityEditPart extends LabelEditPart implements ITextAwa * @generated */ static { - registerSnapBackPosition(Route_reliabilityEditPart.VISUAL_ID, new Point(0, 0)); + registerSnapBackPosition(TaiPanVisualIDRegistry.getType(Route_reliabilityEditPart.VISUAL_ID), new Point(0, 0)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java index 5de062829..10ebade36 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/ShipEditPart.java @@ -33,6 +33,8 @@ import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.ShipGraphicalNod import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.ShipItemSemanticEditPolicy; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.policies.TaiPanTextSelectionEditPolicy; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; import org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter; @@ -64,7 +66,7 @@ public class ShipEditPart extends ShapeNodeEditPart { /** * @generated */ - public static String VISUAL_ID = "1002"; + public static final int VISUAL_ID = 1002; /** * @generated @@ -95,7 +97,7 @@ public class ShipEditPart extends ShapeNodeEditPart { CreateElementRequestAdapter adapter = ((CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter(); IElementType type = (IElementType) adapter.getAdapter(IElementType.class); if (type == TaiPanElementTypes.Item_2001) { - EditPart compartmentEditPart = getChildBySemanticHint(Ship_CargoCompartmentEditPart.VISUAL_ID); + EditPart compartmentEditPart = getChildBySemanticHint(TaiPanVisualIDRegistry.getType(Ship_CargoCompartmentEditPart.VISUAL_ID)); return compartmentEditPart == null ? null : compartmentEditPart.getCommand(request); } } @@ -237,7 +239,7 @@ public class ShipEditPart extends ShapeNodeEditPart { * @generated */ public EditPart getPrimaryChildEditPart() { - return getChildBySemanticHint(Ship_nameEditPart.VISUAL_ID); + return getChildBySemanticHint(TaiPanVisualIDRegistry.getType(Ship_nameEditPart.VISUAL_ID)); } /** diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_CargoCompartmentEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_CargoCompartmentEditPart.java index 593665495..db4e815fd 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_CargoCompartmentEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_CargoCompartmentEditPart.java @@ -46,7 +46,7 @@ public class Ship_CargoCompartmentEditPart extends ListCompartmentEditPart { /** * @generated */ - public static String VISUAL_ID = "5001"; + public static final int VISUAL_ID = 5001; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java index 51fbbc749..334612c22 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/Ship_nameEditPart.java @@ -96,7 +96,7 @@ public class Ship_nameEditPart extends CompartmentEditPart implements ITextAware /** * @generated */ - public static String VISUAL_ID = "4003"; + public static final int VISUAL_ID = 4003; /** * @generated diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/TaiPanEditPartFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/TaiPanEditPartFactory.java index 055e77032..3a6fc8dd3 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/TaiPanEditPartFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/parts/TaiPanEditPartFactory.java @@ -49,35 +49,35 @@ public class TaiPanEditPartFactory implements EditPartFactory { int viewVisualID = TaiPanVisualIDRegistry.getVisualID(view); switch (viewVisualID) { - case 1001: + case PortEditPart.VISUAL_ID: return new PortEditPart(view); - case 4001: + case Port_locationEditPart.VISUAL_ID: return new Port_locationEditPart(view); - case 1002: + case ShipEditPart.VISUAL_ID: return new ShipEditPart(view); - case 4003: + case Ship_nameEditPart.VISUAL_ID: return new Ship_nameEditPart(view); - case 2001: + case ItemEditPart.VISUAL_ID: return new ItemEditPart(view); - case 5001: + case Ship_CargoCompartmentEditPart.VISUAL_ID: return new Ship_CargoCompartmentEditPart(view); - case 79: + case AquatoryEditPart.VISUAL_ID: return new AquatoryEditPart(view); - case 3001: + case DestinationEditPart.VISUAL_ID: return new DestinationEditPart(view); - case 4004: + case Destination_UnknownEditPart.VISUAL_ID: return new Destination_UnknownEditPart(view); - case 3002: + case RouteEditPart.VISUAL_ID: return new RouteEditPart(view); - case 4005: + case Route_descriptionEditPart.VISUAL_ID: return new Route_descriptionEditPart(view); - case 4006: + case Route_reliabilityEditPart.VISUAL_ID: return new Route_reliabilityEditPart(view); - case 3003: + case Route2EditPart.VISUAL_ID: return new Route2EditPart(view); - case 4007: + case Route_description2EditPart.VISUAL_ID: return new Route_description2EditPart(view); - case 4008: + case Route_reliability2EditPart.VISUAL_ID: return new Route_reliability2EditPart(view); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/AquatoryCanonicalEditPolicy.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/AquatoryCanonicalEditPolicy.java index 1b9aa099b..3c42af59a 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/AquatoryCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/AquatoryCanonicalEditPolicy.java @@ -36,6 +36,14 @@ import org.eclipse.gmf.examples.taipan.Route; import org.eclipse.gmf.examples.taipan.Ship; import org.eclipse.gmf.examples.taipan.TaiPanPackage; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.DestinationEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route2EditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.RouteEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart; + import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; import org.eclipse.gmf.examples.taipan.gmf.editor.providers.TaiPanElementTypes; @@ -72,14 +80,14 @@ public class AquatoryCanonicalEditPolicy extends CanonicalConnectionEditPolicy { for (Iterator values = ((Aquatory) modelObject).getPorts().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = TaiPanVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (1001 == nodeVID) { + if (PortEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } for (Iterator values = ((Aquatory) modelObject).getShips().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = TaiPanVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (1002 == nodeVID) { + if (ShipEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } @@ -184,10 +192,10 @@ public class AquatoryCanonicalEditPolicy extends CanonicalConnectionEditPolicy { EObject modelElement = view.getElement(); int diagramElementVisualID = TaiPanVisualIDRegistry.getVisualID(view); switch (diagramElementVisualID) { - case 1001: - case 1002: - case 2001: - case 79: { + case PortEditPart.VISUAL_ID: + case ShipEditPart.VISUAL_ID: + case ItemEditPart.VISUAL_ID: + case AquatoryEditPart.VISUAL_ID: { myEObject2ViewMap.put(modelElement, view); storeLinks(modelElement, getDiagram()); } @@ -265,7 +273,7 @@ public class AquatoryCanonicalEditPolicy extends CanonicalConnectionEditPolicy { if (structuralFeatureResult instanceof EObject) { EObject src = (EObject) structuralFeatureResult; int linkVID = TaiPanVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(nextValue); - if (3002 == linkVID) { + if (RouteEditPart.VISUAL_ID == linkVID) { myLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID)); } } @@ -282,7 +290,7 @@ public class AquatoryCanonicalEditPolicy extends CanonicalConnectionEditPolicy { if (structuralFeatureResult instanceof EObject) { EObject src = (EObject) structuralFeatureResult; int linkVID = TaiPanVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(nextValue); - if (3003 == linkVID) { + if (Route2EditPart.VISUAL_ID == linkVID) { myLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID)); } } @@ -298,7 +306,7 @@ public class AquatoryCanonicalEditPolicy extends CanonicalConnectionEditPolicy { if (TaiPanPackage.eINSTANCE.getShip().isSuperTypeOf(containerMetaclass)) { EObject nextDestination = (EObject) ((Ship) container).getDestination(); - myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, TaiPanElementTypes.ShipDestination_3001, 3001)); + myLinkDescriptors.add(new LinkDescriptor(container, nextDestination, TaiPanElementTypes.ShipDestination_3001, DestinationEditPart.VISUAL_ID)); } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/Ship_CargoCompartmentCanonicalEditPolicy.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/Ship_CargoCompartmentCanonicalEditPolicy.java index d60b86d53..379c38a00 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/Ship_CargoCompartmentCanonicalEditPolicy.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/edit/policies/Ship_CargoCompartmentCanonicalEditPolicy.java @@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.examples.taipan.Ship; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart; + import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; /** @@ -40,7 +42,7 @@ public class Ship_CargoCompartmentCanonicalEditPolicy extends CanonicalEditPolic for (Iterator values = ((Ship) modelObject).getCargo().iterator(); values.hasNext();) { nextValue = (EObject) values.next(); nodeVID = TaiPanVisualIDRegistry.INSTANCE.getNodeVisualID(viewObject, nextValue); - if (2001 == nodeVID) { + if (ItemEditPart.VISUAL_ID == nodeVID) { result.add(nextValue); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanNewDiagramFileWizard.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanNewDiagramFileWizard.java index bbb946832..af9ce0d51 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanNewDiagramFileWizard.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanNewDiagramFileWizard.java @@ -141,7 +141,7 @@ public class TaiPanNewDiagramFileWizard extends Wizard { protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { int diagramVID = TaiPanVisualIDRegistry.INSTANCE.getDiagramVisualID(diagramModelObject); - if (diagramVID != 79) { + if (diagramVID != AquatoryEditPart.VISUAL_ID) { return CommandResult.newErrorCommandResult("Incorrect model object stored as a root resource object"); //$NON-NLS-1$ } Diagram diagram = ViewService.createDiagram(diagramModelObject, AquatoryEditPart.MODEL_ID, TaiPanDiagramEditorPlugin.DIAGRAM_PREFERENCES_HINT); diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java index d9a5ffed6..23c2015f6 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/part/TaiPanVisualIDRegistry.java @@ -25,10 +25,13 @@ import org.eclipse.gmf.examples.taipan.Ship; import org.eclipse.gmf.examples.taipan.TaiPanPackage; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.DestinationEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Destination_UnknownEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Port_locationEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route2EditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.RouteEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_description2EditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_descriptionEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_reliability2EditPart; @@ -60,17 +63,12 @@ public class TaiPanVisualIDRegistry { public static int getVisualID(View view) { if (view instanceof Diagram) { if (AquatoryEditPart.MODEL_ID.equals(view.getType())) { - return 79; + return AquatoryEditPart.VISUAL_ID; } else { return -1; } } - try { - return Integer.parseInt(view.getType()); - } catch (NumberFormatException e) { - TaiPanDiagramEditorPlugin.getInstance().logInfo("Unable to parse view type as a visualID number: " + view.getType()); - } - return -1; + return getVisualID(view.getType()); } /** @@ -91,6 +89,25 @@ public class TaiPanVisualIDRegistry { /** * @generated */ + public static int getVisualID(String type) { + try { + return Integer.parseInt(type); + } catch (NumberFormatException e) { + TaiPanDiagramEditorPlugin.getInstance().logInfo("Unable to parse view type as a visualID number: " + type); + } + return -1; + } + + /** + * @generated + */ + public static String getType(int visualID) { + return String.valueOf(visualID); + } + + /** + * @generated + */ public int getDiagramVisualID(EObject domainElement) { if (domainElement == null) { return -1; @@ -104,7 +121,7 @@ public class TaiPanVisualIDRegistry { */ public int getDiagramVisualID(EObject domainElement, EClass domainElementMetaclass) { if (TaiPanPackage.eINSTANCE.getAquatory().equals(domainElementMetaclass) && (domainElement == null || isDiagramAquatory_79((Aquatory) domainElement))) { - return 79; + return AquatoryEditPart.VISUAL_ID; } return getUnrecognizedDiagramID(domainElement); } @@ -133,62 +150,63 @@ public class TaiPanVisualIDRegistry { containerVisualID = getVisualID(containerView); } else { if (containerView instanceof Diagram) { - containerVisualID = 79; + containerVisualID = AquatoryEditPart.VISUAL_ID; } else { return -1; } } + int nodeVisualID = getVisualID(semanticHint); switch (containerVisualID) { - case 1001: - if (Port_locationEditPart.VISUAL_ID.equals(semanticHint)) { - return 4001; + case PortEditPart.VISUAL_ID: + if (Port_locationEditPart.VISUAL_ID == nodeVisualID) { + return Port_locationEditPart.VISUAL_ID; } return getUnrecognizedPort_1001ChildNodeID(domainElement, semanticHint); - case 1002: - if (Ship_nameEditPart.VISUAL_ID.equals(semanticHint)) { - return 4003; + case ShipEditPart.VISUAL_ID: + if (Ship_nameEditPart.VISUAL_ID == nodeVisualID) { + return Ship_nameEditPart.VISUAL_ID; } - if (Ship_CargoCompartmentEditPart.VISUAL_ID.equals(semanticHint)) { - return 5001; + if (Ship_CargoCompartmentEditPart.VISUAL_ID == nodeVisualID) { + return Ship_CargoCompartmentEditPart.VISUAL_ID; } return getUnrecognizedShip_1002ChildNodeID(domainElement, semanticHint); - case 2001: + case ItemEditPart.VISUAL_ID: return getUnrecognizedItem_2001ChildNodeID(domainElement, semanticHint); - case 5001: - if ((semanticHint == null || ItemEditPart.VISUAL_ID.equals(semanticHint)) && TaiPanPackage.eINSTANCE.getItem().equals(domainElementMetaclass) + case Ship_CargoCompartmentEditPart.VISUAL_ID: + if ((semanticHint == null || ItemEditPart.VISUAL_ID == nodeVisualID) && TaiPanPackage.eINSTANCE.getItem().equals(domainElementMetaclass) && (domainElement == null || isNodeItem_2001((Item) domainElement))) { - return 2001; + return ItemEditPart.VISUAL_ID; } return getUnrecognizedCargoCompartment_5001ChildNodeID(domainElement, semanticHint); - case 79: - if ((semanticHint == null || PortEditPart.VISUAL_ID.equals(semanticHint)) && TaiPanPackage.eINSTANCE.getPort().equals(domainElementMetaclass) + case AquatoryEditPart.VISUAL_ID: + if ((semanticHint == null || PortEditPart.VISUAL_ID == nodeVisualID) && TaiPanPackage.eINSTANCE.getPort().equals(domainElementMetaclass) && (domainElement == null || isNodePort_1001((Port) domainElement))) { - return 1001; + return PortEditPart.VISUAL_ID; } - if ((semanticHint == null || ShipEditPart.VISUAL_ID.equals(semanticHint)) && TaiPanPackage.eINSTANCE.getShip().equals(domainElementMetaclass) + if ((semanticHint == null || ShipEditPart.VISUAL_ID == nodeVisualID) && TaiPanPackage.eINSTANCE.getShip().equals(domainElementMetaclass) && (domainElement == null || isNodeShip_1002((Ship) domainElement))) { - return 1002; + return ShipEditPart.VISUAL_ID; } return getUnrecognizedAquatory_79ChildNodeID(domainElement, semanticHint); - case 3001: - if (Destination_UnknownEditPart.VISUAL_ID.equals(semanticHint)) { - return 4004; + case DestinationEditPart.VISUAL_ID: + if (Destination_UnknownEditPart.VISUAL_ID == nodeVisualID) { + return Destination_UnknownEditPart.VISUAL_ID; } return getUnrecognizedShipDestination_3001LinkLabelID(semanticHint); - case 3002: - if (Route_descriptionEditPart.VISUAL_ID.equals(semanticHint)) { - return 4005; + case RouteEditPart.VISUAL_ID: + if (Route_descriptionEditPart.VISUAL_ID == nodeVisualID) { + return Route_descriptionEditPart.VISUAL_ID; } - if (Route_reliabilityEditPart.VISUAL_ID.equals(semanticHint)) { - return 4006; + if (Route_reliabilityEditPart.VISUAL_ID == nodeVisualID) { + return Route_reliabilityEditPart.VISUAL_ID; } return getUnrecognizedRoute_3002LinkLabelID(semanticHint); - case 3003: - if (Route_description2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4007; + case Route2EditPart.VISUAL_ID: + if (Route_description2EditPart.VISUAL_ID == nodeVisualID) { + return Route_description2EditPart.VISUAL_ID; } - if (Route_reliability2EditPart.VISUAL_ID.equals(semanticHint)) { - return 4008; + if (Route_reliability2EditPart.VISUAL_ID == nodeVisualID) { + return Route_reliability2EditPart.VISUAL_ID; } return getUnrecognizedRoute_3003LinkLabelID(semanticHint); } @@ -208,9 +226,9 @@ public class TaiPanVisualIDRegistry { */ public int getLinkWithClassVisualID(EObject domainElement, EClass domainElementMetaclass) { if (TaiPanPackage.eINSTANCE.getRoute().equals(domainElementMetaclass) && (domainElement == null || isLinkWithClassRoute_3002((Route) domainElement))) { - return 3002; + return RouteEditPart.VISUAL_ID; } else if (TaiPanPackage.eINSTANCE.getRoute().equals(domainElementMetaclass) && (domainElement == null || isLinkWithClassRoute_3003((Route) domainElement))) { - return 3003; + return Route2EditPart.VISUAL_ID; } else { return getUnrecognizedLinkWithClassID(domainElement); } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanParserProvider.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanParserProvider.java index f2232e5a4..b8ea8772a 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanParserProvider.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanParserProvider.java @@ -32,6 +32,8 @@ import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_reliability2E import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_reliabilityEditPart; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Ship_nameEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; + /** * @generated */ @@ -219,28 +221,28 @@ public class TaiPanParserProvider extends AbstractProvider implements IParserPro return getItemItemArticleQuantity_4002Parser(); } if (TaiPanElementTypes.Port_1001 == type) { - if (Port_locationEditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Port_locationEditPart.VISUAL_ID).equals(viewType)) { return getPortPortLocation_4001Parser(); } } if (TaiPanElementTypes.Ship_1002 == type) { - if (Ship_nameEditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Ship_nameEditPart.VISUAL_ID).equals(viewType)) { return getShipShipName_4003Parser(); } } if (TaiPanElementTypes.Route_3002 == type) { - if (Route_descriptionEditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Route_descriptionEditPart.VISUAL_ID).equals(viewType)) { return getRouteRouteDescription_4005Parser(); } - if (Route_reliabilityEditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Route_reliabilityEditPart.VISUAL_ID).equals(viewType)) { return getRouteRouteReliability_4006Parser(); } } if (TaiPanElementTypes.Route_3003 == type) { - if (Route_description2EditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Route_description2EditPart.VISUAL_ID).equals(viewType)) { return getRouteRouteDescription_4007Parser(); } - if (Route_reliability2EditPart.VISUAL_ID.equals(viewType)) { + if (TaiPanVisualIDRegistry.getType(Route_reliability2EditPart.VISUAL_ID).equals(viewType)) { return getRouteRouteReliability_4008Parser(); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java index f4b932f9d..944ebb634 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/providers/TaiPanViewProvider.java @@ -18,6 +18,20 @@ import org.eclipse.gmf.runtime.diagram.core.providers.AbstractViewProvider; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.AquatoryEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Destination_UnknownEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Port_locationEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route2EditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.RouteEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_description2EditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_descriptionEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_reliability2EditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route_reliabilityEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Ship_CargoCompartmentEditPart; +import org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Ship_nameEditPart; + import org.eclipse.gmf.examples.taipan.gmf.editor.part.TaiPanVisualIDRegistry; import org.eclipse.gmf.examples.taipan.gmf.editor.view.factories.AquatoryViewFactory; @@ -67,27 +81,27 @@ public class TaiPanViewProvider extends AbstractViewProvider { int nodeVID = TaiPanVisualIDRegistry.INSTANCE.getNodeVisualID(containerView, semanticElement, semanticType, semanticHint); switch (nodeVID) { - case 1001: + case PortEditPart.VISUAL_ID: return PortViewFactory.class; - case 4001: + case Port_locationEditPart.VISUAL_ID: return Port_locationViewFactory.class; - case 1002: + case ShipEditPart.VISUAL_ID: return ShipViewFactory.class; - case 4003: + case Ship_nameEditPart.VISUAL_ID: return Ship_nameViewFactory.class; - case 2001: + case ItemEditPart.VISUAL_ID: return ItemViewFactory.class; - case 5001: + case Ship_CargoCompartmentEditPart.VISUAL_ID: return Ship_CargoCompartmentViewFactory.class; - case 4004: + case Destination_UnknownEditPart.VISUAL_ID: return Destination_UnknownViewFactory.class; - case 4005: + case Route_descriptionEditPart.VISUAL_ID: return Route_descriptionViewFactory.class; - case 4006: + case Route_reliabilityEditPart.VISUAL_ID: return Route_reliabilityViewFactory.class; - case 4007: + case Route_description2EditPart.VISUAL_ID: return Route_description2ViewFactory.class; - case 4008: + case Route_reliability2EditPart.VISUAL_ID: return Route_reliability2ViewFactory.class; } return null; @@ -108,9 +122,9 @@ public class TaiPanViewProvider extends AbstractViewProvider { int linkVID = TaiPanVisualIDRegistry.INSTANCE.getLinkWithClassVisualID(semanticElement, semanticType); switch (linkVID) { - case 3002: + case RouteEditPart.VISUAL_ID: return RouteViewFactory.class; - case 3003: + case Route2EditPart.VISUAL_ID: return Route2ViewFactory.class; } return getUnrecognizedConnectorViewClass(semanticAdapter, containerView, semanticHint); diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/DestinationViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/DestinationViewFactory.java index aed52b8a6..e7929bca9 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/DestinationViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/DestinationViewFactory.java @@ -37,7 +37,7 @@ public class DestinationViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.DestinationEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.DestinationEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -46,6 +46,6 @@ public class DestinationViewFactory extends ConnectionViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", AquatoryEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, Destination_UnknownEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Destination_UnknownEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ItemViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ItemViewFactory.java index 8284a7cde..8a51381ad 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ItemViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ItemViewFactory.java @@ -34,7 +34,7 @@ public class ItemViewFactory extends AbstractLabelViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ItemEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/PortViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/PortViewFactory.java index cfbf78d11..4f9e2abaf 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/PortViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/PortViewFactory.java @@ -37,7 +37,7 @@ public class PortViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.PortEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -46,6 +46,6 @@ public class PortViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", AquatoryEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, Port_locationEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Port_locationEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Route2ViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Route2ViewFactory.java index 43628acb6..3e30d9737 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Route2ViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Route2ViewFactory.java @@ -38,7 +38,7 @@ public class Route2ViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route2EditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Route2EditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -47,7 +47,7 @@ public class Route2ViewFactory extends ConnectionViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", AquatoryEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, Route_description2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, Route_reliability2EditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Route_description2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Route_reliability2EditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/RouteViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/RouteViewFactory.java index c7e089326..30ed4fe15 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/RouteViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/RouteViewFactory.java @@ -38,7 +38,7 @@ public class RouteViewFactory extends ConnectionViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.RouteEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.RouteEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -47,7 +47,7 @@ public class RouteViewFactory extends ConnectionViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", AquatoryEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, Route_descriptionEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, Route_reliabilityEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Route_descriptionEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Route_reliabilityEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ShipViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ShipViewFactory.java index f83797678..ffbfcec80 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ShipViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/ShipViewFactory.java @@ -38,7 +38,7 @@ public class ShipViewFactory extends AbstractShapeViewFactory { */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.ShipEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); @@ -47,7 +47,7 @@ public class ShipViewFactory extends AbstractShapeViewFactory { shortcutAnnotation.setSource("Shortcut"); //$NON-NLS-1$ shortcutAnnotation.getDetails().put("modelID", AquatoryEditPart.MODEL_ID); } - getViewService().createNode(semanticAdapter, view, Ship_nameEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); - getViewService().createNode(semanticAdapter, view, Ship_CargoCompartmentEditPart.VISUAL_ID, ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Ship_nameEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); + getViewService().createNode(semanticAdapter, view, TaiPanVisualIDRegistry.getType(Ship_CargoCompartmentEditPart.VISUAL_ID), ViewUtil.APPEND, true, getPreferencesHint()); } } diff --git a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Ship_CargoCompartmentViewFactory.java b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Ship_CargoCompartmentViewFactory.java index b216e2470..1b6b6f07a 100644 --- a/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Ship_CargoCompartmentViewFactory.java +++ b/examples/org.eclipse.gmf.examples.taipan.gmf.editor/src/org/eclipse/gmf/examples/taipan/gmf/editor/view/factories/Ship_CargoCompartmentViewFactory.java @@ -34,7 +34,7 @@ public class Ship_CargoCompartmentViewFactory extends ListCompartmentViewFactory */ protected void decorateView(View containerView, View view, IAdaptable semanticAdapter, String semanticHint, int index, boolean persisted) { if (semanticHint == null) { - semanticHint = org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Ship_CargoCompartmentEditPart.VISUAL_ID; + semanticHint = TaiPanVisualIDRegistry.getType(org.eclipse.gmf.examples.taipan.gmf.editor.edit.parts.Ship_CargoCompartmentEditPart.VISUAL_ID); view.setType(semanticHint); } super.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted); diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java index 2d2c77d65..64d8c2efd 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java @@ -28,7 +28,7 @@ public class NewDiagramFileWizardGenerator { protected final String TEXT_9 = " e) {" + NL + "\t\t\t"; protected final String TEXT_10 = ".getInstance().logError(\"Unable to set charset for diagram file\", e); //$NON-NLS-1$" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\tResourceSet resourceSet = myEditingDomain.getResourceSet();" + NL + "\t\tfinal Resource diagramResource = resourceSet.createResource(URI.createPlatformResourceURI(diagramFile.getFullPath().toString()));" + NL + "" + NL + "\t\tList affectedFiles = new LinkedList();" + NL + "\t\taffectedFiles.add(mySelectedModelFile);" + NL + "\t\taffectedFiles.add(diagramFile);" + NL + "\t\t\t" + NL + "\t\tAbstractTransactionalCommand command = new AbstractTransactionalCommand(myEditingDomain, \"Initializing diagram contents\", affectedFiles) { //$NON-NLS-1$" + NL + "\t\t\tprotected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {" + NL + "\t\t\t\tint diagramVID = "; protected final String TEXT_11 = ".INSTANCE.getDiagramVisualID(diagramModelObject);" + NL + "\t\t\t\tif (diagramVID != "; - protected final String TEXT_12 = ") {" + NL + "\t\t\t\t\treturn CommandResult.newErrorCommandResult(\"Incorrect model object stored as a root resource object\"); //$NON-NLS-1$" + NL + "\t\t\t\t}" + NL + "\t\t\t\tDiagram diagram = ViewService.createDiagram(diagramModelObject, "; + protected final String TEXT_12 = ".VISUAL_ID) {" + NL + "\t\t\t\t\treturn CommandResult.newErrorCommandResult(\"Incorrect model object stored as a root resource object\"); //$NON-NLS-1$" + NL + "\t\t\t\t}" + NL + "\t\t\t\tDiagram diagram = ViewService.createDiagram(diagramModelObject, "; protected final String TEXT_13 = ".MODEL_ID, "; protected final String TEXT_14 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\t\t\tdiagramResource.getContents().add(diagram);"; protected final String TEXT_15 = NL + "\t\t\t\tdiagramResource.getContents().add(diagram.getElement());"; @@ -59,186 +59,190 @@ public class NewDiagramFileWizardGenerator { protected final String TEXT_40 = ") it.next();" + NL + "\tif (nextResourceObject == diagramModelObject) {" + NL + "\t\tcontinue;" + NL + "\t}" + NL + "\tint nodeVID = "; protected final String TEXT_41 = ".INSTANCE.getNodeVisualID(diagram, nextResourceObject);" + NL + "\tswitch (nodeVID) {"; protected final String TEXT_42 = NL + "\tcase "; - protected final String TEXT_43 = ": {" + NL + "\t\t"; + protected final String TEXT_43 = ".VISUAL_ID: {" + NL + "\t\t"; protected final String TEXT_44 = " nextNode = ViewService.createNode(diagram, nextResourceObject, "; - protected final String TEXT_45 = ".VISUAL_ID, "; - protected final String TEXT_46 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextResourceObject, nextNode);" + NL + "\t\tcreate"; - protected final String TEXT_47 = "Children(nextNode, nextResourceObject);"; - protected final String TEXT_48 = NL; - protected final String TEXT_49 = "\t\tbreak;" + NL + "\t}"; - protected final String TEXT_50 = "\t}" + NL + "}"; - protected final String TEXT_51 = "\t\t" + NL + "\tcreateLinks(diagram);" + NL + "}"; - protected final String TEXT_52 = "\t" + NL + "" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void create"; - protected final String TEXT_53 = "Children("; - protected final String TEXT_54 = " viewObject, "; - protected final String TEXT_55 = " modelObject) {"; - protected final String TEXT_56 = NL; - protected final String TEXT_57 = "\t"; - protected final String TEXT_58 = " nextValue;" + NL + "\tint nodeVID;"; - protected final String TEXT_59 = "\tfor ("; - protected final String TEXT_60 = " values = "; - protected final String TEXT_61 = ".iterator(); values.hasNext();) {" + NL + "\t\tnextValue = ("; - protected final String TEXT_62 = ") values.next();"; - protected final String TEXT_63 = NL + "\tnextValue = "; - protected final String TEXT_64 = ";"; - protected final String TEXT_65 = NL + "\tnodeVID = "; - protected final String TEXT_66 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);"; - protected final String TEXT_67 = NL + "\tswitch (nodeVID) {"; - protected final String TEXT_68 = NL + "\tcase "; - protected final String TEXT_69 = ": {"; - protected final String TEXT_70 = NL + "\tif ("; - protected final String TEXT_71 = " == nodeVID) {"; - protected final String TEXT_72 = NL + "\t\t"; - protected final String TEXT_73 = " nextNode = ViewService.createNode(viewObject, nextValue, "; - protected final String TEXT_74 = ".VISUAL_ID, "; - protected final String TEXT_75 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextValue, nextNode);" + NL + "\t\tcreate"; - protected final String TEXT_76 = "Children(nextNode, nextValue);"; - protected final String TEXT_77 = NL; - protected final String TEXT_78 = "\t\tbreak;"; - protected final String TEXT_79 = "\t}"; - protected final String TEXT_80 = NL + "\t}"; - protected final String TEXT_81 = NL + "\t}"; - protected final String TEXT_82 = NL + "\t"; - protected final String TEXT_83 = " nextCompartment = getCompartment(viewObject, "; - protected final String TEXT_84 = ".VISUAL_ID);" + NL + "\tif (nextCompartment != null) {" + NL + "\t\tcreate"; - protected final String TEXT_85 = "Children(nextCompartment, modelObject);" + NL + "\t}"; - protected final String TEXT_86 = NL + "\tstoreLinks(modelObject, viewObject.getDiagram());"; - protected final String TEXT_87 = NL + "}"; - protected final String TEXT_88 = NL + "\t" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private "; - protected final String TEXT_89 = " getCompartment("; - protected final String TEXT_90 = " node, String name) {" + NL + "\tfor ("; - protected final String TEXT_91 = " it = node.getChildren().iterator(); it.hasNext();) {" + NL + "\t\t"; - protected final String TEXT_92 = " nextView = ("; - protected final String TEXT_93 = ") it.next();" + NL + "\t\tif (nextView instanceof "; - protected final String TEXT_94 = " && name.equals(nextView.getType())) {" + NL + "\t\t\treturn ("; - protected final String TEXT_95 = ") nextView;" + NL + "\t\t}" + NL + "\t}" + NL + "\treturn null;" + NL + "}"; - protected final String TEXT_96 = NL; - protected final String TEXT_97 = NL; - protected final String TEXT_98 = "/**" + NL + " *@generated" + NL + " */" + NL + "private void storeLinks("; - protected final String TEXT_99 = " container, "; - protected final String TEXT_100 = " diagram) {" + NL + "\t"; - protected final String TEXT_101 = " containerMetaclass = container.eClass();" + NL + "\tstoreFeatureModelFacetLinks(container, containerMetaclass, diagram);" + NL + "\tstoreTypeModelFacetLinks(container, containerMetaclass);" + NL + "}" + NL + "\t" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void storeTypeModelFacetLinks("; + protected final String TEXT_45 = ".getType("; + protected final String TEXT_46 = ".VISUAL_ID), "; + protected final String TEXT_47 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextResourceObject, nextNode);" + NL + "\t\tcreate"; + protected final String TEXT_48 = "Children(nextNode, nextResourceObject);"; + protected final String TEXT_49 = NL; + protected final String TEXT_50 = "\t\tbreak;" + NL + "\t}"; + protected final String TEXT_51 = "\t}" + NL + "}"; + protected final String TEXT_52 = "\t\t" + NL + "\tcreateLinks(diagram);" + NL + "}"; + protected final String TEXT_53 = "\t" + NL + "" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void create"; + protected final String TEXT_54 = "Children("; + protected final String TEXT_55 = " viewObject, "; + protected final String TEXT_56 = " modelObject) {"; + protected final String TEXT_57 = NL; + protected final String TEXT_58 = "\t"; + protected final String TEXT_59 = " nextValue;" + NL + "\tint nodeVID;"; + protected final String TEXT_60 = "\tfor ("; + protected final String TEXT_61 = " values = "; + protected final String TEXT_62 = ".iterator(); values.hasNext();) {" + NL + "\t\tnextValue = ("; + protected final String TEXT_63 = ") values.next();"; + protected final String TEXT_64 = NL + "\tnextValue = "; + protected final String TEXT_65 = ";"; + protected final String TEXT_66 = NL + "\tnodeVID = "; + protected final String TEXT_67 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);"; + protected final String TEXT_68 = NL + "\tswitch (nodeVID) {"; + protected final String TEXT_69 = NL + "\tcase "; + protected final String TEXT_70 = ".VISUAL_ID: {"; + protected final String TEXT_71 = NL + "\tif ("; + protected final String TEXT_72 = ".VISUAL_ID == nodeVID) {"; + protected final String TEXT_73 = NL + "\t\t"; + protected final String TEXT_74 = " nextNode = ViewService.createNode(viewObject, nextValue, "; + protected final String TEXT_75 = ".getType("; + protected final String TEXT_76 = ".VISUAL_ID), "; + protected final String TEXT_77 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextValue, nextNode);" + NL + "\t\tcreate"; + protected final String TEXT_78 = "Children(nextNode, nextValue);"; + protected final String TEXT_79 = NL; + protected final String TEXT_80 = "\t\tbreak;"; + protected final String TEXT_81 = "\t}"; + protected final String TEXT_82 = NL + "\t}"; + protected final String TEXT_83 = NL + "\t}"; + protected final String TEXT_84 = NL + "\t"; + protected final String TEXT_85 = " nextCompartment = getCompartment(viewObject, "; + protected final String TEXT_86 = ".getType("; + protected final String TEXT_87 = ".VISUAL_ID));" + NL + "\tif (nextCompartment != null) {" + NL + "\t\tcreate"; + protected final String TEXT_88 = "Children(nextCompartment, modelObject);" + NL + "\t}"; + protected final String TEXT_89 = NL + "\tstoreLinks(modelObject, viewObject.getDiagram());"; + protected final String TEXT_90 = NL + "}"; + protected final String TEXT_91 = NL + "\t" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private "; + protected final String TEXT_92 = " getCompartment("; + protected final String TEXT_93 = " node, String name) {" + NL + "\tfor ("; + protected final String TEXT_94 = " it = node.getChildren().iterator(); it.hasNext();) {" + NL + "\t\t"; + protected final String TEXT_95 = " nextView = ("; + protected final String TEXT_96 = ") it.next();" + NL + "\t\tif (nextView instanceof "; + protected final String TEXT_97 = " && name.equals(nextView.getType())) {" + NL + "\t\t\treturn ("; + protected final String TEXT_98 = ") nextView;" + NL + "\t\t}" + NL + "\t}" + NL + "\treturn null;" + NL + "}"; + protected final String TEXT_99 = NL; + protected final String TEXT_100 = NL; + protected final String TEXT_101 = "/**" + NL + " *@generated" + NL + " */" + NL + "private void storeLinks("; protected final String TEXT_102 = " container, "; - protected final String TEXT_103 = " containerMetaclass) {\t"; - protected final String TEXT_104 = "\t\t" + NL + "\tif ("; - protected final String TEXT_105 = ".eINSTANCE.get"; - protected final String TEXT_106 = "().isSuperTypeOf(containerMetaclass)) {"; - protected final String TEXT_107 = "\t\t" + NL + "\t\tfor ("; - protected final String TEXT_108 = " values = "; - protected final String TEXT_109 = ".iterator(); values.hasNext();) {" + NL + "\t\t\t"; - protected final String TEXT_110 = " nextValue = (("; - protected final String TEXT_111 = ") values.next());"; - protected final String TEXT_112 = NL + "\t\t"; - protected final String TEXT_113 = " nextValue = ("; - protected final String TEXT_114 = ") "; - protected final String TEXT_115 = ";"; - protected final String TEXT_116 = NL + "\t\tObject structuralFeatureResult = "; - protected final String TEXT_117 = ";" + NL + "\t\tif (structuralFeatureResult instanceof "; - protected final String TEXT_118 = ") {" + NL + "\t\t\t"; - protected final String TEXT_119 = " dst = ("; - protected final String TEXT_120 = ") structuralFeatureResult;"; - protected final String TEXT_121 = NL + "\t\t\tstructuralFeatureResult = "; - protected final String TEXT_122 = ";" + NL + "\t\t\tif (structuralFeatureResult instanceof "; - protected final String TEXT_123 = ") {" + NL + "\t\t\t\t"; - protected final String TEXT_124 = " src = ("; - protected final String TEXT_125 = ") structuralFeatureResult;"; - protected final String TEXT_126 = NL + "\t\t\t"; - protected final String TEXT_127 = " src = container;"; - protected final String TEXT_128 = NL + "\t\t\tint linkVID = "; - protected final String TEXT_129 = ".INSTANCE.getLinkWithClassVisualID(nextValue);" + NL + "\t\t\tif ("; - protected final String TEXT_130 = " == linkVID) {" + NL + "\t\t\t\tmyLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID));" + NL + "\t\t\t}"; - protected final String TEXT_131 = NL + "\t\t\t}"; - protected final String TEXT_132 = NL + "\t\t}"; - protected final String TEXT_133 = NL + "\t\t}"; - protected final String TEXT_134 = NL + "\t}"; - protected final String TEXT_135 = NL + "}" + NL + "" + NL + "/**" + NL + " *@generated" + NL + " */" + NL + "private void storeFeatureModelFacetLinks("; - protected final String TEXT_136 = " container, "; - protected final String TEXT_137 = " containerMetaclass, Diagram diagram) {"; - protected final String TEXT_138 = NL; - protected final String TEXT_139 = "\tif ("; - protected final String TEXT_140 = ".eINSTANCE.get"; - protected final String TEXT_141 = "().isSuperTypeOf(containerMetaclass)) {"; - protected final String TEXT_142 = NL + "\t\tfor ("; - protected final String TEXT_143 = " destinations = "; - protected final String TEXT_144 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; - protected final String TEXT_145 = " nextDestination = ("; - protected final String TEXT_146 = ") destinations.next();"; - protected final String TEXT_147 = NL + "\t\t"; + protected final String TEXT_103 = " diagram) {" + NL + "\t"; + protected final String TEXT_104 = " containerMetaclass = container.eClass();" + NL + "\tstoreFeatureModelFacetLinks(container, containerMetaclass, diagram);" + NL + "\tstoreTypeModelFacetLinks(container, containerMetaclass);" + NL + "}" + NL + "\t" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void storeTypeModelFacetLinks("; + protected final String TEXT_105 = " container, "; + protected final String TEXT_106 = " containerMetaclass) {\t"; + protected final String TEXT_107 = "\t\t" + NL + "\tif ("; + protected final String TEXT_108 = ".eINSTANCE.get"; + protected final String TEXT_109 = "().isSuperTypeOf(containerMetaclass)) {"; + protected final String TEXT_110 = "\t\t" + NL + "\t\tfor ("; + protected final String TEXT_111 = " values = "; + protected final String TEXT_112 = ".iterator(); values.hasNext();) {" + NL + "\t\t\t"; + protected final String TEXT_113 = " nextValue = (("; + protected final String TEXT_114 = ") values.next());"; + protected final String TEXT_115 = NL + "\t\t"; + protected final String TEXT_116 = " nextValue = ("; + protected final String TEXT_117 = ") "; + protected final String TEXT_118 = ";"; + protected final String TEXT_119 = NL + "\t\tObject structuralFeatureResult = "; + protected final String TEXT_120 = ";" + NL + "\t\tif (structuralFeatureResult instanceof "; + protected final String TEXT_121 = ") {" + NL + "\t\t\t"; + protected final String TEXT_122 = " dst = ("; + protected final String TEXT_123 = ") structuralFeatureResult;"; + protected final String TEXT_124 = NL + "\t\t\tstructuralFeatureResult = "; + protected final String TEXT_125 = ";" + NL + "\t\t\tif (structuralFeatureResult instanceof "; + protected final String TEXT_126 = ") {" + NL + "\t\t\t\t"; + protected final String TEXT_127 = " src = ("; + protected final String TEXT_128 = ") structuralFeatureResult;"; + protected final String TEXT_129 = NL + "\t\t\t"; + protected final String TEXT_130 = " src = container;"; + protected final String TEXT_131 = NL + "\t\t\tint linkVID = "; + protected final String TEXT_132 = ".INSTANCE.getLinkWithClassVisualID(nextValue);" + NL + "\t\t\tif ("; + protected final String TEXT_133 = ".VISUAL_ID == linkVID) {" + NL + "\t\t\t\tmyLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID));" + NL + "\t\t\t}"; + protected final String TEXT_134 = NL + "\t\t\t}"; + protected final String TEXT_135 = NL + "\t\t}"; + protected final String TEXT_136 = NL + "\t\t}"; + protected final String TEXT_137 = NL + "\t}"; + protected final String TEXT_138 = NL + "}" + NL + "" + NL + "/**" + NL + " *@generated" + NL + " */" + NL + "private void storeFeatureModelFacetLinks("; + protected final String TEXT_139 = " container, "; + protected final String TEXT_140 = " containerMetaclass, Diagram diagram) {"; + protected final String TEXT_141 = NL; + protected final String TEXT_142 = "\tif ("; + protected final String TEXT_143 = ".eINSTANCE.get"; + protected final String TEXT_144 = "().isSuperTypeOf(containerMetaclass)) {"; + protected final String TEXT_145 = NL + "\t\tfor ("; + protected final String TEXT_146 = " destinations = "; + protected final String TEXT_147 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; protected final String TEXT_148 = " nextDestination = ("; - protected final String TEXT_149 = ") "; - protected final String TEXT_150 = ";"; - protected final String TEXT_151 = NL + "\t\tif ("; - protected final String TEXT_152 = " == "; - protected final String TEXT_153 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; - protected final String TEXT_154 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; - protected final String TEXT_155 = "."; - protected final String TEXT_156 = ", "; - protected final String TEXT_157 = "));"; - protected final String TEXT_158 = NL + "\t\t"; - protected final String TEXT_159 = " nextNode = ViewService.createNode(diagram, nextDestination, "; - protected final String TEXT_160 = ".VISUAL_ID, "; - protected final String TEXT_161 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextDestination, nextNode);" + NL + "\t\tcreate"; - protected final String TEXT_162 = "Children(nextNode, nextDestination);"; - protected final String TEXT_163 = NL; - protected final String TEXT_164 = NL + "\t\t}"; - protected final String TEXT_165 = NL + "\t\t}"; - protected final String TEXT_166 = NL + "\t}"; + protected final String TEXT_149 = ") destinations.next();"; + protected final String TEXT_150 = NL + "\t\t"; + protected final String TEXT_151 = " nextDestination = ("; + protected final String TEXT_152 = ") "; + protected final String TEXT_153 = ";"; + protected final String TEXT_154 = NL + "\t\tif ("; + protected final String TEXT_155 = ".VISUAL_ID == "; + protected final String TEXT_156 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; + protected final String TEXT_157 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; + protected final String TEXT_158 = "."; + protected final String TEXT_159 = ", "; + protected final String TEXT_160 = ".VISUAL_ID));"; + protected final String TEXT_161 = NL + "\t\t"; + protected final String TEXT_162 = " nextNode = ViewService.createNode(diagram, nextDestination, "; + protected final String TEXT_163 = ".getType("; + protected final String TEXT_164 = ".VISUAL_ID), "; + protected final String TEXT_165 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextDestination, nextNode);" + NL + "\t\tcreate"; + protected final String TEXT_166 = "Children(nextNode, nextDestination);"; protected final String TEXT_167 = NL; - protected final String TEXT_168 = "\tif ("; - protected final String TEXT_169 = ".eINSTANCE.get"; - protected final String TEXT_170 = "().isSuperTypeOf(containerMetaclass)) {"; - protected final String TEXT_171 = NL + "\t\tfor ("; - protected final String TEXT_172 = " destinations = "; - protected final String TEXT_173 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; - protected final String TEXT_174 = " nextDestination = ("; - protected final String TEXT_175 = ") destinations.next();"; - protected final String TEXT_176 = NL + "\t\t"; - protected final String TEXT_177 = " nextDestination = ("; - protected final String TEXT_178 = ") "; - protected final String TEXT_179 = ";"; - protected final String TEXT_180 = NL + "\t\tif ("; - protected final String TEXT_181 = " == "; - protected final String TEXT_182 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; - protected final String TEXT_183 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; - protected final String TEXT_184 = "."; - protected final String TEXT_185 = ", "; - protected final String TEXT_186 = "));"; - protected final String TEXT_187 = NL; - protected final String TEXT_188 = NL + "\t\t}"; - protected final String TEXT_189 = NL + "\t\t}"; - protected final String TEXT_190 = NL + "\t}"; - protected final String TEXT_191 = NL + "}" + NL + "" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void createLinks("; - protected final String TEXT_192 = " diagram) {" + NL + "\tfor ("; - protected final String TEXT_193 = " it = myLinkDescriptors.iterator(); it.hasNext();) {" + NL + "\t\tLinkDescriptor nextLinkDescriptor = (LinkDescriptor) it.next();" + NL + "\t\t"; - protected final String TEXT_194 = " edge = ("; - protected final String TEXT_195 = ") ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, \"\", "; - protected final String TEXT_196 = ".APPEND, "; - protected final String TEXT_197 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tif (edge != null) {" + NL + "\t\t\tedge.setSource(("; - protected final String TEXT_198 = ") myEObject2NodeMap.get(nextLinkDescriptor.getSource()));" + NL + "\t\t\tedge.setTarget(("; - protected final String TEXT_199 = ") myEObject2NodeMap.get(nextLinkDescriptor.getDestination()));" + NL + "\t\t}" + NL + "\t}" + NL + "}" + NL; - protected final String TEXT_200 = NL; - protected final String TEXT_201 = "/**" + NL + " * @generated" + NL + " */" + NL + "private class LinkDescriptor {" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_202 = " mySource;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_203 = " myDestination;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_204 = " myLinkElement;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate int myVisualID;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_205 = " mySemanticAdapter;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; - protected final String TEXT_206 = " source, "; - protected final String TEXT_207 = " destination, "; - protected final String TEXT_208 = " linkElement, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = linkElement;" + NL + "\t\tmySemanticAdapter = new "; - protected final String TEXT_209 = "(linkElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; + protected final String TEXT_168 = NL + "\t\t}"; + protected final String TEXT_169 = NL + "\t\t}"; + protected final String TEXT_170 = NL + "\t}"; + protected final String TEXT_171 = NL; + protected final String TEXT_172 = "\tif ("; + protected final String TEXT_173 = ".eINSTANCE.get"; + protected final String TEXT_174 = "().isSuperTypeOf(containerMetaclass)) {"; + protected final String TEXT_175 = NL + "\t\tfor ("; + protected final String TEXT_176 = " destinations = "; + protected final String TEXT_177 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; + protected final String TEXT_178 = " nextDestination = ("; + protected final String TEXT_179 = ") destinations.next();"; + protected final String TEXT_180 = NL + "\t\t"; + protected final String TEXT_181 = " nextDestination = ("; + protected final String TEXT_182 = ") "; + protected final String TEXT_183 = ";"; + protected final String TEXT_184 = NL + "\t\tif ("; + protected final String TEXT_185 = ".VISUAL_ID == "; + protected final String TEXT_186 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; + protected final String TEXT_187 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; + protected final String TEXT_188 = "."; + protected final String TEXT_189 = ", "; + protected final String TEXT_190 = ".VISUAL_ID));"; + protected final String TEXT_191 = NL; + protected final String TEXT_192 = NL + "\t\t}"; + protected final String TEXT_193 = NL + "\t\t}"; + protected final String TEXT_194 = NL + "\t}"; + protected final String TEXT_195 = NL + "}" + NL + "" + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "private void createLinks("; + protected final String TEXT_196 = " diagram) {" + NL + "\tfor ("; + protected final String TEXT_197 = " it = myLinkDescriptors.iterator(); it.hasNext();) {" + NL + "\t\tLinkDescriptor nextLinkDescriptor = (LinkDescriptor) it.next();" + NL + "\t\t"; + protected final String TEXT_198 = " edge = ("; + protected final String TEXT_199 = ") ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, \"\", "; + protected final String TEXT_200 = ".APPEND, "; + protected final String TEXT_201 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tif (edge != null) {" + NL + "\t\t\tedge.setSource(("; + protected final String TEXT_202 = ") myEObject2NodeMap.get(nextLinkDescriptor.getSource()));" + NL + "\t\t\tedge.setTarget(("; + protected final String TEXT_203 = ") myEObject2NodeMap.get(nextLinkDescriptor.getDestination()));" + NL + "\t\t}" + NL + "\t}" + NL + "}" + NL; + protected final String TEXT_204 = NL; + protected final String TEXT_205 = "/**" + NL + " * @generated" + NL + " */" + NL + "private class LinkDescriptor {" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_206 = " mySource;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_207 = " myDestination;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_208 = " myLinkElement;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate int myVisualID;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_209 = " mySemanticAdapter;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; protected final String TEXT_210 = " source, "; protected final String TEXT_211 = " destination, "; - protected final String TEXT_212 = " elementType, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = null;" + NL + "\t\tfinal "; - protected final String TEXT_213 = " elementTypeCopy = elementType;" + NL + "\t\tmySemanticAdapter = new "; - protected final String TEXT_214 = "() {" + NL + "\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\tif ("; - protected final String TEXT_215 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\treturn elementTypeCopy;" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate LinkDescriptor("; - protected final String TEXT_216 = " source, "; - protected final String TEXT_217 = " destination, int linkVID) {" + NL + "\t\tmySource = source;" + NL + "\t\tmyDestination = destination;" + NL + "\t\tmyVisualID = linkVID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_218 = " getSource() {" + NL + "\t\treturn mySource;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_219 = " getDestination() {" + NL + "\t\treturn myDestination;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_220 = " getLinkElement() {" + NL + "\t\treturn myLinkElement;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected int getVisualID() {" + NL + "\t\treturn myVisualID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_221 = " getSemanticAdapter() {" + NL + "\t\treturn mySemanticAdapter;" + NL + "\t}" + NL + "}"; - protected final String TEXT_222 = "\t" + NL + "" + NL + "}"; + protected final String TEXT_212 = " linkElement, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = linkElement;" + NL + "\t\tmySemanticAdapter = new "; + protected final String TEXT_213 = "(linkElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; + protected final String TEXT_214 = " source, "; + protected final String TEXT_215 = " destination, "; + protected final String TEXT_216 = " elementType, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = null;" + NL + "\t\tfinal "; + protected final String TEXT_217 = " elementTypeCopy = elementType;" + NL + "\t\tmySemanticAdapter = new "; + protected final String TEXT_218 = "() {" + NL + "\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\tif ("; + protected final String TEXT_219 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\treturn elementTypeCopy;" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate LinkDescriptor("; + protected final String TEXT_220 = " source, "; + protected final String TEXT_221 = " destination, int linkVID) {" + NL + "\t\tmySource = source;" + NL + "\t\tmyDestination = destination;" + NL + "\t\tmyVisualID = linkVID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_222 = " getSource() {" + NL + "\t\treturn mySource;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_223 = " getDestination() {" + NL + "\t\treturn myDestination;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_224 = " getLinkElement() {" + NL + "\t\treturn myLinkElement;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected int getVisualID() {" + NL + "\t\treturn myVisualID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_225 = " getSemanticAdapter() {" + NL + "\t\treturn mySemanticAdapter;" + NL + "\t}" + NL + "}"; + protected final String TEXT_226 = "\t" + NL + "" + NL + "}"; protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) { StringBuffer result = new StringBuffer(); @@ -406,7 +410,7 @@ importManager.markImportLocation(stringBuffer); stringBuffer.append(TEXT_10); stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_11); - stringBuffer.append(genDiagram.getVisualID()); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_12); stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_13); @@ -490,43 +494,45 @@ for (Iterator phantoms = genClass2Phantom.values().iterator(); phantoms.hasNext( GenTopLevelNode phantomNode = (GenTopLevelNode) phantoms.next(); stringBuffer.append(TEXT_42); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_43); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_44); - stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_45); - stringBuffer.append(pluginActivatorClass); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_46); - stringBuffer.append(phantomNode.getUniqueIdentifier()); + stringBuffer.append(pluginActivatorClass); stringBuffer.append(TEXT_47); + stringBuffer.append(phantomNode.getUniqueIdentifier()); stringBuffer.append(TEXT_48); stringBuffer.append(TEXT_49); + stringBuffer.append(TEXT_50); } if (!genClass2Phantom.isEmpty()) { - stringBuffer.append(TEXT_50); + stringBuffer.append(TEXT_51); } // TODO: remove "createLinks()" method - this task should be done by canonicalEditPolicies - stringBuffer.append(TEXT_51); + stringBuffer.append(TEXT_52); boolean generateGetCompartment = false; for (Iterator containers = genDiagram.getAllContainers().iterator(); containers.hasNext();) { GenContainerBase nextContainer = (GenContainerBase) containers.next(); - stringBuffer.append(TEXT_52); - stringBuffer.append(nextContainer.getUniqueIdentifier()); stringBuffer.append(TEXT_53); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); + stringBuffer.append(nextContainer.getUniqueIdentifier()); stringBuffer.append(TEXT_54); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); stringBuffer.append(TEXT_55); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_56); { List genNodes = nextContainer.getContainedNodes(); - stringBuffer.append(TEXT_56); + stringBuffer.append(TEXT_57); Map genFeature2genNodeMap = new LinkedHashMap(); for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) { @@ -546,9 +552,9 @@ for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) { Set entrySet = genFeature2genNodeMap.entrySet(); if (entrySet.size() > 0) { - stringBuffer.append(TEXT_57); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_58); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_59); } @@ -558,57 +564,59 @@ for (Iterator entries = entrySet.iterator(); entries.hasNext();) { Collection genNodesCollection = (Collection) nextEntry.getValue(); if (childMetaFeature.isListType()) { - stringBuffer.append(TEXT_59); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_60); - stringBuffer.append(getFeatureValueGetter("modelObject", childMetaFeature, true, importManager)); + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_61); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(getFeatureValueGetter("modelObject", childMetaFeature, true, importManager)); stringBuffer.append(TEXT_62); - } else { + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_63); - stringBuffer.append(getFeatureValueGetter("modelObject", childMetaFeature, true, importManager)); + } else { stringBuffer.append(TEXT_64); - } + stringBuffer.append(getFeatureValueGetter("modelObject", childMetaFeature, true, importManager)); stringBuffer.append(TEXT_65); - stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + } stringBuffer.append(TEXT_66); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(TEXT_67); boolean generateSwitch = genNodesCollection.size() != 1; if (generateSwitch) { - stringBuffer.append(TEXT_67); + stringBuffer.append(TEXT_68); } for (Iterator genNodesIterator = genNodesCollection.iterator(); genNodesIterator.hasNext();) { GenNode nextNode = (GenNode) genNodesIterator.next(); if (generateSwitch) { - stringBuffer.append(TEXT_68); - stringBuffer.append(nextNode.getVisualID()); stringBuffer.append(TEXT_69); - } else { + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_70); - stringBuffer.append(nextNode.getVisualID()); + } else { stringBuffer.append(TEXT_71); - } + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_72); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); + } stringBuffer.append(TEXT_73); - stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_74); - stringBuffer.append(pluginActivatorClass); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_75); - stringBuffer.append(nextNode.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_76); + stringBuffer.append(pluginActivatorClass); stringBuffer.append(TEXT_77); - if (generateSwitch) { + stringBuffer.append(nextNode.getUniqueIdentifier()); stringBuffer.append(TEXT_78); - } stringBuffer.append(TEXT_79); + if (generateSwitch) { + stringBuffer.append(TEXT_80); + } + stringBuffer.append(TEXT_81); } if (generateSwitch) { - stringBuffer.append(TEXT_80); + stringBuffer.append(TEXT_82); } if (childMetaFeature.isListType()) { - stringBuffer.append(TEXT_81); + stringBuffer.append(TEXT_83); } } } @@ -619,58 +627,60 @@ for (Iterator entries = entrySet.iterator(); entries.hasNext();) { generateGetCompartment = true; GenCompartment nextCompartment = (GenCompartment) nextNode.getCompartments().get(i); - stringBuffer.append(TEXT_82); + stringBuffer.append(TEXT_84); stringBuffer.append(i == 0 ? importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node") : ""); - stringBuffer.append(TEXT_83); + stringBuffer.append(TEXT_85); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(TEXT_86); stringBuffer.append(importManager.getImportedName(nextCompartment.getEditPartQualifiedClassName())); - stringBuffer.append(TEXT_84); + stringBuffer.append(TEXT_87); stringBuffer.append(nextCompartment.getUniqueIdentifier()); - stringBuffer.append(TEXT_85); + stringBuffer.append(TEXT_88); } } if (false == nextContainer instanceof GenCompartment) { - stringBuffer.append(TEXT_86); + stringBuffer.append(TEXT_89); } - stringBuffer.append(TEXT_87); + stringBuffer.append(TEXT_90); } if (generateGetCompartment) { - stringBuffer.append(TEXT_88); + stringBuffer.append(TEXT_91); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); - stringBuffer.append(TEXT_89); + stringBuffer.append(TEXT_92); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); - stringBuffer.append(TEXT_90); + stringBuffer.append(TEXT_93); stringBuffer.append(importManager.getImportedName("java.util.Iterator")); - stringBuffer.append(TEXT_91); + stringBuffer.append(TEXT_94); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); - stringBuffer.append(TEXT_92); + stringBuffer.append(TEXT_95); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); - stringBuffer.append(TEXT_93); + stringBuffer.append(TEXT_96); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); - stringBuffer.append(TEXT_94); + stringBuffer.append(TEXT_97); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); - stringBuffer.append(TEXT_95); + stringBuffer.append(TEXT_98); } - stringBuffer.append(TEXT_96); - boolean createPhantoms = true; - stringBuffer.append(TEXT_97); - stringBuffer.append(TEXT_98); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_99); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); + boolean createPhantoms = true; stringBuffer.append(TEXT_100); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass")); stringBuffer.append(TEXT_101); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_102); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); stringBuffer.append(TEXT_103); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass")); + stringBuffer.append(TEXT_104); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_105); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass")); + stringBuffer.append(TEXT_106); for (Iterator it = genLinks.iterator(); it.hasNext();) { GenLink nextLink = (GenLink) it.next(); @@ -678,85 +688,85 @@ for (Iterator it = genLinks.iterator(); it.hasNext();) { TypeLinkModelFacet typeLinkModelFacet = (TypeLinkModelFacet) nextLink.getModelFacet(); GenFeature childMetaFeature = typeLinkModelFacet.getChildMetaFeature(); - stringBuffer.append(TEXT_104); - stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName())); - stringBuffer.append(TEXT_105); - stringBuffer.append(childMetaFeature.getGenClass().getClassifierAccessorName()); - stringBuffer.append(TEXT_106); - if (childMetaFeature.isListType()) { stringBuffer.append(TEXT_107); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); + stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName())); stringBuffer.append(TEXT_108); - stringBuffer.append(getFeatureValueGetter("container", childMetaFeature, true, importManager)); + stringBuffer.append(childMetaFeature.getGenClass().getClassifierAccessorName()); stringBuffer.append(TEXT_109); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (childMetaFeature.isListType()) { stringBuffer.append(TEXT_110); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_111); - } else { + stringBuffer.append(getFeatureValueGetter("container", childMetaFeature, true, importManager)); stringBuffer.append(TEXT_112); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_113); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_114); - stringBuffer.append(getFeatureValueGetter("container", childMetaFeature, true, importManager)); + } else { stringBuffer.append(TEXT_115); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_116); - stringBuffer.append(getFeatureValueGetter("nextValue", typeLinkModelFacet.getTargetMetaFeature(), true, importManager)); - stringBuffer.append(TEXT_117); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_117); + stringBuffer.append(getFeatureValueGetter("container", childMetaFeature, true, importManager)); stringBuffer.append(TEXT_118); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + } stringBuffer.append(TEXT_119); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(getFeatureValueGetter("nextValue", typeLinkModelFacet.getTargetMetaFeature(), true, importManager)); stringBuffer.append(TEXT_120); - if (typeLinkModelFacet.getSourceMetaFeature() != null) { + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_121); - stringBuffer.append(getFeatureValueGetter("nextValue", typeLinkModelFacet.getSourceMetaFeature(), true, importManager)); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_122); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_123); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (typeLinkModelFacet.getSourceMetaFeature() != null) { stringBuffer.append(TEXT_124); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(getFeatureValueGetter("nextValue", typeLinkModelFacet.getSourceMetaFeature(), true, importManager)); stringBuffer.append(TEXT_125); - } else { + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_126); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_127); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_128); - stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + } else { stringBuffer.append(TEXT_129); - stringBuffer.append(nextLink.getVisualID()); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_130); - if (typeLinkModelFacet.getSourceMetaFeature() != null) { - stringBuffer.append(TEXT_131); } + stringBuffer.append(TEXT_131); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_132); + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); + stringBuffer.append(TEXT_133); + if (typeLinkModelFacet.getSourceMetaFeature() != null) { + stringBuffer.append(TEXT_134); + } + stringBuffer.append(TEXT_135); if (childMetaFeature.isListType()) { - stringBuffer.append(TEXT_133); + stringBuffer.append(TEXT_136); } - stringBuffer.append(TEXT_134); + stringBuffer.append(TEXT_137); } } - stringBuffer.append(TEXT_135); + stringBuffer.append(TEXT_138); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); - stringBuffer.append(TEXT_136); + stringBuffer.append(TEXT_139); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass")); - stringBuffer.append(TEXT_137); + stringBuffer.append(TEXT_140); for (int linkIndex = 0; linkIndex < genLinks.size(); linkIndex++) { boolean phantomsOnly = true; - stringBuffer.append(TEXT_138); + stringBuffer.append(TEXT_141); GenLink nextLink = (GenLink) genLinks.get(linkIndex); if (false == nextLink.getModelFacet() instanceof FeatureModelFacet) { @@ -770,70 +780,72 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu continue; } - stringBuffer.append(TEXT_139); - stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); - stringBuffer.append(TEXT_140); - stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); - stringBuffer.append(TEXT_141); - if (genFeature.isListType()) { stringBuffer.append(TEXT_142); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); + stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); stringBuffer.append(TEXT_143); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); stringBuffer.append(TEXT_144); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (genFeature.isListType()) { stringBuffer.append(TEXT_145); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_146); - } else { + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); stringBuffer.append(TEXT_147); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_148); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_149); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + } else { stringBuffer.append(TEXT_150); - } - if (phantomsOnly) { + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_151); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_152); - stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); stringBuffer.append(TEXT_153); } + if (phantomsOnly) { stringBuffer.append(TEXT_154); - stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_155); - stringBuffer.append(nextLink.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_156); - stringBuffer.append(nextLink.getVisualID()); + } stringBuffer.append(TEXT_157); - if (createPhantoms) { + stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); stringBuffer.append(TEXT_158); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); + stringBuffer.append(nextLink.getUniqueIdentifier()); stringBuffer.append(TEXT_159); - stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_160); - stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); + if (createPhantoms) { stringBuffer.append(TEXT_161); - stringBuffer.append(phantomNode.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_162); - } + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_163); - if (phantomsOnly) { + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_164); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); + stringBuffer.append(TEXT_165); + stringBuffer.append(phantomNode.getUniqueIdentifier()); + stringBuffer.append(TEXT_166); + } + stringBuffer.append(TEXT_167); + if (phantomsOnly) { + stringBuffer.append(TEXT_168); } if (genFeature.isListType()) { - stringBuffer.append(TEXT_165); + stringBuffer.append(TEXT_169); } - stringBuffer.append(TEXT_166); + stringBuffer.append(TEXT_170); } for (int linkIndex = 0; linkIndex < genLinks.size(); linkIndex++) { boolean phantomsOnly = false; - stringBuffer.append(TEXT_167); + stringBuffer.append(TEXT_171); GenLink nextLink = (GenLink) genLinks.get(linkIndex); if (false == nextLink.getModelFacet() instanceof FeatureModelFacet) { @@ -847,82 +859,74 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu continue; } - stringBuffer.append(TEXT_168); - stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); - stringBuffer.append(TEXT_169); - stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); - stringBuffer.append(TEXT_170); - if (genFeature.isListType()) { - stringBuffer.append(TEXT_171); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_172); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); stringBuffer.append(TEXT_173); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); stringBuffer.append(TEXT_174); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (genFeature.isListType()) { stringBuffer.append(TEXT_175); - } else { + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_176); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); stringBuffer.append(TEXT_177); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_178); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_179); - } - if (phantomsOnly) { + } else { stringBuffer.append(TEXT_180); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_181); - stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_182); - } + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); stringBuffer.append(TEXT_183); - stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); + } + if (phantomsOnly) { stringBuffer.append(TEXT_184); - stringBuffer.append(nextLink.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_185); - stringBuffer.append(nextLink.getVisualID()); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_186); + } stringBuffer.append(TEXT_187); - if (phantomsOnly) { + stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); stringBuffer.append(TEXT_188); - } - if (genFeature.isListType()) { + stringBuffer.append(nextLink.getUniqueIdentifier()); stringBuffer.append(TEXT_189); - } + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_190); - } stringBuffer.append(TEXT_191); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); + if (phantomsOnly) { stringBuffer.append(TEXT_192); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); + } + if (genFeature.isListType()) { stringBuffer.append(TEXT_193); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")); + } stringBuffer.append(TEXT_194); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")); + } stringBuffer.append(TEXT_195); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.core.util.ViewUtil")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); stringBuffer.append(TEXT_196); - stringBuffer.append(pluginActivatorClass); + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_197); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")); stringBuffer.append(TEXT_198); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")); stringBuffer.append(TEXT_199); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.core.util.ViewUtil")); stringBuffer.append(TEXT_200); - -// an inner class - + stringBuffer.append(pluginActivatorClass); stringBuffer.append(TEXT_201); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_202); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_203); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_204); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); + +// an inner class + stringBuffer.append(TEXT_205); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_206); @@ -930,34 +934,42 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu stringBuffer.append(TEXT_207); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_208); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); stringBuffer.append(TEXT_209); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_210); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_211); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_212); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_213); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_214); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); - stringBuffer.append(TEXT_215); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_215); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_216); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_217); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); stringBuffer.append(TEXT_218); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_219); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_220); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_221); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_222); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_223); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_224); + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); + stringBuffer.append(TEXT_225); + } + stringBuffer.append(TEXT_226); importManager.emitSortedImports(); return stringBuffer.toString(); } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/VisualIDRegistryGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/VisualIDRegistryGenerator.java index 310b7c73c..5c279a4fa 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/VisualIDRegistryGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/VisualIDRegistryGenerator.java @@ -25,44 +25,44 @@ public class VisualIDRegistryGenerator protected final String TEXT_7 = " INSTANCE = new "; protected final String TEXT_8 = "();" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static int getVisualID(View view) {" + NL + "\t\tif (view instanceof Diagram) {" + NL + "\t\t\tif ("; protected final String TEXT_9 = ".MODEL_ID.equals(view.getType())) {" + NL + "\t\t\t\treturn "; - protected final String TEXT_10 = ";" + NL + "\t\t\t} else {" + NL + "\t\t\t\treturn -1;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\ttry {" + NL + "\t\t\treturn Integer.parseInt(view.getType());" + NL + "\t\t} catch (NumberFormatException e) {" + NL + "\t\t\t"; - protected final String TEXT_11 = ".getInstance().logInfo(\"Unable to parse view type as a visualID number: \" + view.getType());" + NL + "\t\t}" + NL + "\t\treturn -1;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String getModelID(View view) {" + NL + "\t\tView diagram = view.getDiagram();" + NL + "\t\twhile (view != diagram) {" + NL + "\t\t\t"; - protected final String TEXT_12 = " annotation = view.getEAnnotation(\"Shortcut\"); //$NON-NLS-1$" + NL + "\t\t\tif (annotation != null) {" + NL + "\t\t\t\treturn (String) annotation.getDetails().get(\"modelID\"); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t\tview = (View) view.eContainer();" + NL + "\t\t}" + NL + "\t\treturn diagram != null ? diagram.getType() : null;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getDiagramVisualID(EObject domainElement) {" + NL + "\t\tif (domainElement == null) {" + NL + "\t\t\treturn -1;" + NL + "\t\t}" + NL + "\t\tEClass domainElementMetaclass = domainElement.eClass();" + NL + "\t\treturn getDiagramVisualID(domainElement, domainElementMetaclass);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getDiagramVisualID(EObject domainElement, EClass domainElementMetaclass) {"; + protected final String TEXT_10 = ".VISUAL_ID;" + NL + "\t\t\t} else {" + NL + "\t\t\t\treturn -1;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn getVisualID(view.getType());" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String getModelID(View view) {" + NL + "\t\tView diagram = view.getDiagram();" + NL + "\t\twhile (view != diagram) {" + NL + "\t\t\t"; + protected final String TEXT_11 = " annotation = view.getEAnnotation(\"Shortcut\"); //$NON-NLS-1$" + NL + "\t\t\tif (annotation != null) {" + NL + "\t\t\t\treturn (String) annotation.getDetails().get(\"modelID\"); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t\tview = (View) view.eContainer();" + NL + "\t\t}" + NL + "\t\treturn diagram != null ? diagram.getType() : null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static int getVisualID(String type) {" + NL + "\t\ttry {" + NL + "\t\t\treturn Integer.parseInt(type);" + NL + "\t\t} catch (NumberFormatException e) {" + NL + "\t\t\t"; + protected final String TEXT_12 = ".getInstance().logInfo(\"Unable to parse view type as a visualID number: \" + type);" + NL + "\t\t}" + NL + "\t\treturn -1;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String getType(int visualID) {" + NL + "\t\treturn String.valueOf(visualID);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getDiagramVisualID(EObject domainElement) {" + NL + "\t\tif (domainElement == null) {" + NL + "\t\t\treturn -1;" + NL + "\t\t}" + NL + "\t\tEClass domainElementMetaclass = domainElement.eClass();" + NL + "\t\treturn getDiagramVisualID(domainElement, domainElementMetaclass);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getDiagramVisualID(EObject domainElement, EClass domainElementMetaclass) {"; protected final String TEXT_13 = NL + "\t\tif ("; protected final String TEXT_14 = ".eINSTANCE.get"; protected final String TEXT_15 = "().equals(domainElementMetaclass) && (domainElement == null || isDiagram"; protected final String TEXT_16 = "(("; protected final String TEXT_17 = ") domainElement))) {" + NL + "\t\t\treturn "; - protected final String TEXT_18 = ";" + NL + "\t\t}"; + protected final String TEXT_18 = ".VISUAL_ID;" + NL + "\t\t}"; protected final String TEXT_19 = NL + "\t\treturn getUnrecognizedDiagramID(domainElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getNodeVisualID(View containerView, EObject domainElement) {" + NL + "\t\tif (domainElement == null) {" + NL + "\t\t\treturn -1;" + NL + "\t\t}" + NL + "\t\tEClass domainElementMetaclass = domainElement.eClass();" + NL + "\t\treturn getNodeVisualID(containerView, domainElement, domainElementMetaclass, null);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getNodeVisualID(View containerView, EObject domainElement, EClass domainElementMetaclass, String semanticHint) {" + NL + "\t\tString containerModelID = getModelID(containerView);" + NL + "\t\tif (!"; protected final String TEXT_20 = ".MODEL_ID.equals(containerModelID)"; protected final String TEXT_21 = "\t\t\t" + NL + "\t\t\t&& !\""; protected final String TEXT_22 = "\".equals(containerModelID)"; protected final String TEXT_23 = NL + "\t\t) {" + NL + "\t\t\treturn -1;" + NL + "\t\t}" + NL + "\t\tint containerVisualID;" + NL + "\t\tif ("; protected final String TEXT_24 = ".MODEL_ID.equals(containerModelID)) {" + NL + "\t\t\tcontainerVisualID = getVisualID(containerView);" + NL + "\t\t} else {" + NL + "\t\t\tif (containerView instanceof Diagram) {" + NL + "\t\t\t\tcontainerVisualID = "; - protected final String TEXT_25 = ";\t\t" + NL + "\t\t\t} else {" + NL + "\t\t\t\treturn -1;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tswitch (containerVisualID) {"; + protected final String TEXT_25 = ".VISUAL_ID;\t\t" + NL + "\t\t\t} else {" + NL + "\t\t\t\treturn -1;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tint nodeVisualID = getVisualID(semanticHint);" + NL + "\t\tswitch (containerVisualID) {"; protected final String TEXT_26 = NL + "\t\tcase "; - protected final String TEXT_27 = ":"; + protected final String TEXT_27 = ".VISUAL_ID:"; protected final String TEXT_28 = NL + "\t\t\tif ("; - protected final String TEXT_29 = ".VISUAL_ID.equals(semanticHint)) {" + NL + "\t\t\t\treturn "; - protected final String TEXT_30 = ";" + NL + "\t\t\t}"; + protected final String TEXT_29 = ".VISUAL_ID == nodeVisualID) {" + NL + "\t\t\t\treturn "; + protected final String TEXT_30 = ".VISUAL_ID;" + NL + "\t\t\t}"; protected final String TEXT_31 = NL + "\t\t\tif ("; - protected final String TEXT_32 = ".VISUAL_ID.equals(semanticHint)) {" + NL + "\t\t\t\treturn "; - protected final String TEXT_33 = ";" + NL + "\t\t\t} "; + protected final String TEXT_32 = ".VISUAL_ID == nodeVisualID) {" + NL + "\t\t\t\treturn "; + protected final String TEXT_33 = ".VISUAL_ID;" + NL + "\t\t\t} "; protected final String TEXT_34 = "\t\t" + NL + "\t\t\tif ((semanticHint == null || "; - protected final String TEXT_35 = ".VISUAL_ID.equals(semanticHint)) && "; + protected final String TEXT_35 = ".VISUAL_ID == nodeVisualID) && "; protected final String TEXT_36 = ".eINSTANCE.get"; protected final String TEXT_37 = "().equals(domainElementMetaclass) && (domainElement == null || isNode"; protected final String TEXT_38 = "(("; protected final String TEXT_39 = ") domainElement))) {" + NL + "\t\t\t\treturn "; - protected final String TEXT_40 = ";" + NL + "\t\t\t} "; + protected final String TEXT_40 = ".VISUAL_ID;" + NL + "\t\t\t} "; protected final String TEXT_41 = NL + "\t\t\treturn getUnrecognized"; protected final String TEXT_42 = "ChildNodeID(domainElement, semanticHint);"; protected final String TEXT_43 = NL + "\t\tcase "; - protected final String TEXT_44 = ":"; + protected final String TEXT_44 = ".VISUAL_ID:"; protected final String TEXT_45 = NL + "\t\t\tif ("; - protected final String TEXT_46 = ".VISUAL_ID.equals(semanticHint)) {" + NL + "\t\t\t\treturn "; - protected final String TEXT_47 = ";" + NL + "\t\t\t}"; + protected final String TEXT_46 = ".VISUAL_ID == nodeVisualID) {" + NL + "\t\t\t\treturn "; + protected final String TEXT_47 = ".VISUAL_ID;" + NL + "\t\t\t}"; protected final String TEXT_48 = NL + "\t\t\treturn getUnrecognized"; protected final String TEXT_49 = "LinkLabelID(semanticHint);"; protected final String TEXT_50 = NL + "\t\t}" + NL + "\t\treturn -1;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getLinkWithClassVisualID(EObject domainElement) {" + NL + "\t\tEClass domainElementMetaclass = domainElement.eClass();" + NL + "\t\treturn getLinkWithClassVisualID(domainElement, domainElementMetaclass);" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getLinkWithClassVisualID(EObject domainElement, EClass domainElementMetaclass) {"; @@ -71,7 +71,7 @@ public class VisualIDRegistryGenerator protected final String TEXT_53 = "().equals(domainElementMetaclass) && (domainElement == null || isLinkWithClass"; protected final String TEXT_54 = "(("; protected final String TEXT_55 = ") domainElement))) {" + NL + "\t\t\treturn "; - protected final String TEXT_56 = ";" + NL + "\t\t} else "; + protected final String TEXT_56 = ".VISUAL_ID;" + NL + "\t\t} else "; protected final String TEXT_57 = NL + "\t\t{" + NL + "\t\t\treturn getUnrecognizedLinkWithClassID(domainElement);" + NL + "\t\t}" + NL + "\t}\t" + NL; protected final String TEXT_58 = NL + "\t/**" + NL + "\t * User can change implementation of this method to check some additional " + NL + "\t * conditions here." + NL + "\t *" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate boolean isDiagram"; protected final String TEXT_59 = "("; @@ -143,11 +143,11 @@ importManager.markImportLocation(stringBuffer); stringBuffer.append(TEXT_8); stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_9); - stringBuffer.append(genDiagram.getVisualID()); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_10); - stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); - stringBuffer.append(TEXT_11); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAnnotation")); + stringBuffer.append(TEXT_11); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); stringBuffer.append(TEXT_12); if (genDiagram.getDomainDiagramElement() != null) { @@ -163,7 +163,7 @@ if (genDiagram.getDomainDiagramElement() != null) { stringBuffer.append(TEXT_16); stringBuffer.append(interfaceName); stringBuffer.append(TEXT_17); - stringBuffer.append(genDiagram.getVisualID()); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_18); } stringBuffer.append(TEXT_19); @@ -185,14 +185,14 @@ for (Iterator it = genDiagram.getShortcutsProvidedFor().iterator(); it.hasNext() stringBuffer.append(TEXT_23); stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_24); - stringBuffer.append(genDiagram.getVisualID()); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_25); for (Iterator containers = allContainers.iterator(); containers.hasNext();) { GenContainerBase nextContainer = (GenContainerBase) containers.next(); stringBuffer.append(TEXT_26); - stringBuffer.append(nextContainer.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextContainer.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_27); if (nextContainer instanceof GenNode) { @@ -203,7 +203,7 @@ for (Iterator containers = allContainers.iterator(); containers.hasNext();) { stringBuffer.append(TEXT_28); stringBuffer.append(importManager.getImportedName(label.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_29); - stringBuffer.append(label.getVisualID()); + stringBuffer.append(importManager.getImportedName(label.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_30); } @@ -213,7 +213,7 @@ for (Iterator containers = allContainers.iterator(); containers.hasNext();) { stringBuffer.append(TEXT_31); stringBuffer.append(importManager.getImportedName(compartment.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_32); - stringBuffer.append(compartment.getVisualID()); + stringBuffer.append(importManager.getImportedName(compartment.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_33); } @@ -236,7 +236,7 @@ for (Iterator containers = allContainers.iterator(); containers.hasNext();) { stringBuffer.append(TEXT_38); stringBuffer.append(interfaceName); stringBuffer.append(TEXT_39); - stringBuffer.append(childNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(childNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_40); } @@ -250,7 +250,7 @@ for (Iterator links = genLinks.iterator(); links.hasNext();) { GenLink link = (GenLink) links.next(); stringBuffer.append(TEXT_43); - stringBuffer.append(link.getVisualID()); + stringBuffer.append(importManager.getImportedName(link.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_44); for (Iterator linkLabels = link.getLabels().iterator(); linkLabels.hasNext();) { @@ -259,7 +259,7 @@ for (Iterator links = genLinks.iterator(); links.hasNext();) { stringBuffer.append(TEXT_45); stringBuffer.append(importManager.getImportedName(linkLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_46); - stringBuffer.append(linkLabel.getVisualID()); + stringBuffer.append(importManager.getImportedName(linkLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_47); } stringBuffer.append(TEXT_48); @@ -285,7 +285,7 @@ for (int i = 0; i < genLinks.size(); i++) { stringBuffer.append(TEXT_54); stringBuffer.append(importManager.getImportedName(qualifiedInterfaceName)); stringBuffer.append(TEXT_55); - stringBuffer.append(genLink.getVisualID()); + stringBuffer.append(importManager.getImportedName(genLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_56); } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ChildNodeEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ChildNodeEditPartGenerator.java index d1e901a87..de0dda61d 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ChildNodeEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ChildNodeEditPartGenerator.java @@ -24,8 +24,8 @@ public class ChildNodeEditPartGenerator protected final String TEXT_7 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_8 = " extends CompartmentEditPart implements ITextAwareEditPart {"; protected final String TEXT_9 = NL; - protected final String TEXT_10 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_11 = "\";"; + protected final String TEXT_10 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_11 = ";"; protected final String TEXT_12 = NL; protected final String TEXT_13 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_14 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java index 9f8c46241..bbb4cafd7 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/CompartmentEditPartGenerator.java @@ -26,8 +26,8 @@ public class CompartmentEditPartGenerator { protected final String TEXT_8 = " extends "; protected final String TEXT_9 = " {"; protected final String TEXT_10 = NL; - protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_12 = "\";"; + protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_12 = ";"; protected final String TEXT_13 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; protected final String TEXT_14 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}"; protected final String TEXT_15 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean hasModelChildrenChanged("; diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/DiagramEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/DiagramEditPartGenerator.java index bdbdda3af..e33ec83ca 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/DiagramEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/DiagramEditPartGenerator.java @@ -23,11 +23,15 @@ public class DiagramEditPartGenerator protected final String TEXT_6 = NL + "import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;" + NL + "import org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles;" + NL + "import org.eclipse.gmf.runtime.notation.View;"; protected final String TEXT_7 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_8 = " extends DiagramEditPart {" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String MODEL_ID = \""; - protected final String TEXT_9 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_10 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new "; - protected final String TEXT_11 = "());" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new "; - protected final String TEXT_12 = "());" + NL + "\t}" + NL + "}"; - protected final String TEXT_13 = NL; + protected final String TEXT_9 = "\";"; + protected final String TEXT_10 = NL; + protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_12 = ";"; + protected final String TEXT_13 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_14 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new "; + protected final String TEXT_15 = "());" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new "; + protected final String TEXT_16 = "());" + NL + "\t}" + NL + "}"; + protected final String TEXT_17 = NL; public String generate(Object argument) { @@ -55,14 +59,22 @@ if (copyrightText != null && copyrightText.trim().length() > 0) { stringBuffer.append(TEXT_8); stringBuffer.append(genDiagram.getEditorGen().getModelID()); stringBuffer.append(TEXT_9); - stringBuffer.append(genDiagram.getEditPartClassName()); + { +GenCommonBase genCommonBase = genDiagram; stringBuffer.append(TEXT_10); - stringBuffer.append(importManager.getImportedName(genDiagram.getItemSemanticEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_11); - stringBuffer.append(importManager.getImportedName(genDiagram.getCanonicalEditPolicyQualifiedClassName())); + stringBuffer.append(genCommonBase.getVisualID()); stringBuffer.append(TEXT_12); - importManager.emitSortedImports(); + } stringBuffer.append(TEXT_13); + stringBuffer.append(genDiagram.getEditPartClassName()); + stringBuffer.append(TEXT_14); + stringBuffer.append(importManager.getImportedName(genDiagram.getItemSemanticEditPolicyQualifiedClassName())); + stringBuffer.append(TEXT_15); + stringBuffer.append(importManager.getImportedName(genDiagram.getCanonicalEditPolicyQualifiedClassName())); + stringBuffer.append(TEXT_16); + importManager.emitSortedImports(); + stringBuffer.append(TEXT_17); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/EditPartFactoryGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/EditPartFactoryGenerator.java index 855dbb89a..733bed9c7 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/EditPartFactoryGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/EditPartFactoryGenerator.java @@ -28,16 +28,16 @@ public class EditPartFactoryGenerator protected final String TEXT_10 = ".getModelID(view))) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\t" + NL + "\t\t\tint viewVisualID = "; protected final String TEXT_11 = ".getVisualID(view);" + NL + "\t\t\tswitch (viewVisualID) {"; protected final String TEXT_12 = NL + "\t\t\tcase "; - protected final String TEXT_13 = ":" + NL + "\t\t\t\t return new "; + protected final String TEXT_13 = ".VISUAL_ID:" + NL + "\t\t\t\t return new "; protected final String TEXT_14 = "(view);"; protected final String TEXT_15 = NL + "\t\t\tcase "; - protected final String TEXT_16 = ":" + NL + "\t\t\t\treturn new "; + protected final String TEXT_16 = ".VISUAL_ID:" + NL + "\t\t\t\treturn new "; protected final String TEXT_17 = "(view);"; protected final String TEXT_18 = "\t\t" + NL + "\t\t\tcase "; - protected final String TEXT_19 = ":" + NL + "\t\t\t\treturn new "; + protected final String TEXT_19 = ".VISUAL_ID:" + NL + "\t\t\t\treturn new "; protected final String TEXT_20 = "(view);"; protected final String TEXT_21 = NL + "\t\t\tcase "; - protected final String TEXT_22 = ":" + NL + "\t\t\t\treturn new "; + protected final String TEXT_22 = ".VISUAL_ID:" + NL + "\t\t\t\treturn new "; protected final String TEXT_23 = "(view);"; protected final String TEXT_24 = NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn createUnrecognizedEditPart(context, model);" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\t private EditPart createUnrecognizedEditPart(EditPart context, Object model) {" + NL + "\t \t// Handle creation of unrecognized child node EditParts here" + NL + "\t \treturn null;" + NL + "\t }" + NL + "" + NL + "\tpublic static CellEditorLocator getTextCellEditorLocator(ITextAwareEditPart source){" + NL + " if (source.getFigure() instanceof WrapLabel)" + NL + " return new TextCellEditorLocator((WrapLabel) source.getFigure());" + NL + " else {" + NL + " IFigure figure = source.getFigure();" + NL + " return new LabelCellEditorLocator((Label) figure);" + NL + " }" + NL + " }" + NL + "" + NL + "\tstatic private class TextCellEditorLocator implements CellEditorLocator {" + NL + "" + NL + "\t\tprivate WrapLabel wrapLabel;" + NL + "\t\t" + NL + "\t\tpublic TextCellEditorLocator(WrapLabel wrapLabel) {" + NL + "\t\t\tsuper();" + NL + "\t\t\tthis.wrapLabel = wrapLabel;" + NL + "\t\t}" + NL + "" + NL + "\t\t" + NL + "\t\tpublic WrapLabel getWrapLabel() {" + NL + "\t\t\treturn wrapLabel;" + NL + "\t\t}" + NL + "" + NL + "\t\tpublic void relocate(CellEditor celleditor) {" + NL + "\t\t\tText text = (Text) celleditor.getControl();" + NL + "\t\t\tRectangle rect = getWrapLabel().getTextBounds().getCopy();" + NL + "\t\t\tgetWrapLabel().translateToAbsolute(rect);" + NL + "\t\t\t" + NL + "\t\t\tif (getWrapLabel().isTextWrapped() && getWrapLabel().getText().length() > 0)" + NL + "\t\t\t\trect.setSize(new Dimension(text.computeSize(rect.width, SWT.DEFAULT)));" + NL + "\t\t\telse {" + NL + "\t\t\t\tint avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();" + NL + "\t\t\t\trect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr*2, 0));" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tif (!rect.equals(new Rectangle(text.getBounds())))" + NL + "\t\t\t\ttext.setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t}" + NL + "" + NL + "\t}" + NL + "" + NL + "\tprivate static class LabelCellEditorLocator implements CellEditorLocator {" + NL + "" + NL + "\t\tprivate Label label;" + NL + "" + NL + "\t\tpublic LabelCellEditorLocator(Label label) {" + NL + "\t\t\tthis.label = label;" + NL + "\t\t}" + NL + "" + NL + "\t\tpublic Label getLabel() {" + NL + "\t\t\treturn label;" + NL + "\t\t}" + NL + "" + NL + "\t\tpublic void relocate(CellEditor celleditor) {" + NL + "\t\t\tText text = (Text) celleditor.getControl();" + NL + "\t\t\tRectangle rect = getLabel().getTextBounds().getCopy();" + NL + "\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "" + NL + "\t\t\tint avr = FigureUtilities.getFontMetrics(text.getFont()).getAverageCharWidth();" + NL + "\t\t\trect.setSize(new Dimension(text.computeSize(SWT.DEFAULT, SWT.DEFAULT)).expand(avr * 2, 0));" + NL + "" + NL + "\t\t\tif (!rect.equals(new Rectangle(text.getBounds())))" + NL + "\t\t\t\ttext.setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t}" + NL + "\t}" + NL + "}"; protected final String TEXT_25 = NL; @@ -80,7 +80,7 @@ for (Iterator containers = genDiagram.getAllContainers().iterator(); containers. GenContainerBase container = (GenContainerBase) containers.next(); stringBuffer.append(TEXT_12); - stringBuffer.append(container.getVisualID()); + stringBuffer.append(importManager.getImportedName(container.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_13); stringBuffer.append(container.getEditPartClassName()); stringBuffer.append(TEXT_14); @@ -91,7 +91,7 @@ for (Iterator containers = genDiagram.getAllContainers().iterator(); containers. GenNodeLabel label = (GenNodeLabel) labels.next(); stringBuffer.append(TEXT_15); - stringBuffer.append(label.getVisualID()); + stringBuffer.append(importManager.getImportedName(label.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_16); stringBuffer.append(label.getEditPartClassName()); stringBuffer.append(TEXT_17); @@ -103,7 +103,7 @@ for (Iterator links = genDiagram.getLinks().iterator(); links.hasNext();) { GenLink link = (GenLink) links.next(); stringBuffer.append(TEXT_18); - stringBuffer.append(link.getVisualID()); + stringBuffer.append(importManager.getImportedName(link.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_19); stringBuffer.append(link.getEditPartClassName()); stringBuffer.append(TEXT_20); @@ -112,7 +112,7 @@ for (Iterator links = genDiagram.getLinks().iterator(); links.hasNext();) { GenLinkLabel linkLabel = (GenLinkLabel) linkLabels.next(); stringBuffer.append(TEXT_21); - stringBuffer.append(linkLabel.getVisualID()); + stringBuffer.append(importManager.getImportedName(linkLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_22); stringBuffer.append(linkLabel.getEditPartClassName()); stringBuffer.append(TEXT_23); diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ExternalNodeLabelEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ExternalNodeLabelEditPartGenerator.java index 327187897..9869ed0f3 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ExternalNodeLabelEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/ExternalNodeLabelEditPartGenerator.java @@ -25,151 +25,152 @@ public class ExternalNodeLabelEditPartGenerator protected final String TEXT_8 = " extends "; protected final String TEXT_9 = " implements ITextAwareEditPart {"; protected final String TEXT_10 = NL; - protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_12 = "\";"; + protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_12 = ";"; protected final String TEXT_13 = NL; protected final String TEXT_14 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_15 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_16 = " parser;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_17 = " parserElements;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate String defaultText;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tstatic {" + NL + "\t\tregisterSnapBackPosition("; - protected final String TEXT_18 = ".VISUAL_ID, new Point(0, 0));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_19 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());" + NL + "\t}"; - protected final String TEXT_20 = NL; - protected final String TEXT_21 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_22 = " getLabelIcon() {" + NL + "\t\treturn null;" + NL + "\t}"; - protected final String TEXT_23 = NL; - protected final String TEXT_24 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelTextHelper("; - protected final String TEXT_25 = " figure) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_26 = ") {" + NL + "\t\t\treturn (("; - protected final String TEXT_27 = ") figure).getText();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; - protected final String TEXT_28 = ") figure).getText();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelTextHelper("; - protected final String TEXT_29 = " figure, String text) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_30 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_31 = ") figure).setText(text);" + NL + "\t\t} else {" + NL + "\t\t\t(("; - protected final String TEXT_32 = ") figure).setText(text);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Image getLabelIconHelper("; - protected final String TEXT_33 = " figure) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_34 = ") {" + NL + "\t\t\treturn (("; - protected final String TEXT_35 = ") figure).getIcon();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; - protected final String TEXT_36 = ") figure).getIcon();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelIconHelper("; - protected final String TEXT_37 = " figure, Image icon) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_38 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_39 = ") figure).setIcon(icon);" + NL + "\t\t} else {" + NL + "\t\t\t(("; - protected final String TEXT_40 = ") figure).setIcon(icon);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabel("; - protected final String TEXT_41 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);" + NL + "\t\tdefaultText = getLabelTextHelper(figure);" + NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_42 = " getModelChildren() {" + NL + "\t\treturn "; - protected final String TEXT_43 = ".EMPTY_LIST;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_44 = " getChildBySemanticHint(String semanticHint) {" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t"; - protected final String TEXT_45 = " element = resolveSemanticElement();" + NL + "\t\tString text = null;" + NL + "\t\tif (element != null && getParser() != null) {" + NL + "\t\t\ttext = getParser().getPrintString(new "; - protected final String TEXT_46 = "(element)," + NL + "\t\t\t\tgetParserOptions().intValue());" + NL + "\t\t}" + NL + "\t\tif (text == null || text.length() == 0) {" + NL + "\t\t\ttext = defaultText;" + NL + "\t\t}" + NL + "\t\treturn text;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabelText(String text) {" + NL + "\t\tsetLabelTextHelper(getFigure(), text);" + NL + "\t\tObject pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; - protected final String TEXT_47 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_48 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String getEditText() {" + NL + "\t\t"; - protected final String TEXT_49 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL + "\t\treturn getParser().getEditString(new "; - protected final String TEXT_50 = "(element)," + NL + "\t\t\tgetParserOptions().intValue());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isEditable() {"; - protected final String TEXT_51 = NL + "\t\t"; - protected final String TEXT_52 = " element = resolveSemanticElement();" + NL + "\t\tif (element != null && getEditText() != null) {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; - protected final String TEXT_53 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_54 = " getEditTextValidator() {" + NL + "\t\treturn new "; - protected final String TEXT_55 = "() {" + NL + "" + NL + "\t\t\tpublic String isValid(final Object value) {" + NL + "\t\t\t\tif (value instanceof String) {" + NL + "\t\t\t\t\tfinal "; - protected final String TEXT_56 = " element = resolveSemanticElement();" + NL + "\t\t\t\t\tfinal "; - protected final String TEXT_57 = " parser = getParser();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t"; - protected final String TEXT_58 = " valid =" + NL + "\t\t\t\t\t\t\t("; - protected final String TEXT_59 = ") getEditingDomain().runExclusive(" + NL + "\t\t\t\t\t\t\t\tnew "; - protected final String TEXT_60 = ".Impl() {" + NL + "" + NL + "\t\t\t\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\t\t\t\tsetResult(parser.isValidEditString(" + NL + "\t\t\t\t\t\t\t\t\tnew "; - protected final String TEXT_61 = "(element), (String) value));" + NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t});" + NL + "\t\t\t\t\t\treturn valid.getCode() == "; - protected final String TEXT_62 = ".EDITABLE ?" + NL + "\t\t\t\t\t\t\tnull : valid.getMessage();" + NL + "\t\t\t\t\t} catch (InterruptedException ie) {" + NL + "\t\t\t\t\t\tie.printStackTrace();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "" + NL + "\t\t\t\t// shouldn't get here" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_63 = " getCompletionProcessor() {" + NL + "\t\t"; - protected final String TEXT_64 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\treturn getParser().getCompletionProcessor(new "; - protected final String TEXT_65 = "(element));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_66 = " getParserOptions() {" + NL + "\t\treturn "; - protected final String TEXT_67 = ".NONE;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_68 = " getParser() {" + NL + "\t\tif (parser == null) {" + NL + "\t\t\tString parserHint = (("; - protected final String TEXT_69 = ") getModel()).getType();" + NL + "\t\t\t"; - protected final String TEXT_70 = " element = resolveSemanticElement();" + NL + "\t\t\tif (element != null) {" + NL + "\t\t\t\t"; - protected final String TEXT_71 = " hintAdapter =" + NL + "\t\t\t\t\tnew "; - protected final String TEXT_72 = "(element, parserHint) {" + NL + "" + NL + "\t\t\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\t\t\tif ("; - protected final String TEXT_73 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\t\t\treturn "; - protected final String TEXT_74 = "."; - protected final String TEXT_75 = ";" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\treturn super.getAdapter(adapter);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t};" + NL + "\t\t\t\tparser = "; - protected final String TEXT_76 = ".getInstance().getParser(hintAdapter);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn parser;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_77 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tsetManager(new "; - protected final String TEXT_78 = "(this," + NL + "\t\t\t\t"; - protected final String TEXT_79 = ".getTextCellEditorClass(this)," + NL + "\t\t\t\t"; - protected final String TEXT_80 = ".getTextCellEditorLocator(this)));" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setManager("; - protected final String TEXT_81 = " manager) {" + NL + "\t\tthis.manager = manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit("; - protected final String TEXT_82 = " eventLocation) {" + NL + "\t\tif (getManager().getClass() == "; - protected final String TEXT_83 = ".class) {" + NL + "\t\t\t(("; - protected final String TEXT_84 = ") getManager()).show(eventLocation.getSWTPoint());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void performDirectEdit(char initialCharacter) {" + NL + "\t\tif (getManager() instanceof "; - protected final String TEXT_85 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_86 = ") getManager()).show(initialCharacter);" + NL + "\t\t} else {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEditRequest("; - protected final String TEXT_87 = " request) {" + NL + "\t\tfinal "; - protected final String TEXT_88 = " theRequest = request;" + NL + "\t\ttry {" + NL + "\t\t\tgetEditingDomain().runExclusive(new Runnable() {" + NL + "" + NL + "\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\tif (isActive() && isEditable()) {" + NL + "\t\t\t\t\t\tif (theRequest.getExtendedData().get("; - protected final String TEXT_89 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {" + NL + "\t\t\t\t\t\t\tCharacter initialChar = (Character) theRequest.getExtendedData().get("; - protected final String TEXT_90 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);" + NL + "\t\t\t\t\t\t\tperformDirectEdit(initialChar.charValue());" + NL + "\t\t\t\t\t\t} else if ((theRequest instanceof "; - protected final String TEXT_91 = ") && (getEditText().equals(getLabelText()))) {" + NL + "\t\t\t\t\t\t\t"; - protected final String TEXT_92 = " editRequest =" + NL + "\t\t\t\t\t\t\t\t("; - protected final String TEXT_93 = ") theRequest;" + NL + "\t\t\t\t\t\t\tperformDirectEdit(editRequest.getLocation());" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tperformDirectEdit();" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t});" + NL + "\t\t} catch (InterruptedException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshUnderline();" + NL + "\t\trefreshStrikeThrough();"; - protected final String TEXT_94 = NL + "\t\trefreshBounds();"; - protected final String TEXT_95 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tsetLabelTextHelper(getFigure(), getLabelText());" + NL + "\t\tsetLabelIconHelper(getFigure(), getLabelIcon());" + NL + "\t\tObject pdEditPolicy = getEditPolicy("; - protected final String TEXT_96 = ".PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; - protected final String TEXT_97 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_98 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshUnderline() {" + NL + "\t\t"; - protected final String TEXT_99 = " style =" + NL + "\t\t\t("; - protected final String TEXT_100 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_101 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; - protected final String TEXT_102 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_103 = ") getFigure()).setTextUnderline(style.isUnderline());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshStrikeThrough() {" + NL + "\t\t"; - protected final String TEXT_104 = " style =" + NL + "\t\t\t("; - protected final String TEXT_105 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_106 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; - protected final String TEXT_107 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_108 = ") getFigure()).setTextStrikeThrough(style.isStrikeThrough());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {" + NL + "\t\t"; - protected final String TEXT_109 = " style =" + NL + "\t\t\t("; - protected final String TEXT_110 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_111 = ".eINSTANCE.getFontStyle());" + NL + "\t\t"; - protected final String TEXT_112 = " fontData;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tfontData = new "; - protected final String TEXT_113 = "(" + NL + "\t\t\t\tstyle.getFontName(), style.getFontHeight()," + NL + "\t\t\t\t(style.isBold() ? "; - protected final String TEXT_114 = ".BOLD : "; - protected final String TEXT_115 = ".NORMAL) |" + NL + "\t\t\t\t(style.isItalic() ? "; - protected final String TEXT_116 = ".ITALIC : "; - protected final String TEXT_117 = ".NORMAL));" + NL + "\t\t} else {" + NL + "\t\t\t// initialize font to defaults" + NL + "\t\t\tfontData = "; - protected final String TEXT_118 = ".getFontData(" + NL + "\t\t\t\t("; - protected final String TEXT_119 = ") getDiagramPreferencesHint().getPreferenceStore()," + NL + "\t\t\t\t"; - protected final String TEXT_120 = ".PREF_DEFAULT_FONT);" + NL + "\t\t}" + NL + "\t\tsetFont(fontData);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFontColor("; - protected final String TEXT_121 = " color) {" + NL + "\t\tgetFigure().setForegroundColor(color);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addSemanticListeners() {" + NL + "\t\tif (getParser() instanceof "; - protected final String TEXT_122 = ") {" + NL + "\t\t\t"; - protected final String TEXT_123 = " element = resolveSemanticElement();" + NL + "\t\t\tparserElements = (("; - protected final String TEXT_124 = ") getParser()).getSemanticElementsBeingParsed(element);" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\taddListenerFilter(\"SemanticModel\" + i, this, ("; - protected final String TEXT_125 = ") parserElements.get(i)); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.addSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeSemanticListeners() {" + NL + "\t\tif (parserElements != null) {" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\tremoveListenerFilter(\"SemanticModel\" + i); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_126 = " getAccessibleEditPart() {" + NL + "\t\tif (accessibleEP == null) {" + NL + "\t\t\taccessibleEP = new AccessibleGraphicalEditPart() {" + NL + "" + NL + "\t\t\t\tpublic void getName("; - protected final String TEXT_127 = " e) {" + NL + "\t\t\t\t\te.result = getLabelTextHelper(getFigure());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn accessibleEP;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent("; - protected final String TEXT_128 = " event) {" + NL + "\t\tObject feature = event.getFeature();"; - protected final String TEXT_129 = NL; - protected final String TEXT_130 = "\t\tif ("; - protected final String TEXT_131 = ".eINSTANCE.getFontStyle_FontColor().equals(feature)) {" + NL + "\t\t\tInteger c = (Integer) event.getNewValue();" + NL + "\t\t\tsetFontColor("; - protected final String TEXT_132 = ".getInstance().getColor(c));" + NL + "\t\t} else if ("; - protected final String TEXT_133 = ".eINSTANCE.getFontStyle_Underline().equals(feature)) {" + NL + "\t\t\trefreshUnderline();" + NL + "\t\t} else if ("; - protected final String TEXT_134 = ".eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {" + NL + "\t\t\trefreshStrikeThrough();" + NL + "\t\t} else if ("; - protected final String TEXT_135 = ".eINSTANCE.getFontStyle_FontHeight().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_136 = ".eINSTANCE.getFontStyle_FontName().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_137 = ".eINSTANCE.getFontStyle_Bold().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_138 = ".eINSTANCE.getFontStyle_Italic().equals(feature)) {" + NL + "\t\t\trefreshFont();" + NL + "\t\t} else {" + NL + "\t\t\tif (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t\tif (getParser() instanceof ISemanticParser) {" + NL + "\t\t\t\t"; - protected final String TEXT_139 = " modelParser =" + NL + "\t\t\t\t\t("; - protected final String TEXT_140 = ") getParser();" + NL + "\t\t\t\tif (modelParser.areSemanticElementsAffected(null, event)) {" + NL + "\t\t\t\t\tremoveSemanticListeners();" + NL + "\t\t\t\t\tif (resolveSemanticElement() != null) {" + NL + "\t\t\t\t\t\taddSemanticListeners();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\trefreshLabel();" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.handleNotificationEvent(event);" + NL + "\t}"; - protected final String TEXT_141 = NL; - protected final String TEXT_142 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_143 = " createFigure() {" + NL + "\t\t"; - protected final String TEXT_144 = " label = createFigurePrim();" + NL + "\t\tdefaultText = getLabelTextHelper(label);" + NL + "\t\treturn label;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_145 = " createFigurePrim() {"; - protected final String TEXT_146 = NL + "\t\treturn new "; - protected final String TEXT_147 = "();"; - protected final String TEXT_148 = NL + "\t\treturn "; - protected final String TEXT_149 = ";"; - protected final String TEXT_150 = NL + "\t\treturn new "; - protected final String TEXT_151 = "();"; - protected final String TEXT_152 = NL + "\t}" + NL; - protected final String TEXT_153 = NL; - protected final String TEXT_154 = NL + "}"; - protected final String TEXT_155 = NL; + protected final String TEXT_18 = ".getType("; + protected final String TEXT_19 = ".VISUAL_ID), new Point(0, 0));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_20 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());" + NL + "\t}"; + protected final String TEXT_21 = NL; + protected final String TEXT_22 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_23 = " getLabelIcon() {" + NL + "\t\treturn null;" + NL + "\t}"; + protected final String TEXT_24 = NL; + protected final String TEXT_25 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelTextHelper("; + protected final String TEXT_26 = " figure) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_27 = ") {" + NL + "\t\t\treturn (("; + protected final String TEXT_28 = ") figure).getText();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; + protected final String TEXT_29 = ") figure).getText();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelTextHelper("; + protected final String TEXT_30 = " figure, String text) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_31 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_32 = ") figure).setText(text);" + NL + "\t\t} else {" + NL + "\t\t\t(("; + protected final String TEXT_33 = ") figure).setText(text);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Image getLabelIconHelper("; + protected final String TEXT_34 = " figure) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_35 = ") {" + NL + "\t\t\treturn (("; + protected final String TEXT_36 = ") figure).getIcon();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; + protected final String TEXT_37 = ") figure).getIcon();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelIconHelper("; + protected final String TEXT_38 = " figure, Image icon) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_39 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_40 = ") figure).setIcon(icon);" + NL + "\t\t} else {" + NL + "\t\t\t(("; + protected final String TEXT_41 = ") figure).setIcon(icon);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabel("; + protected final String TEXT_42 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);" + NL + "\t\tdefaultText = getLabelTextHelper(figure);" + NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_43 = " getModelChildren() {" + NL + "\t\treturn "; + protected final String TEXT_44 = ".EMPTY_LIST;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_45 = " getChildBySemanticHint(String semanticHint) {" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t"; + protected final String TEXT_46 = " element = resolveSemanticElement();" + NL + "\t\tString text = null;" + NL + "\t\tif (element != null && getParser() != null) {" + NL + "\t\t\ttext = getParser().getPrintString(new "; + protected final String TEXT_47 = "(element)," + NL + "\t\t\t\tgetParserOptions().intValue());" + NL + "\t\t}" + NL + "\t\tif (text == null || text.length() == 0) {" + NL + "\t\t\ttext = defaultText;" + NL + "\t\t}" + NL + "\t\treturn text;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabelText(String text) {" + NL + "\t\tsetLabelTextHelper(getFigure(), text);" + NL + "\t\tObject pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; + protected final String TEXT_48 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_49 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String getEditText() {" + NL + "\t\t"; + protected final String TEXT_50 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL + "\t\treturn getParser().getEditString(new "; + protected final String TEXT_51 = "(element)," + NL + "\t\t\tgetParserOptions().intValue());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isEditable() {"; + protected final String TEXT_52 = NL + "\t\t"; + protected final String TEXT_53 = " element = resolveSemanticElement();" + NL + "\t\tif (element != null && getEditText() != null) {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; + protected final String TEXT_54 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_55 = " getEditTextValidator() {" + NL + "\t\treturn new "; + protected final String TEXT_56 = "() {" + NL + "" + NL + "\t\t\tpublic String isValid(final Object value) {" + NL + "\t\t\t\tif (value instanceof String) {" + NL + "\t\t\t\t\tfinal "; + protected final String TEXT_57 = " element = resolveSemanticElement();" + NL + "\t\t\t\t\tfinal "; + protected final String TEXT_58 = " parser = getParser();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t"; + protected final String TEXT_59 = " valid =" + NL + "\t\t\t\t\t\t\t("; + protected final String TEXT_60 = ") getEditingDomain().runExclusive(" + NL + "\t\t\t\t\t\t\t\tnew "; + protected final String TEXT_61 = ".Impl() {" + NL + "" + NL + "\t\t\t\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\t\t\t\tsetResult(parser.isValidEditString(" + NL + "\t\t\t\t\t\t\t\t\tnew "; + protected final String TEXT_62 = "(element), (String) value));" + NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t});" + NL + "\t\t\t\t\t\treturn valid.getCode() == "; + protected final String TEXT_63 = ".EDITABLE ?" + NL + "\t\t\t\t\t\t\tnull : valid.getMessage();" + NL + "\t\t\t\t\t} catch (InterruptedException ie) {" + NL + "\t\t\t\t\t\tie.printStackTrace();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "" + NL + "\t\t\t\t// shouldn't get here" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_64 = " getCompletionProcessor() {" + NL + "\t\t"; + protected final String TEXT_65 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\treturn getParser().getCompletionProcessor(new "; + protected final String TEXT_66 = "(element));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_67 = " getParserOptions() {" + NL + "\t\treturn "; + protected final String TEXT_68 = ".NONE;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_69 = " getParser() {" + NL + "\t\tif (parser == null) {" + NL + "\t\t\tString parserHint = (("; + protected final String TEXT_70 = ") getModel()).getType();" + NL + "\t\t\t"; + protected final String TEXT_71 = " element = resolveSemanticElement();" + NL + "\t\t\tif (element != null) {" + NL + "\t\t\t\t"; + protected final String TEXT_72 = " hintAdapter =" + NL + "\t\t\t\t\tnew "; + protected final String TEXT_73 = "(element, parserHint) {" + NL + "" + NL + "\t\t\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\t\t\tif ("; + protected final String TEXT_74 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\t\t\treturn "; + protected final String TEXT_75 = "."; + protected final String TEXT_76 = ";" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\treturn super.getAdapter(adapter);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t};" + NL + "\t\t\t\tparser = "; + protected final String TEXT_77 = ".getInstance().getParser(hintAdapter);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn parser;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_78 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tsetManager(new "; + protected final String TEXT_79 = "(this," + NL + "\t\t\t\t"; + protected final String TEXT_80 = ".getTextCellEditorClass(this)," + NL + "\t\t\t\t"; + protected final String TEXT_81 = ".getTextCellEditorLocator(this)));" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setManager("; + protected final String TEXT_82 = " manager) {" + NL + "\t\tthis.manager = manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit("; + protected final String TEXT_83 = " eventLocation) {" + NL + "\t\tif (getManager().getClass() == "; + protected final String TEXT_84 = ".class) {" + NL + "\t\t\t(("; + protected final String TEXT_85 = ") getManager()).show(eventLocation.getSWTPoint());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void performDirectEdit(char initialCharacter) {" + NL + "\t\tif (getManager() instanceof "; + protected final String TEXT_86 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_87 = ") getManager()).show(initialCharacter);" + NL + "\t\t} else {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEditRequest("; + protected final String TEXT_88 = " request) {" + NL + "\t\tfinal "; + protected final String TEXT_89 = " theRequest = request;" + NL + "\t\ttry {" + NL + "\t\t\tgetEditingDomain().runExclusive(new Runnable() {" + NL + "" + NL + "\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\tif (isActive() && isEditable()) {" + NL + "\t\t\t\t\t\tif (theRequest.getExtendedData().get("; + protected final String TEXT_90 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {" + NL + "\t\t\t\t\t\t\tCharacter initialChar = (Character) theRequest.getExtendedData().get("; + protected final String TEXT_91 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);" + NL + "\t\t\t\t\t\t\tperformDirectEdit(initialChar.charValue());" + NL + "\t\t\t\t\t\t} else if ((theRequest instanceof "; + protected final String TEXT_92 = ") && (getEditText().equals(getLabelText()))) {" + NL + "\t\t\t\t\t\t\t"; + protected final String TEXT_93 = " editRequest =" + NL + "\t\t\t\t\t\t\t\t("; + protected final String TEXT_94 = ") theRequest;" + NL + "\t\t\t\t\t\t\tperformDirectEdit(editRequest.getLocation());" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tperformDirectEdit();" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t});" + NL + "\t\t} catch (InterruptedException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshUnderline();" + NL + "\t\trefreshStrikeThrough();"; + protected final String TEXT_95 = NL + "\t\trefreshBounds();"; + protected final String TEXT_96 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tsetLabelTextHelper(getFigure(), getLabelText());" + NL + "\t\tsetLabelIconHelper(getFigure(), getLabelIcon());" + NL + "\t\tObject pdEditPolicy = getEditPolicy("; + protected final String TEXT_97 = ".PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; + protected final String TEXT_98 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_99 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshUnderline() {" + NL + "\t\t"; + protected final String TEXT_100 = " style =" + NL + "\t\t\t("; + protected final String TEXT_101 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_102 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; + protected final String TEXT_103 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_104 = ") getFigure()).setTextUnderline(style.isUnderline());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshStrikeThrough() {" + NL + "\t\t"; + protected final String TEXT_105 = " style =" + NL + "\t\t\t("; + protected final String TEXT_106 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_107 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; + protected final String TEXT_108 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_109 = ") getFigure()).setTextStrikeThrough(style.isStrikeThrough());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {" + NL + "\t\t"; + protected final String TEXT_110 = " style =" + NL + "\t\t\t("; + protected final String TEXT_111 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_112 = ".eINSTANCE.getFontStyle());" + NL + "\t\t"; + protected final String TEXT_113 = " fontData;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tfontData = new "; + protected final String TEXT_114 = "(" + NL + "\t\t\t\tstyle.getFontName(), style.getFontHeight()," + NL + "\t\t\t\t(style.isBold() ? "; + protected final String TEXT_115 = ".BOLD : "; + protected final String TEXT_116 = ".NORMAL) |" + NL + "\t\t\t\t(style.isItalic() ? "; + protected final String TEXT_117 = ".ITALIC : "; + protected final String TEXT_118 = ".NORMAL));" + NL + "\t\t} else {" + NL + "\t\t\t// initialize font to defaults" + NL + "\t\t\tfontData = "; + protected final String TEXT_119 = ".getFontData(" + NL + "\t\t\t\t("; + protected final String TEXT_120 = ") getDiagramPreferencesHint().getPreferenceStore()," + NL + "\t\t\t\t"; + protected final String TEXT_121 = ".PREF_DEFAULT_FONT);" + NL + "\t\t}" + NL + "\t\tsetFont(fontData);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFontColor("; + protected final String TEXT_122 = " color) {" + NL + "\t\tgetFigure().setForegroundColor(color);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addSemanticListeners() {" + NL + "\t\tif (getParser() instanceof "; + protected final String TEXT_123 = ") {" + NL + "\t\t\t"; + protected final String TEXT_124 = " element = resolveSemanticElement();" + NL + "\t\t\tparserElements = (("; + protected final String TEXT_125 = ") getParser()).getSemanticElementsBeingParsed(element);" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\taddListenerFilter(\"SemanticModel\" + i, this, ("; + protected final String TEXT_126 = ") parserElements.get(i)); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.addSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeSemanticListeners() {" + NL + "\t\tif (parserElements != null) {" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\tremoveListenerFilter(\"SemanticModel\" + i); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_127 = " getAccessibleEditPart() {" + NL + "\t\tif (accessibleEP == null) {" + NL + "\t\t\taccessibleEP = new AccessibleGraphicalEditPart() {" + NL + "" + NL + "\t\t\t\tpublic void getName("; + protected final String TEXT_128 = " e) {" + NL + "\t\t\t\t\te.result = getLabelTextHelper(getFigure());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn accessibleEP;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent("; + protected final String TEXT_129 = " event) {" + NL + "\t\tObject feature = event.getFeature();"; + protected final String TEXT_130 = NL; + protected final String TEXT_131 = "\t\tif ("; + protected final String TEXT_132 = ".eINSTANCE.getFontStyle_FontColor().equals(feature)) {" + NL + "\t\t\tInteger c = (Integer) event.getNewValue();" + NL + "\t\t\tsetFontColor("; + protected final String TEXT_133 = ".getInstance().getColor(c));" + NL + "\t\t} else if ("; + protected final String TEXT_134 = ".eINSTANCE.getFontStyle_Underline().equals(feature)) {" + NL + "\t\t\trefreshUnderline();" + NL + "\t\t} else if ("; + protected final String TEXT_135 = ".eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {" + NL + "\t\t\trefreshStrikeThrough();" + NL + "\t\t} else if ("; + protected final String TEXT_136 = ".eINSTANCE.getFontStyle_FontHeight().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_137 = ".eINSTANCE.getFontStyle_FontName().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_138 = ".eINSTANCE.getFontStyle_Bold().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_139 = ".eINSTANCE.getFontStyle_Italic().equals(feature)) {" + NL + "\t\t\trefreshFont();" + NL + "\t\t} else {" + NL + "\t\t\tif (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t\tif (getParser() instanceof ISemanticParser) {" + NL + "\t\t\t\t"; + protected final String TEXT_140 = " modelParser =" + NL + "\t\t\t\t\t("; + protected final String TEXT_141 = ") getParser();" + NL + "\t\t\t\tif (modelParser.areSemanticElementsAffected(null, event)) {" + NL + "\t\t\t\t\tremoveSemanticListeners();" + NL + "\t\t\t\t\tif (resolveSemanticElement() != null) {" + NL + "\t\t\t\t\t\taddSemanticListeners();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\trefreshLabel();" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.handleNotificationEvent(event);" + NL + "\t}"; + protected final String TEXT_142 = NL; + protected final String TEXT_143 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_144 = " createFigure() {" + NL + "\t\t"; + protected final String TEXT_145 = " label = createFigurePrim();" + NL + "\t\tdefaultText = getLabelTextHelper(label);" + NL + "\t\treturn label;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_146 = " createFigurePrim() {"; + protected final String TEXT_147 = NL + "\t\treturn new "; + protected final String TEXT_148 = "();"; + protected final String TEXT_149 = NL + "\t\treturn "; + protected final String TEXT_150 = ";"; + protected final String TEXT_151 = NL + "\t\treturn new "; + protected final String TEXT_152 = "();"; + protected final String TEXT_153 = NL + "\t}" + NL; + protected final String TEXT_154 = NL; + protected final String TEXT_155 = NL + "}"; + protected final String TEXT_156 = NL; public String generate(Object argument) { @@ -214,134 +215,134 @@ GenCommonBase genCommonBase = genLabel; stringBuffer.append(TEXT_16); stringBuffer.append(importManager.getImportedName("java.util.List")); stringBuffer.append(TEXT_17); - stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_18); - stringBuffer.append(genLabel.getEditPartClassName()); + stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_19); - final boolean needsRefreshBounds = false; + stringBuffer.append(genLabel.getEditPartClassName()); stringBuffer.append(TEXT_20); + final boolean needsRefreshBounds = false; stringBuffer.append(TEXT_21); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image")); stringBuffer.append(TEXT_22); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image")); stringBuffer.append(TEXT_23); stringBuffer.append(TEXT_24); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_25); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_26); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_27); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_28); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_29); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_30); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_31); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_32); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_33); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_34); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_35); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_36); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_37); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_38); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_39); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_40); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_41); - stringBuffer.append(importManager.getImportedName("java.util.List")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_42); - stringBuffer.append(importManager.getImportedName("java.util.Collections")); + stringBuffer.append(importManager.getImportedName("java.util.List")); stringBuffer.append(TEXT_43); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart")); + stringBuffer.append(importManager.getImportedName("java.util.Collections")); stringBuffer.append(TEXT_44); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart")); stringBuffer.append(TEXT_45); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_46); - stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_47); stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_48); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_49); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_50); - if (!genLabel.isReadOnly()) { + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_51); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (!genLabel.isReadOnly()) { stringBuffer.append(TEXT_52); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_53); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); + } stringBuffer.append(TEXT_54); stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); stringBuffer.append(TEXT_55); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); stringBuffer.append(TEXT_56); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_57); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); stringBuffer.append(TEXT_58); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); stringBuffer.append(TEXT_59); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.RunnableWithResult")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); stringBuffer.append(TEXT_60); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.RunnableWithResult")); stringBuffer.append(TEXT_61); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_62); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.text.contentassist.IContentAssistProcessor")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus")); stringBuffer.append(TEXT_63); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.text.contentassist.IContentAssistProcessor")); stringBuffer.append(TEXT_64); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_65); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_66); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); stringBuffer.append(TEXT_67); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); stringBuffer.append(TEXT_68); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); stringBuffer.append(TEXT_69); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); stringBuffer.append(TEXT_70); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_71); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); stringBuffer.append(TEXT_72); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); stringBuffer.append(TEXT_73); - stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_74); - stringBuffer.append(genHost.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); stringBuffer.append(TEXT_75); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserService")); + stringBuffer.append(genHost.getUniqueIdentifier()); stringBuffer.append(TEXT_76); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserService")); stringBuffer.append(TEXT_77); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); stringBuffer.append(TEXT_78); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_79); - stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_80); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName())); stringBuffer.append(TEXT_81); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Point")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); stringBuffer.append(TEXT_82); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Point")); stringBuffer.append(TEXT_83); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_84); @@ -349,61 +350,61 @@ GenCommonBase genCommonBase = genLabel; stringBuffer.append(TEXT_85); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_86); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_87); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); stringBuffer.append(TEXT_88); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); stringBuffer.append(TEXT_89); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); stringBuffer.append(TEXT_90); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); stringBuffer.append(TEXT_91); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_92); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_93); - if (needsRefreshBounds) { + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_94); - } + if (needsRefreshBounds) { stringBuffer.append(TEXT_95); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy")); + } stringBuffer.append(TEXT_96); - stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy")); stringBuffer.append(TEXT_97); stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_98); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_99); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_100); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_101); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_102); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_103); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_104); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_105); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_106); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_107); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_108); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_109); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_110); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_111); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_112); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); stringBuffer.append(TEXT_113); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); stringBuffer.append(TEXT_114); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_115); @@ -411,35 +412,35 @@ GenCommonBase genCommonBase = genLabel; stringBuffer.append(TEXT_116); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_117); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.PreferenceConverter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_118); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.IPreferenceStore")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.PreferenceConverter")); stringBuffer.append(TEXT_119); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.IPreferenceStore")); stringBuffer.append(TEXT_120); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants")); stringBuffer.append(TEXT_121); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color")); stringBuffer.append(TEXT_122); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); - stringBuffer.append(TEXT_123); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); - stringBuffer.append(TEXT_124); + stringBuffer.append(TEXT_123); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_124); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_125); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.AccessibleEditPart")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_126); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.accessibility.AccessibleEvent")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.AccessibleEditPart")); stringBuffer.append(TEXT_127); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.accessibility.AccessibleEvent")); stringBuffer.append(TEXT_128); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification")); stringBuffer.append(TEXT_129); stringBuffer.append(TEXT_130); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_131); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry")); - stringBuffer.append(TEXT_132); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(TEXT_132); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry")); stringBuffer.append(TEXT_133); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_134); @@ -451,18 +452,20 @@ GenCommonBase genCommonBase = genLabel; stringBuffer.append(TEXT_137); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_138); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_139); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_140); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_141); stringBuffer.append(TEXT_142); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_143); stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_144); stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_145); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(TEXT_146); String figureQualifiedClassName = null; Viewmap viewmap = genLabel.getViewmap(); @@ -472,30 +475,30 @@ if (viewmap instanceof FigureViewmap) { figureQualifiedClassName = "org.eclipse.draw2d.Label"; } - stringBuffer.append(TEXT_146); - stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); stringBuffer.append(TEXT_147); + stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); + stringBuffer.append(TEXT_148); } // instanceof FigureViewmap else if (viewmap instanceof SnippetViewmap) { - stringBuffer.append(TEXT_148); - stringBuffer.append(((SnippetViewmap) viewmap).getBody()); stringBuffer.append(TEXT_149); + stringBuffer.append(((SnippetViewmap) viewmap).getBody()); + stringBuffer.append(TEXT_150); } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter else if (viewmap instanceof InnerClassViewmap) { figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName(); - stringBuffer.append(TEXT_150); - stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_151); - } + stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_152); - if (genLabel.getViewmap() instanceof InnerClassViewmap) { + } stringBuffer.append(TEXT_153); + if (genLabel.getViewmap() instanceof InnerClassViewmap) { + stringBuffer.append(TEXT_154); stringBuffer.append(((InnerClassViewmap) genLabel.getViewmap()).getClassBody()); } - stringBuffer.append(TEXT_154); - importManager.emitSortedImports(); stringBuffer.append(TEXT_155); + importManager.emitSortedImports(); + stringBuffer.append(TEXT_156); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkEditPartGenerator.java index 8461a0dd1..76c09bcef 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkEditPartGenerator.java @@ -24,8 +24,8 @@ public class LinkEditPartGenerator protected final String TEXT_7 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_8 = " extends ConnectionNodeEditPart {"; protected final String TEXT_9 = NL; - protected final String TEXT_10 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_11 = "\";"; + protected final String TEXT_10 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_11 = ";"; protected final String TEXT_12 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; protected final String TEXT_13 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();"; protected final String TEXT_14 = NL + "\t\tinstallEditPolicy("; diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkLabelEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkLabelEditPartGenerator.java index e420001cf..6f0617bd5 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkLabelEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/LinkLabelEditPartGenerator.java @@ -22,155 +22,156 @@ public class LinkLabelEditPartGenerator protected final String TEXT_5 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_6 = " extends LabelEditPart implements ITextAwareEditPart {"; protected final String TEXT_7 = NL; - protected final String TEXT_8 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_9 = "\";"; + protected final String TEXT_8 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_9 = ";"; protected final String TEXT_10 = NL; protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_12 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_13 = " parser;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_14 = " parserElements;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate String defaultText;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tstatic {"; - protected final String TEXT_15 = NL + "\t\tregisterSnapBackPosition(" + NL + "\t\t\t\t"; - protected final String TEXT_16 = ".VISUAL_ID," + NL + "\t\t\t\tnew Point("; - protected final String TEXT_17 = ", "; - protected final String TEXT_18 = "));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_19 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getKeyPoint() {" + NL + "\t\treturn ConnectionLocator."; - protected final String TEXT_20 = ";" + NL + "\t}" + NL; - protected final String TEXT_21 = NL; - protected final String TEXT_22 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_23 = " getLabelIcon() {" + NL + "\t\treturn null;" + NL + "\t}"; - protected final String TEXT_24 = NL; - protected final String TEXT_25 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelTextHelper("; - protected final String TEXT_26 = " figure) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_27 = ") {" + NL + "\t\t\treturn (("; - protected final String TEXT_28 = ") figure).getText();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; - protected final String TEXT_29 = ") figure).getText();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelTextHelper("; - protected final String TEXT_30 = " figure, String text) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_31 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_32 = ") figure).setText(text);" + NL + "\t\t} else {" + NL + "\t\t\t(("; - protected final String TEXT_33 = ") figure).setText(text);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Image getLabelIconHelper("; - protected final String TEXT_34 = " figure) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_35 = ") {" + NL + "\t\t\treturn (("; - protected final String TEXT_36 = ") figure).getIcon();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; - protected final String TEXT_37 = ") figure).getIcon();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelIconHelper("; - protected final String TEXT_38 = " figure, Image icon) {" + NL + "\t\tif (figure instanceof "; - protected final String TEXT_39 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_40 = ") figure).setIcon(icon);" + NL + "\t\t} else {" + NL + "\t\t\t(("; - protected final String TEXT_41 = ") figure).setIcon(icon);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabel("; - protected final String TEXT_42 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);" + NL + "\t\tdefaultText = getLabelTextHelper(figure);" + NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_43 = " getModelChildren() {" + NL + "\t\treturn "; - protected final String TEXT_44 = ".EMPTY_LIST;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_45 = " getChildBySemanticHint(String semanticHint) {" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t"; - protected final String TEXT_46 = " element = resolveSemanticElement();" + NL + "\t\tString text = null;" + NL + "\t\tif (element != null && getParser() != null) {" + NL + "\t\t\ttext = getParser().getPrintString(new "; - protected final String TEXT_47 = "(element)," + NL + "\t\t\t\tgetParserOptions().intValue());" + NL + "\t\t}" + NL + "\t\tif (text == null || text.length() == 0) {" + NL + "\t\t\ttext = defaultText;" + NL + "\t\t}" + NL + "\t\treturn text;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabelText(String text) {" + NL + "\t\tsetLabelTextHelper(getFigure(), text);" + NL + "\t\tObject pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; - protected final String TEXT_48 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_49 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String getEditText() {" + NL + "\t\t"; - protected final String TEXT_50 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL + "\t\treturn getParser().getEditString(new "; - protected final String TEXT_51 = "(element)," + NL + "\t\t\tgetParserOptions().intValue());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isEditable() {"; - protected final String TEXT_52 = NL + "\t\t"; - protected final String TEXT_53 = " element = resolveSemanticElement();" + NL + "\t\tif (element != null && getEditText() != null) {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; - protected final String TEXT_54 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_55 = " getEditTextValidator() {" + NL + "\t\treturn new "; - protected final String TEXT_56 = "() {" + NL + "" + NL + "\t\t\tpublic String isValid(final Object value) {" + NL + "\t\t\t\tif (value instanceof String) {" + NL + "\t\t\t\t\tfinal "; - protected final String TEXT_57 = " element = resolveSemanticElement();" + NL + "\t\t\t\t\tfinal "; - protected final String TEXT_58 = " parser = getParser();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t"; - protected final String TEXT_59 = " valid =" + NL + "\t\t\t\t\t\t\t("; - protected final String TEXT_60 = ") getEditingDomain().runExclusive(" + NL + "\t\t\t\t\t\t\t\tnew "; - protected final String TEXT_61 = ".Impl() {" + NL + "" + NL + "\t\t\t\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\t\t\t\tsetResult(parser.isValidEditString(" + NL + "\t\t\t\t\t\t\t\t\tnew "; - protected final String TEXT_62 = "(element), (String) value));" + NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t});" + NL + "\t\t\t\t\t\treturn valid.getCode() == "; - protected final String TEXT_63 = ".EDITABLE ?" + NL + "\t\t\t\t\t\t\tnull : valid.getMessage();" + NL + "\t\t\t\t\t} catch (InterruptedException ie) {" + NL + "\t\t\t\t\t\tie.printStackTrace();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "" + NL + "\t\t\t\t// shouldn't get here" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_64 = " getCompletionProcessor() {" + NL + "\t\t"; - protected final String TEXT_65 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\treturn getParser().getCompletionProcessor(new "; - protected final String TEXT_66 = "(element));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_67 = " getParserOptions() {" + NL + "\t\treturn "; - protected final String TEXT_68 = ".NONE;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_69 = " getParser() {" + NL + "\t\tif (parser == null) {" + NL + "\t\t\tString parserHint = (("; - protected final String TEXT_70 = ") getModel()).getType();" + NL + "\t\t\t"; - protected final String TEXT_71 = " element = resolveSemanticElement();" + NL + "\t\t\tif (element != null) {" + NL + "\t\t\t\t"; - protected final String TEXT_72 = " hintAdapter =" + NL + "\t\t\t\t\tnew "; - protected final String TEXT_73 = "(element, parserHint) {" + NL + "" + NL + "\t\t\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\t\t\tif ("; - protected final String TEXT_74 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\t\t\treturn "; - protected final String TEXT_75 = "."; - protected final String TEXT_76 = ";" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\treturn super.getAdapter(adapter);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t};" + NL + "\t\t\t\tparser = "; - protected final String TEXT_77 = ".getInstance().getParser(hintAdapter);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn parser;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_78 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tsetManager(new "; - protected final String TEXT_79 = "(this," + NL + "\t\t\t\t"; - protected final String TEXT_80 = ".getTextCellEditorClass(this)," + NL + "\t\t\t\t"; - protected final String TEXT_81 = ".getTextCellEditorLocator(this)));" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setManager("; - protected final String TEXT_82 = " manager) {" + NL + "\t\tthis.manager = manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit("; - protected final String TEXT_83 = " eventLocation) {" + NL + "\t\tif (getManager().getClass() == "; - protected final String TEXT_84 = ".class) {" + NL + "\t\t\t(("; - protected final String TEXT_85 = ") getManager()).show(eventLocation.getSWTPoint());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void performDirectEdit(char initialCharacter) {" + NL + "\t\tif (getManager() instanceof "; - protected final String TEXT_86 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_87 = ") getManager()).show(initialCharacter);" + NL + "\t\t} else {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEditRequest("; - protected final String TEXT_88 = " request) {" + NL + "\t\tfinal "; - protected final String TEXT_89 = " theRequest = request;" + NL + "\t\ttry {" + NL + "\t\t\tgetEditingDomain().runExclusive(new Runnable() {" + NL + "" + NL + "\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\tif (isActive() && isEditable()) {" + NL + "\t\t\t\t\t\tif (theRequest.getExtendedData().get("; - protected final String TEXT_90 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {" + NL + "\t\t\t\t\t\t\tCharacter initialChar = (Character) theRequest.getExtendedData().get("; - protected final String TEXT_91 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);" + NL + "\t\t\t\t\t\t\tperformDirectEdit(initialChar.charValue());" + NL + "\t\t\t\t\t\t} else if ((theRequest instanceof "; - protected final String TEXT_92 = ") && (getEditText().equals(getLabelText()))) {" + NL + "\t\t\t\t\t\t\t"; - protected final String TEXT_93 = " editRequest =" + NL + "\t\t\t\t\t\t\t\t("; - protected final String TEXT_94 = ") theRequest;" + NL + "\t\t\t\t\t\t\tperformDirectEdit(editRequest.getLocation());" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tperformDirectEdit();" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t});" + NL + "\t\t} catch (InterruptedException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshUnderline();" + NL + "\t\trefreshStrikeThrough();"; - protected final String TEXT_95 = NL + "\t\trefreshBounds();"; - protected final String TEXT_96 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tsetLabelTextHelper(getFigure(), getLabelText());" + NL + "\t\tsetLabelIconHelper(getFigure(), getLabelIcon());" + NL + "\t\tObject pdEditPolicy = getEditPolicy("; - protected final String TEXT_97 = ".PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; - protected final String TEXT_98 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_99 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshUnderline() {" + NL + "\t\t"; - protected final String TEXT_100 = " style =" + NL + "\t\t\t("; - protected final String TEXT_101 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_102 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; - protected final String TEXT_103 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_104 = ") getFigure()).setTextUnderline(style.isUnderline());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshStrikeThrough() {" + NL + "\t\t"; - protected final String TEXT_105 = " style =" + NL + "\t\t\t("; - protected final String TEXT_106 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_107 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; - protected final String TEXT_108 = ") {" + NL + "\t\t\t(("; - protected final String TEXT_109 = ") getFigure()).setTextStrikeThrough(style.isStrikeThrough());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {" + NL + "\t\t"; - protected final String TEXT_110 = " style =" + NL + "\t\t\t("; - protected final String TEXT_111 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; - protected final String TEXT_112 = ".eINSTANCE.getFontStyle());" + NL + "\t\t"; - protected final String TEXT_113 = " fontData;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tfontData = new "; - protected final String TEXT_114 = "(" + NL + "\t\t\t\tstyle.getFontName(), style.getFontHeight()," + NL + "\t\t\t\t(style.isBold() ? "; - protected final String TEXT_115 = ".BOLD : "; - protected final String TEXT_116 = ".NORMAL) |" + NL + "\t\t\t\t(style.isItalic() ? "; - protected final String TEXT_117 = ".ITALIC : "; - protected final String TEXT_118 = ".NORMAL));" + NL + "\t\t} else {" + NL + "\t\t\t// initialize font to defaults" + NL + "\t\t\tfontData = "; - protected final String TEXT_119 = ".getFontData(" + NL + "\t\t\t\t("; - protected final String TEXT_120 = ") getDiagramPreferencesHint().getPreferenceStore()," + NL + "\t\t\t\t"; - protected final String TEXT_121 = ".PREF_DEFAULT_FONT);" + NL + "\t\t}" + NL + "\t\tsetFont(fontData);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFontColor("; - protected final String TEXT_122 = " color) {" + NL + "\t\tgetFigure().setForegroundColor(color);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addSemanticListeners() {" + NL + "\t\tif (getParser() instanceof "; - protected final String TEXT_123 = ") {" + NL + "\t\t\t"; - protected final String TEXT_124 = " element = resolveSemanticElement();" + NL + "\t\t\tparserElements = (("; - protected final String TEXT_125 = ") getParser()).getSemanticElementsBeingParsed(element);" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\taddListenerFilter(\"SemanticModel\" + i, this, ("; - protected final String TEXT_126 = ") parserElements.get(i)); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.addSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeSemanticListeners() {" + NL + "\t\tif (parserElements != null) {" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\tremoveListenerFilter(\"SemanticModel\" + i); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_127 = " getAccessibleEditPart() {" + NL + "\t\tif (accessibleEP == null) {" + NL + "\t\t\taccessibleEP = new AccessibleGraphicalEditPart() {" + NL + "" + NL + "\t\t\t\tpublic void getName("; - protected final String TEXT_128 = " e) {" + NL + "\t\t\t\t\te.result = getLabelTextHelper(getFigure());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn accessibleEP;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent("; - protected final String TEXT_129 = " event) {" + NL + "\t\tObject feature = event.getFeature();"; - protected final String TEXT_130 = NL; - protected final String TEXT_131 = "\t\tif ("; - protected final String TEXT_132 = ".eINSTANCE.getFontStyle_FontColor().equals(feature)) {" + NL + "\t\t\tInteger c = (Integer) event.getNewValue();" + NL + "\t\t\tsetFontColor("; - protected final String TEXT_133 = ".getInstance().getColor(c));" + NL + "\t\t} else if ("; - protected final String TEXT_134 = ".eINSTANCE.getFontStyle_Underline().equals(feature)) {" + NL + "\t\t\trefreshUnderline();" + NL + "\t\t} else if ("; - protected final String TEXT_135 = ".eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {" + NL + "\t\t\trefreshStrikeThrough();" + NL + "\t\t} else if ("; - protected final String TEXT_136 = ".eINSTANCE.getFontStyle_FontHeight().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_137 = ".eINSTANCE.getFontStyle_FontName().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_138 = ".eINSTANCE.getFontStyle_Bold().equals(feature) ||" + NL + "\t\t\t\t"; - protected final String TEXT_139 = ".eINSTANCE.getFontStyle_Italic().equals(feature)) {" + NL + "\t\t\trefreshFont();" + NL + "\t\t} else {" + NL + "\t\t\tif (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t\tif (getParser() instanceof ISemanticParser) {" + NL + "\t\t\t\t"; - protected final String TEXT_140 = " modelParser =" + NL + "\t\t\t\t\t("; - protected final String TEXT_141 = ") getParser();" + NL + "\t\t\t\tif (modelParser.areSemanticElementsAffected(null, event)) {" + NL + "\t\t\t\t\tremoveSemanticListeners();" + NL + "\t\t\t\t\tif (resolveSemanticElement() != null) {" + NL + "\t\t\t\t\t\taddSemanticListeners();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\trefreshLabel();" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.handleNotificationEvent(event);" + NL + "\t}"; - protected final String TEXT_142 = NL; - protected final String TEXT_143 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_144 = " createFigure() {" + NL + "\t\t"; - protected final String TEXT_145 = " label = createFigurePrim();" + NL + "\t\tdefaultText = getLabelTextHelper(label);" + NL + "\t\treturn label;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; - protected final String TEXT_146 = " createFigurePrim() {"; - protected final String TEXT_147 = NL + "\t\treturn new "; - protected final String TEXT_148 = "();"; - protected final String TEXT_149 = NL + "\t\treturn "; - protected final String TEXT_150 = ";"; - protected final String TEXT_151 = NL + "\t\treturn new "; - protected final String TEXT_152 = "();"; - protected final String TEXT_153 = NL + "\t}" + NL; - protected final String TEXT_154 = NL; - protected final String TEXT_155 = NL + "}"; - protected final String TEXT_156 = NL; + protected final String TEXT_15 = NL + "\t\tregisterSnapBackPosition("; + protected final String TEXT_16 = ".getType("; + protected final String TEXT_17 = ".VISUAL_ID), new Point("; + protected final String TEXT_18 = ", "; + protected final String TEXT_19 = "));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_20 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {" + NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new LabelDirectEditPolicy());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic int getKeyPoint() {" + NL + "\t\treturn ConnectionLocator."; + protected final String TEXT_21 = ";" + NL + "\t}" + NL; + protected final String TEXT_22 = NL; + protected final String TEXT_23 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_24 = " getLabelIcon() {" + NL + "\t\treturn null;" + NL + "\t}"; + protected final String TEXT_25 = NL; + protected final String TEXT_26 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelTextHelper("; + protected final String TEXT_27 = " figure) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_28 = ") {" + NL + "\t\t\treturn (("; + protected final String TEXT_29 = ") figure).getText();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; + protected final String TEXT_30 = ") figure).getText();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelTextHelper("; + protected final String TEXT_31 = " figure, String text) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_32 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_33 = ") figure).setText(text);" + NL + "\t\t} else {" + NL + "\t\t\t(("; + protected final String TEXT_34 = ") figure).setText(text);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected Image getLabelIconHelper("; + protected final String TEXT_35 = " figure) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_36 = ") {" + NL + "\t\t\treturn (("; + protected final String TEXT_37 = ") figure).getIcon();" + NL + "\t\t} else {" + NL + "\t\t\treturn (("; + protected final String TEXT_38 = ") figure).getIcon();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setLabelIconHelper("; + protected final String TEXT_39 = " figure, Image icon) {" + NL + "\t\tif (figure instanceof "; + protected final String TEXT_40 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_41 = ") figure).setIcon(icon);" + NL + "\t\t} else {" + NL + "\t\t\t(("; + protected final String TEXT_42 = ") figure).setIcon(icon);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabel("; + protected final String TEXT_43 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);" + NL + "\t\tdefaultText = getLabelTextHelper(figure);" + NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_44 = " getModelChildren() {" + NL + "\t\treturn "; + protected final String TEXT_45 = ".EMPTY_LIST;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_46 = " getChildBySemanticHint(String semanticHint) {" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t"; + protected final String TEXT_47 = " element = resolveSemanticElement();" + NL + "\t\tString text = null;" + NL + "\t\tif (element != null && getParser() != null) {" + NL + "\t\t\ttext = getParser().getPrintString(new "; + protected final String TEXT_48 = "(element)," + NL + "\t\t\t\tgetParserOptions().intValue());" + NL + "\t\t}" + NL + "\t\tif (text == null || text.length() == 0) {" + NL + "\t\t\ttext = defaultText;" + NL + "\t\t}" + NL + "\t\treturn text;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void setLabelText(String text) {" + NL + "\t\tsetLabelTextHelper(getFigure(), text);" + NL + "\t\tObject pdEditPolicy = getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; + protected final String TEXT_49 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_50 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic String getEditText() {" + NL + "\t\t"; + protected final String TEXT_51 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL + "\t\treturn getParser().getEditString(new "; + protected final String TEXT_52 = "(element)," + NL + "\t\t\tgetParserOptions().intValue());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isEditable() {"; + protected final String TEXT_53 = NL + "\t\t"; + protected final String TEXT_54 = " element = resolveSemanticElement();" + NL + "\t\tif (element != null && getEditText() != null) {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; + protected final String TEXT_55 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_56 = " getEditTextValidator() {" + NL + "\t\treturn new "; + protected final String TEXT_57 = "() {" + NL + "" + NL + "\t\t\tpublic String isValid(final Object value) {" + NL + "\t\t\t\tif (value instanceof String) {" + NL + "\t\t\t\t\tfinal "; + protected final String TEXT_58 = " element = resolveSemanticElement();" + NL + "\t\t\t\t\tfinal "; + protected final String TEXT_59 = " parser = getParser();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t"; + protected final String TEXT_60 = " valid =" + NL + "\t\t\t\t\t\t\t("; + protected final String TEXT_61 = ") getEditingDomain().runExclusive(" + NL + "\t\t\t\t\t\t\t\tnew "; + protected final String TEXT_62 = ".Impl() {" + NL + "" + NL + "\t\t\t\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\t\t\t\tsetResult(parser.isValidEditString(" + NL + "\t\t\t\t\t\t\t\t\tnew "; + protected final String TEXT_63 = "(element), (String) value));" + NL + "\t\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t});" + NL + "\t\t\t\t\t\treturn valid.getCode() == "; + protected final String TEXT_64 = ".EDITABLE ?" + NL + "\t\t\t\t\t\t\tnull : valid.getMessage();" + NL + "\t\t\t\t\t} catch (InterruptedException ie) {" + NL + "\t\t\t\t\t\tie.printStackTrace();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "" + NL + "\t\t\t\t// shouldn't get here" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_65 = " getCompletionProcessor() {" + NL + "\t\t"; + protected final String TEXT_66 = " element = resolveSemanticElement();" + NL + "\t\tif (element == null || getParser() == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\treturn getParser().getCompletionProcessor(new "; + protected final String TEXT_67 = "(element));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_68 = " getParserOptions() {" + NL + "\t\treturn "; + protected final String TEXT_69 = ".NONE;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_70 = " getParser() {" + NL + "\t\tif (parser == null) {" + NL + "\t\t\tString parserHint = (("; + protected final String TEXT_71 = ") getModel()).getType();" + NL + "\t\t\t"; + protected final String TEXT_72 = " element = resolveSemanticElement();" + NL + "\t\t\tif (element != null) {" + NL + "\t\t\t\t"; + protected final String TEXT_73 = " hintAdapter =" + NL + "\t\t\t\t\tnew "; + protected final String TEXT_74 = "(element, parserHint) {" + NL + "" + NL + "\t\t\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\t\t\tif ("; + protected final String TEXT_75 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\t\t\treturn "; + protected final String TEXT_76 = "."; + protected final String TEXT_77 = ";" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\treturn super.getAdapter(adapter);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t};" + NL + "\t\t\t\tparser = "; + protected final String TEXT_78 = ".getInstance().getParser(hintAdapter);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn parser;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_79 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tsetManager(new "; + protected final String TEXT_80 = "(this," + NL + "\t\t\t\t"; + protected final String TEXT_81 = ".getTextCellEditorClass(this)," + NL + "\t\t\t\t"; + protected final String TEXT_82 = ".getTextCellEditorLocator(this)));" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setManager("; + protected final String TEXT_83 = " manager) {" + NL + "\t\tthis.manager = manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit("; + protected final String TEXT_84 = " eventLocation) {" + NL + "\t\tif (getManager().getClass() == "; + protected final String TEXT_85 = ".class) {" + NL + "\t\t\t(("; + protected final String TEXT_86 = ") getManager()).show(eventLocation.getSWTPoint());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void performDirectEdit(char initialCharacter) {" + NL + "\t\tif (getManager() instanceof "; + protected final String TEXT_87 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_88 = ") getManager()).show(initialCharacter);" + NL + "\t\t} else {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEditRequest("; + protected final String TEXT_89 = " request) {" + NL + "\t\tfinal "; + protected final String TEXT_90 = " theRequest = request;" + NL + "\t\ttry {" + NL + "\t\t\tgetEditingDomain().runExclusive(new Runnable() {" + NL + "" + NL + "\t\t\t\tpublic void run() {" + NL + "\t\t\t\t\tif (isActive() && isEditable()) {" + NL + "\t\t\t\t\t\tif (theRequest.getExtendedData().get("; + protected final String TEXT_91 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {" + NL + "\t\t\t\t\t\t\tCharacter initialChar = (Character) theRequest.getExtendedData().get("; + protected final String TEXT_92 = ".REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);" + NL + "\t\t\t\t\t\t\tperformDirectEdit(initialChar.charValue());" + NL + "\t\t\t\t\t\t} else if ((theRequest instanceof "; + protected final String TEXT_93 = ") && (getEditText().equals(getLabelText()))) {" + NL + "\t\t\t\t\t\t\t"; + protected final String TEXT_94 = " editRequest =" + NL + "\t\t\t\t\t\t\t\t("; + protected final String TEXT_95 = ") theRequest;" + NL + "\t\t\t\t\t\t\tperformDirectEdit(editRequest.getLocation());" + NL + "\t\t\t\t\t\t} else {" + NL + "\t\t\t\t\t\t\tperformDirectEdit();" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t});" + NL + "\t\t} catch (InterruptedException e) {" + NL + "\t\t\te.printStackTrace();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshUnderline();" + NL + "\t\trefreshStrikeThrough();"; + protected final String TEXT_96 = NL + "\t\trefreshBounds();"; + protected final String TEXT_97 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tsetLabelTextHelper(getFigure(), getLabelText());" + NL + "\t\tsetLabelIconHelper(getFigure(), getLabelIcon());" + NL + "\t\tObject pdEditPolicy = getEditPolicy("; + protected final String TEXT_98 = ".PRIMARY_DRAG_ROLE);" + NL + "\t\tif (pdEditPolicy instanceof "; + protected final String TEXT_99 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_100 = ") pdEditPolicy).refreshFeedback();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshUnderline() {" + NL + "\t\t"; + protected final String TEXT_101 = " style =" + NL + "\t\t\t("; + protected final String TEXT_102 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_103 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; + protected final String TEXT_104 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_105 = ") getFigure()).setTextUnderline(style.isUnderline());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshStrikeThrough() {" + NL + "\t\t"; + protected final String TEXT_106 = " style =" + NL + "\t\t\t("; + protected final String TEXT_107 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_108 = ".eINSTANCE.getFontStyle());" + NL + "\t\tif (style != null && getFigure() instanceof "; + protected final String TEXT_109 = ") {" + NL + "\t\t\t(("; + protected final String TEXT_110 = ") getFigure()).setTextStrikeThrough(style.isStrikeThrough());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {" + NL + "\t\t"; + protected final String TEXT_111 = " style =" + NL + "\t\t\t("; + protected final String TEXT_112 = ") getPrimaryView().getStyle(" + NL + "\t\t\t\t"; + protected final String TEXT_113 = ".eINSTANCE.getFontStyle());" + NL + "\t\t"; + protected final String TEXT_114 = " fontData;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tfontData = new "; + protected final String TEXT_115 = "(" + NL + "\t\t\t\tstyle.getFontName(), style.getFontHeight()," + NL + "\t\t\t\t(style.isBold() ? "; + protected final String TEXT_116 = ".BOLD : "; + protected final String TEXT_117 = ".NORMAL) |" + NL + "\t\t\t\t(style.isItalic() ? "; + protected final String TEXT_118 = ".ITALIC : "; + protected final String TEXT_119 = ".NORMAL));" + NL + "\t\t} else {" + NL + "\t\t\t// initialize font to defaults" + NL + "\t\t\tfontData = "; + protected final String TEXT_120 = ".getFontData(" + NL + "\t\t\t\t("; + protected final String TEXT_121 = ") getDiagramPreferencesHint().getPreferenceStore()," + NL + "\t\t\t\t"; + protected final String TEXT_122 = ".PREF_DEFAULT_FONT);" + NL + "\t\t}" + NL + "\t\tsetFont(fontData);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setFontColor("; + protected final String TEXT_123 = " color) {" + NL + "\t\tgetFigure().setForegroundColor(color);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addSemanticListeners() {" + NL + "\t\tif (getParser() instanceof "; + protected final String TEXT_124 = ") {" + NL + "\t\t\t"; + protected final String TEXT_125 = " element = resolveSemanticElement();" + NL + "\t\t\tparserElements = (("; + protected final String TEXT_126 = ") getParser()).getSemanticElementsBeingParsed(element);" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\taddListenerFilter(\"SemanticModel\" + i, this, ("; + protected final String TEXT_127 = ") parserElements.get(i)); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.addSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeSemanticListeners() {" + NL + "\t\tif (parserElements != null) {" + NL + "\t\t\tfor (int i = 0; i < parserElements.size(); i++) {" + NL + "\t\t\t\tremoveListenerFilter(\"SemanticModel\" + i); //$NON-NLS-1$" + NL + "\t\t\t}" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeSemanticListeners();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_128 = " getAccessibleEditPart() {" + NL + "\t\tif (accessibleEP == null) {" + NL + "\t\t\taccessibleEP = new AccessibleGraphicalEditPart() {" + NL + "" + NL + "\t\t\t\tpublic void getName("; + protected final String TEXT_129 = " e) {" + NL + "\t\t\t\t\te.result = getLabelTextHelper(getFigure());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn accessibleEP;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void handleNotificationEvent("; + protected final String TEXT_130 = " event) {" + NL + "\t\tObject feature = event.getFeature();"; + protected final String TEXT_131 = NL; + protected final String TEXT_132 = "\t\tif ("; + protected final String TEXT_133 = ".eINSTANCE.getFontStyle_FontColor().equals(feature)) {" + NL + "\t\t\tInteger c = (Integer) event.getNewValue();" + NL + "\t\t\tsetFontColor("; + protected final String TEXT_134 = ".getInstance().getColor(c));" + NL + "\t\t} else if ("; + protected final String TEXT_135 = ".eINSTANCE.getFontStyle_Underline().equals(feature)) {" + NL + "\t\t\trefreshUnderline();" + NL + "\t\t} else if ("; + protected final String TEXT_136 = ".eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {" + NL + "\t\t\trefreshStrikeThrough();" + NL + "\t\t} else if ("; + protected final String TEXT_137 = ".eINSTANCE.getFontStyle_FontHeight().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_138 = ".eINSTANCE.getFontStyle_FontName().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_139 = ".eINSTANCE.getFontStyle_Bold().equals(feature) ||" + NL + "\t\t\t\t"; + protected final String TEXT_140 = ".eINSTANCE.getFontStyle_Italic().equals(feature)) {" + NL + "\t\t\trefreshFont();" + NL + "\t\t} else {" + NL + "\t\t\tif (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t\tif (getParser() instanceof ISemanticParser) {" + NL + "\t\t\t\t"; + protected final String TEXT_141 = " modelParser =" + NL + "\t\t\t\t\t("; + protected final String TEXT_142 = ") getParser();" + NL + "\t\t\t\tif (modelParser.areSemanticElementsAffected(null, event)) {" + NL + "\t\t\t\t\tremoveSemanticListeners();" + NL + "\t\t\t\t\tif (resolveSemanticElement() != null) {" + NL + "\t\t\t\t\t\taddSemanticListeners();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\trefreshLabel();" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.handleNotificationEvent(event);" + NL + "\t}"; + protected final String TEXT_143 = NL; + protected final String TEXT_144 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_145 = " createFigure() {" + NL + "\t\t"; + protected final String TEXT_146 = " label = createFigurePrim();" + NL + "\t\tdefaultText = getLabelTextHelper(label);" + NL + "\t\treturn label;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected "; + protected final String TEXT_147 = " createFigurePrim() {"; + protected final String TEXT_148 = NL + "\t\treturn new "; + protected final String TEXT_149 = "();"; + protected final String TEXT_150 = NL + "\t\treturn "; + protected final String TEXT_151 = ";"; + protected final String TEXT_152 = NL + "\t\treturn new "; + protected final String TEXT_153 = "();"; + protected final String TEXT_154 = NL + "\t}" + NL; + protected final String TEXT_155 = NL; + protected final String TEXT_156 = NL + "}"; + protected final String TEXT_157 = NL; public String generate(Object argument) { @@ -221,140 +222,140 @@ if (labelOffset != null) { } stringBuffer.append(TEXT_15); - stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_16); - stringBuffer.append(labelOffsetX); + stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_17); - stringBuffer.append(labelOffsetY); + stringBuffer.append(labelOffsetX); stringBuffer.append(TEXT_18); - stringBuffer.append(genLabel.getEditPartClassName()); + stringBuffer.append(labelOffsetY); stringBuffer.append(TEXT_19); - stringBuffer.append(genLabel.getAlignment()); + stringBuffer.append(genLabel.getEditPartClassName()); stringBuffer.append(TEXT_20); - final boolean needsRefreshBounds = false; + stringBuffer.append(genLabel.getAlignment()); stringBuffer.append(TEXT_21); + final boolean needsRefreshBounds = false; stringBuffer.append(TEXT_22); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image")); stringBuffer.append(TEXT_23); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image")); stringBuffer.append(TEXT_24); stringBuffer.append(TEXT_25); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_26); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_27); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_28); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_29); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_30); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_31); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_32); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_33); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_34); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_35); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_36); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_37); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_38); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_39); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_40); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_41); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label")); stringBuffer.append(TEXT_42); - stringBuffer.append(importManager.getImportedName("java.util.List")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_43); - stringBuffer.append(importManager.getImportedName("java.util.Collections")); + stringBuffer.append(importManager.getImportedName("java.util.List")); stringBuffer.append(TEXT_44); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart")); + stringBuffer.append(importManager.getImportedName("java.util.Collections")); stringBuffer.append(TEXT_45); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart")); stringBuffer.append(TEXT_46); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_47); - stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_48); stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_49); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_50); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_51); - if (!genLabel.isReadOnly()) { + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_52); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + if (!genLabel.isReadOnly()) { stringBuffer.append(TEXT_53); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_54); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); + } stringBuffer.append(TEXT_55); stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); stringBuffer.append(TEXT_56); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.ICellEditorValidator")); stringBuffer.append(TEXT_57); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_58); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); stringBuffer.append(TEXT_59); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); stringBuffer.append(TEXT_60); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.RunnableWithResult")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus")); stringBuffer.append(TEXT_61); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.RunnableWithResult")); stringBuffer.append(TEXT_62); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_63); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.text.contentassist.IContentAssistProcessor")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus")); stringBuffer.append(TEXT_64); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.text.contentassist.IContentAssistProcessor")); stringBuffer.append(TEXT_65); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_66); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_67); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); stringBuffer.append(TEXT_68); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions")); stringBuffer.append(TEXT_69); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.IParser")); stringBuffer.append(TEXT_70); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); stringBuffer.append(TEXT_71); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_72); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); stringBuffer.append(TEXT_73); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter")); stringBuffer.append(TEXT_74); - stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_75); - stringBuffer.append(genHost.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); stringBuffer.append(TEXT_76); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserService")); + stringBuffer.append(genHost.getUniqueIdentifier()); stringBuffer.append(TEXT_77); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.common.ui.services.parser.ParserService")); stringBuffer.append(TEXT_78); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); stringBuffer.append(TEXT_79); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_80); - stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_81); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName())); stringBuffer.append(TEXT_82); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Point")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager")); stringBuffer.append(TEXT_83); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Point")); stringBuffer.append(TEXT_84); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_85); @@ -362,61 +363,61 @@ if (labelOffset != null) { stringBuffer.append(TEXT_86); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_87); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager")); stringBuffer.append(TEXT_88); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); stringBuffer.append(TEXT_89); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request")); stringBuffer.append(TEXT_90); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); stringBuffer.append(TEXT_91); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants")); stringBuffer.append(TEXT_92); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_93); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_94); - if (needsRefreshBounds) { + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")); stringBuffer.append(TEXT_95); - } + if (needsRefreshBounds) { stringBuffer.append(TEXT_96); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy")); + } stringBuffer.append(TEXT_97); - stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy")); stringBuffer.append(TEXT_98); stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_99); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_100); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_101); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_102); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_103); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_104); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_105); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_106); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_107); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_108); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_109); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.WrapLabel")); stringBuffer.append(TEXT_110); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_111); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle")); stringBuffer.append(TEXT_112); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_113); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); stringBuffer.append(TEXT_114); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData")); stringBuffer.append(TEXT_115); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_116); @@ -424,35 +425,35 @@ if (labelOffset != null) { stringBuffer.append(TEXT_117); stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_118); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.PreferenceConverter")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT")); stringBuffer.append(TEXT_119); - stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.IPreferenceStore")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.PreferenceConverter")); stringBuffer.append(TEXT_120); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.jface.preference.IPreferenceStore")); stringBuffer.append(TEXT_121); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants")); stringBuffer.append(TEXT_122); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color")); stringBuffer.append(TEXT_123); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); - stringBuffer.append(TEXT_124); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); - stringBuffer.append(TEXT_125); + stringBuffer.append(TEXT_124); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_125); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_126); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.AccessibleEditPart")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_127); - stringBuffer.append(importManager.getImportedName("org.eclipse.swt.accessibility.AccessibleEvent")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.AccessibleEditPart")); stringBuffer.append(TEXT_128); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification")); + stringBuffer.append(importManager.getImportedName("org.eclipse.swt.accessibility.AccessibleEvent")); stringBuffer.append(TEXT_129); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification")); stringBuffer.append(TEXT_130); stringBuffer.append(TEXT_131); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_132); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry")); - stringBuffer.append(TEXT_133); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); + stringBuffer.append(TEXT_133); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry")); stringBuffer.append(TEXT_134); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_135); @@ -464,18 +465,20 @@ if (labelOffset != null) { stringBuffer.append(TEXT_138); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_139); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")); stringBuffer.append(TEXT_140); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_141); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser")); stringBuffer.append(TEXT_142); stringBuffer.append(TEXT_143); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_144); stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_145); stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); stringBuffer.append(TEXT_146); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure")); + stringBuffer.append(TEXT_147); String figureQualifiedClassName = null; Viewmap viewmap = genLabel.getViewmap(); @@ -485,30 +488,30 @@ if (viewmap instanceof FigureViewmap) { figureQualifiedClassName = "org.eclipse.draw2d.Label"; } - stringBuffer.append(TEXT_147); - stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); stringBuffer.append(TEXT_148); + stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); + stringBuffer.append(TEXT_149); } // instanceof FigureViewmap else if (viewmap instanceof SnippetViewmap) { - stringBuffer.append(TEXT_149); - stringBuffer.append(((SnippetViewmap) viewmap).getBody()); stringBuffer.append(TEXT_150); + stringBuffer.append(((SnippetViewmap) viewmap).getBody()); + stringBuffer.append(TEXT_151); } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter else if (viewmap instanceof InnerClassViewmap) { figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName(); - stringBuffer.append(TEXT_151); - stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_152); - } + stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_153); - if (genLabel.getViewmap() instanceof InnerClassViewmap) { + } stringBuffer.append(TEXT_154); + if (genLabel.getViewmap() instanceof InnerClassViewmap) { + stringBuffer.append(TEXT_155); stringBuffer.append(((InnerClassViewmap) genLabel.getViewmap()).getClassBody()); } - stringBuffer.append(TEXT_155); - importManager.emitSortedImports(); stringBuffer.append(TEXT_156); + importManager.emitSortedImports(); + stringBuffer.append(TEXT_157); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeEditPartGenerator.java index 02641bb01..ce3a4a234 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeEditPartGenerator.java @@ -25,8 +25,8 @@ public class NodeEditPartGenerator { protected final String TEXT_6 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_7 = " extends ShapeNodeEditPart {"; protected final String TEXT_8 = NL; - protected final String TEXT_9 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_10 = "\";"; + protected final String TEXT_9 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_10 = ";"; protected final String TEXT_11 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure contentPane;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure primaryShape;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; protected final String TEXT_12 = "(View view) {" + NL + "\t\tsuper(view);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createDefaultEditPolicies() {"; protected final String TEXT_13 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.CREATION_ROLE, new "; @@ -44,106 +44,108 @@ public class NodeEditPartGenerator { protected final String TEXT_25 = "."; protected final String TEXT_26 = ") {" + NL + "\t\t\t\t\t\t\t"; protected final String TEXT_27 = " compartmentEditPart =" + NL + "\t\t\t\t\t\t\t\tgetChildBySemanticHint("; - protected final String TEXT_28 = ".VISUAL_ID);" + NL + "\t\t\t\t\t\t\treturn compartmentEditPart == null ? null : compartmentEditPart.getCommand(request);" + NL + "\t\t\t\t\t\t}"; - protected final String TEXT_29 = NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\treturn super.getCommand(request);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}"; - protected final String TEXT_30 = NL + "\t\t);"; - protected final String TEXT_31 = NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new "; - protected final String TEXT_32 = "());" + NL + "\t\tinstallEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new "; - protected final String TEXT_33 = "());"; - protected final String TEXT_34 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new "; - protected final String TEXT_35 = "());"; - protected final String TEXT_36 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new "; - protected final String TEXT_37 = "());"; - protected final String TEXT_38 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, new "; - protected final String TEXT_39 = "() {" + NL + "" + NL + "\t\t\tprotected EditPolicy createChildEditPolicy("; - protected final String TEXT_40 = " child) {" + NL + "\t\t\t\tEditPolicy result = super.createChildEditPolicy(child);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\treturn new "; - protected final String TEXT_41 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});"; - protected final String TEXT_42 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, new "; - protected final String TEXT_43 = "() {" + NL + "" + NL + "\t\t\tprotected EditPolicy createChildEditPolicy("; - protected final String TEXT_44 = " child) {" + NL + "\t\t\t\tif (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {" + NL + "\t\t\t\t\tif (child instanceof "; - protected final String TEXT_45 = ") {" + NL + "\t\t\t\t\t\treturn new "; - protected final String TEXT_46 = "();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.createChildEditPolicy(child);" + NL + "\t\t\t}" + NL + "\t\t});"; - protected final String TEXT_47 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure createNodeShape() {"; - protected final String TEXT_48 = NL + "\t\treturn primaryShape = new "; - protected final String TEXT_49 = "()"; - protected final String TEXT_50 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}"; - protected final String TEXT_51 = ";"; - protected final String TEXT_52 = NL + "\t\treturn "; - protected final String TEXT_53 = ";"; - protected final String TEXT_54 = NL + "\t\t"; - protected final String TEXT_55 = " figure = new "; - protected final String TEXT_56 = "();"; - protected final String TEXT_57 = NL + " \t\tfigure.setUseLocalCoordinates(true);"; - protected final String TEXT_58 = NL + " \t\treturn primaryShape = figure;"; - protected final String TEXT_59 = NL + "\t}"; - protected final String TEXT_60 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_61 = " getPrimaryShape() {" + NL + "\t\treturn ("; - protected final String TEXT_62 = ") primaryShape;" + NL + "\t}"; - protected final String TEXT_63 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(EditPart childEditPart) {"; - protected final String TEXT_64 = NL + "\t\tif (childEditPart instanceof "; - protected final String TEXT_65 = ") {"; - protected final String TEXT_66 = NL + "\t\t\t(("; - protected final String TEXT_67 = ") childEditPart).setLabel(getPrimaryShape().getFigure"; - protected final String TEXT_68 = "());"; - protected final String TEXT_69 = NL + "\t\t\t(("; - protected final String TEXT_70 = ") childEditPart).setLabel(new "; - protected final String TEXT_71 = "());"; - protected final String TEXT_72 = NL + "\t\t\treturn true;" + NL + "\t\t}"; - protected final String TEXT_73 = NL + "\t\treturn false;" + NL + "\t}"; - protected final String TEXT_74 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodePlate() {"; - protected final String TEXT_75 = NL + "\t\treturn new DefaultSizeNodeFigure(getMapMode().DPtoLP("; - protected final String TEXT_76 = "), getMapMode().DPtoLP("; - protected final String TEXT_77 = "));" + NL + "\t}"; - protected final String TEXT_78 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic EditPolicy getPrimaryDragEditPolicy() {" + NL + "\t\treturn new "; - protected final String TEXT_79 = "() {" + NL + "\t\t\tprotected "; - protected final String TEXT_80 = " createSelectionHandles() {" + NL + "\t\t\t\tfinal "; - protected final String TEXT_81 = " part = ("; - protected final String TEXT_82 = ") getHost();" + NL + "\t\t\t\tfinal "; - protected final String TEXT_83 = " list = new "; - protected final String TEXT_84 = "();" + NL + "\t\t\t\taddMoveHandle(part, list);" + NL + "\t\t\t\t"; - protected final String TEXT_85 = NL + "\t\t\t\t"; - protected final String TEXT_86 = ".addHandle(part, list, "; - protected final String TEXT_87 = "."; - protected final String TEXT_88 = ");" + NL + "\t\t\t\t"; - protected final String TEXT_89 = NL + "\t\t\t\t"; - protected final String TEXT_90 = ".addHandle(part, list, "; - protected final String TEXT_91 = "."; - protected final String TEXT_92 = ");" + NL + "\t\t\t\t"; - protected final String TEXT_93 = NL + "\t\t\t\treturn list;" + NL + "\t\t\t}" + NL + "\t\t\tprivate void addMoveHandle(final "; - protected final String TEXT_94 = " part, final "; - protected final String TEXT_95 = " list) {" + NL + "\t\t\t\t"; - protected final String TEXT_96 = " moveHandle = new "; - protected final String TEXT_97 = "(part);" + NL + "\t\t\t\tlist.add(moveHandle);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}"; - protected final String TEXT_98 = NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove <i>generated</i> tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodeFigure() {" + NL + "\t\tNodeFigure figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Default implementation treats passed figure as content pane." + NL + "\t * Respects layout one may have set for generated figure." + NL + "\t * @param nodeShape instance of generated figure class" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure setupContentPane(IFigure nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {"; - protected final String TEXT_99 = NL + "\t\t\t"; - protected final String TEXT_100 = " layout = new "; - protected final String TEXT_101 = "();" + NL + "\t\t\tlayout.setSpacing(getMapMode().DPtoLP(5));" + NL + "\t\t\tnodeShape.setLayoutManager(layout);"; - protected final String TEXT_102 = NL + "\t\tnodeShape.setLayoutManager(new "; - protected final String TEXT_103 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(IFigure figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new "; - protected final String TEXT_104 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});"; - protected final String TEXT_105 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getContentPane() {" + NL + "\t\tif (contentPane != null) {" + NL + "\t\t\treturn contentPane;" + NL + "\t\t}" + NL + "\t\treturn super.getContentPane();" + NL + "\t}"; - protected final String TEXT_106 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; - protected final String TEXT_107 = " getPrimaryChildEditPart() {" + NL + "\t\treturn getChildBySemanticHint("; - protected final String TEXT_108 = ".VISUAL_ID);" + NL + "\t}"; - protected final String TEXT_109 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual("; - protected final String TEXT_110 = " childEditPart, int index) {" + NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = (("; - protected final String TEXT_111 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t} else {"; - protected final String TEXT_112 = NL + "\t\t\tif (!addFixedChild(childEditPart)) {" + NL + "\t\t\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t\t\t}"; - protected final String TEXT_113 = NL + "\t\t\tsuper.addChildVisual(childEditPart, -1);"; - protected final String TEXT_114 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual("; - protected final String TEXT_115 = " childEditPart) {" + NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = (("; - protected final String TEXT_116 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel("; - protected final String TEXT_117 = " childEditPart) {"; - protected final String TEXT_118 = NL + "\t\tif (childEditPart instanceof "; - protected final String TEXT_119 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; - protected final String TEXT_120 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure getExternalLabelsContainer() {" + NL + "\t\t"; - protected final String TEXT_121 = " root = ("; - protected final String TEXT_122 = ") getRoot();" + NL + "\t\treturn root.getLayer("; - protected final String TEXT_123 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL; - protected final String TEXT_124 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(EditPart childEditPart, int index) {" + NL + "\t\tif (!addFixedChild(childEditPart)) {" + NL + "\t\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t\t}" + NL + "\t}"; - protected final String TEXT_125 = NL; - protected final String TEXT_126 = NL + "}"; + protected final String TEXT_28 = ".getType("; + protected final String TEXT_29 = ".VISUAL_ID));" + NL + "\t\t\t\t\t\t\treturn compartmentEditPart == null ? null : compartmentEditPart.getCommand(request);" + NL + "\t\t\t\t\t\t}"; + protected final String TEXT_30 = NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\treturn super.getCommand(request);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}"; + protected final String TEXT_31 = NL + "\t\t);"; + protected final String TEXT_32 = NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new "; + protected final String TEXT_33 = "());" + NL + "\t\tinstallEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new "; + protected final String TEXT_34 = "());"; + protected final String TEXT_35 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new "; + protected final String TEXT_36 = "());"; + protected final String TEXT_37 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new "; + protected final String TEXT_38 = "());"; + protected final String TEXT_39 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, new "; + protected final String TEXT_40 = "() {" + NL + "" + NL + "\t\t\tprotected EditPolicy createChildEditPolicy("; + protected final String TEXT_41 = " child) {" + NL + "\t\t\t\tEditPolicy result = super.createChildEditPolicy(child);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\treturn new "; + protected final String TEXT_42 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});"; + protected final String TEXT_43 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, new "; + protected final String TEXT_44 = "() {" + NL + "" + NL + "\t\t\tprotected EditPolicy createChildEditPolicy("; + protected final String TEXT_45 = " child) {" + NL + "\t\t\t\tif (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {" + NL + "\t\t\t\t\tif (child instanceof "; + protected final String TEXT_46 = ") {" + NL + "\t\t\t\t\t\treturn new "; + protected final String TEXT_47 = "();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.createChildEditPolicy(child);" + NL + "\t\t\t}" + NL + "\t\t});"; + protected final String TEXT_48 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure createNodeShape() {"; + protected final String TEXT_49 = NL + "\t\treturn primaryShape = new "; + protected final String TEXT_50 = "()"; + protected final String TEXT_51 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}"; + protected final String TEXT_52 = ";"; + protected final String TEXT_53 = NL + "\t\treturn "; + protected final String TEXT_54 = ";"; + protected final String TEXT_55 = NL + "\t\t"; + protected final String TEXT_56 = " figure = new "; + protected final String TEXT_57 = "();"; + protected final String TEXT_58 = NL + " \t\tfigure.setUseLocalCoordinates(true);"; + protected final String TEXT_59 = NL + " \t\treturn primaryShape = figure;"; + protected final String TEXT_60 = NL + "\t}"; + protected final String TEXT_61 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_62 = " getPrimaryShape() {" + NL + "\t\treturn ("; + protected final String TEXT_63 = ") primaryShape;" + NL + "\t}"; + protected final String TEXT_64 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(EditPart childEditPart) {"; + protected final String TEXT_65 = NL + "\t\tif (childEditPart instanceof "; + protected final String TEXT_66 = ") {"; + protected final String TEXT_67 = NL + "\t\t\t(("; + protected final String TEXT_68 = ") childEditPart).setLabel(getPrimaryShape().getFigure"; + protected final String TEXT_69 = "());"; + protected final String TEXT_70 = NL + "\t\t\t(("; + protected final String TEXT_71 = ") childEditPart).setLabel(new "; + protected final String TEXT_72 = "());"; + protected final String TEXT_73 = NL + "\t\t\treturn true;" + NL + "\t\t}"; + protected final String TEXT_74 = NL + "\t\treturn false;" + NL + "\t}"; + protected final String TEXT_75 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodePlate() {"; + protected final String TEXT_76 = NL + "\t\treturn new DefaultSizeNodeFigure(getMapMode().DPtoLP("; + protected final String TEXT_77 = "), getMapMode().DPtoLP("; + protected final String TEXT_78 = "));" + NL + "\t}"; + protected final String TEXT_79 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic EditPolicy getPrimaryDragEditPolicy() {" + NL + "\t\treturn new "; + protected final String TEXT_80 = "() {" + NL + "\t\t\tprotected "; + protected final String TEXT_81 = " createSelectionHandles() {" + NL + "\t\t\t\tfinal "; + protected final String TEXT_82 = " part = ("; + protected final String TEXT_83 = ") getHost();" + NL + "\t\t\t\tfinal "; + protected final String TEXT_84 = " list = new "; + protected final String TEXT_85 = "();" + NL + "\t\t\t\taddMoveHandle(part, list);" + NL + "\t\t\t\t"; + protected final String TEXT_86 = NL + "\t\t\t\t"; + protected final String TEXT_87 = ".addHandle(part, list, "; + protected final String TEXT_88 = "."; + protected final String TEXT_89 = ");" + NL + "\t\t\t\t"; + protected final String TEXT_90 = NL + "\t\t\t\t"; + protected final String TEXT_91 = ".addHandle(part, list, "; + protected final String TEXT_92 = "."; + protected final String TEXT_93 = ");" + NL + "\t\t\t\t"; + protected final String TEXT_94 = NL + "\t\t\t\treturn list;" + NL + "\t\t\t}" + NL + "\t\t\tprivate void addMoveHandle(final "; + protected final String TEXT_95 = " part, final "; + protected final String TEXT_96 = " list) {" + NL + "\t\t\t\t"; + protected final String TEXT_97 = " moveHandle = new "; + protected final String TEXT_98 = "(part);" + NL + "\t\t\t\tlist.add(moveHandle);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}"; + protected final String TEXT_99 = NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove <i>generated</i> tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected NodeFigure createNodeFigure() {" + NL + "\t\tNodeFigure figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Default implementation treats passed figure as content pane." + NL + "\t * Respects layout one may have set for generated figure." + NL + "\t * @param nodeShape instance of generated figure class" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure setupContentPane(IFigure nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {"; + protected final String TEXT_100 = NL + "\t\t\t"; + protected final String TEXT_101 = " layout = new "; + protected final String TEXT_102 = "();" + NL + "\t\t\tlayout.setSpacing(getMapMode().DPtoLP(5));" + NL + "\t\t\tnodeShape.setLayoutManager(layout);"; + protected final String TEXT_103 = NL + "\t\tnodeShape.setLayoutManager(new "; + protected final String TEXT_104 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(IFigure figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new "; + protected final String TEXT_105 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});"; + protected final String TEXT_106 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getContentPane() {" + NL + "\t\tif (contentPane != null) {" + NL + "\t\t\treturn contentPane;" + NL + "\t\t}" + NL + "\t\treturn super.getContentPane();" + NL + "\t}"; + protected final String TEXT_107 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic "; + protected final String TEXT_108 = " getPrimaryChildEditPart() {" + NL + "\t\treturn getChildBySemanticHint("; + protected final String TEXT_109 = ".getType("; + protected final String TEXT_110 = ".VISUAL_ID));" + NL + "\t}"; + protected final String TEXT_111 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual("; + protected final String TEXT_112 = " childEditPart, int index) {" + NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = (("; + protected final String TEXT_113 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t} else {"; + protected final String TEXT_114 = NL + "\t\t\tif (!addFixedChild(childEditPart)) {" + NL + "\t\t\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t\t\t}"; + protected final String TEXT_115 = NL + "\t\t\tsuper.addChildVisual(childEditPart, -1);"; + protected final String TEXT_116 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual("; + protected final String TEXT_117 = " childEditPart) {" + NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = (("; + protected final String TEXT_118 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t} else {" + NL + "\t\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel("; + protected final String TEXT_119 = " childEditPart) {"; + protected final String TEXT_120 = NL + "\t\tif (childEditPart instanceof "; + protected final String TEXT_121 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}"; + protected final String TEXT_122 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure getExternalLabelsContainer() {" + NL + "\t\t"; + protected final String TEXT_123 = " root = ("; + protected final String TEXT_124 = ") getRoot();" + NL + "\t\treturn root.getLayer("; + protected final String TEXT_125 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL; + protected final String TEXT_126 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(EditPart childEditPart, int index) {" + NL + "\t\tif (!addFixedChild(childEditPart)) {" + NL + "\t\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t\t}" + NL + "\t}"; protected final String TEXT_127 = NL; + protected final String TEXT_128 = NL + "}"; + protected final String TEXT_129 = NL; protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) { StringBuffer result = new StringBuffer(); @@ -332,50 +334,52 @@ if (!genNode.getChildNodes().isEmpty() || hasChildrenInListCompartments) { stringBuffer.append(TEXT_26); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_27); - stringBuffer.append(importManager.getImportedName(compartment.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_28); + stringBuffer.append(importManager.getImportedName(compartment.getEditPartQualifiedClassName())); + stringBuffer.append(TEXT_29); } } } - stringBuffer.append(TEXT_29); - } stringBuffer.append(TEXT_30); - } + } stringBuffer.append(TEXT_31); - stringBuffer.append(importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName())); + } stringBuffer.append(TEXT_32); - stringBuffer.append(importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_33); - if (!genNode.getChildNodes().isEmpty()) { + stringBuffer.append(importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_34); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy")); + if (!genNode.getChildNodes().isEmpty()) { stringBuffer.append(TEXT_35); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy")); stringBuffer.append(TEXT_36); - stringBuffer.append(importManager.getImportedName(genNode.getCanonicalEditPolicyQualifiedClassName())); + } stringBuffer.append(TEXT_37); - if (useFlowLayout) { + stringBuffer.append(importManager.getImportedName(genNode.getCanonicalEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_38); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy")); + if (useFlowLayout) { stringBuffer.append(TEXT_39); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy")); stringBuffer.append(TEXT_40); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_41); - } else { + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy")); stringBuffer.append(TEXT_42); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy")); + } else { stringBuffer.append(TEXT_43); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy")); stringBuffer.append(TEXT_44); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_45); - stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart")); stringBuffer.append(TEXT_46); - } + stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName())); stringBuffer.append(TEXT_47); + } + stringBuffer.append(TEXT_48); boolean hasFixedChildren = false; String figureQualifiedClassName = null; @@ -386,39 +390,39 @@ if (viewmap instanceof FigureViewmap) { figureQualifiedClassName = "org.eclipse.draw2d.RectangleFigure"; } - stringBuffer.append(TEXT_48); - stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); stringBuffer.append(TEXT_49); - if (useFlowLayout) { + stringBuffer.append(importManager.getImportedName(figureQualifiedClassName)); stringBuffer.append(TEXT_50); - } // use flow layout + if (useFlowLayout) { stringBuffer.append(TEXT_51); + } // use flow layout + stringBuffer.append(TEXT_52); } // instanceof FigureViewmap else if (viewmap instanceof SnippetViewmap) { - stringBuffer.append(TEXT_52); - stringBuffer.append(((SnippetViewmap) viewmap).getBody()); stringBuffer.append(TEXT_53); + stringBuffer.append(((SnippetViewmap) viewmap).getBody()); + stringBuffer.append(TEXT_54); } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter else if (viewmap instanceof InnerClassViewmap) { figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName(); - stringBuffer.append(TEXT_54); - stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_55); stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_56); - if (!genNode.getChildNodes().isEmpty() && useFlowLayout) { /*otherwise, leave to figure's default value*/ + stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_57); - } + if (!genNode.getChildNodes().isEmpty() && useFlowLayout) { /*otherwise, leave to figure's default value*/ stringBuffer.append(TEXT_58); } stringBuffer.append(TEXT_59); - if (figureQualifiedClassName != null) { + } stringBuffer.append(TEXT_60); - stringBuffer.append(figureQualifiedClassName); + if (figureQualifiedClassName != null) { stringBuffer.append(TEXT_61); stringBuffer.append(figureQualifiedClassName); stringBuffer.append(TEXT_62); + stringBuffer.append(figureQualifiedClassName); + stringBuffer.append(TEXT_63); List innerLabels = new ArrayList(genNode.getLabels().size()); for (Iterator it = genNode.getLabels().iterator(); it.hasNext(); ) { @@ -430,7 +434,7 @@ if (viewmap instanceof FigureViewmap) { if (!innerLabels.isEmpty()) { hasFixedChildren = true; - stringBuffer.append(TEXT_63); + stringBuffer.append(TEXT_64); for (Iterator it = innerLabels.iterator(); it.hasNext(); ) { GenNodeLabel genLabel = (GenNodeLabel) it.next(); @@ -449,30 +453,30 @@ if (viewmap instanceof FigureViewmap) { isAccessor = false; } - stringBuffer.append(TEXT_64); - stringBuffer.append(labelEditPart); stringBuffer.append(TEXT_65); - if (isAccessor) { - stringBuffer.append(TEXT_66); stringBuffer.append(labelEditPart); + stringBuffer.append(TEXT_66); + if (isAccessor) { stringBuffer.append(TEXT_67); - stringBuffer.append(labelFigureClassName); + stringBuffer.append(labelEditPart); stringBuffer.append(TEXT_68); - } else { + stringBuffer.append(labelFigureClassName); stringBuffer.append(TEXT_69); - stringBuffer.append(labelEditPart); + } else { stringBuffer.append(TEXT_70); - stringBuffer.append(labelFigureClassName); + stringBuffer.append(labelEditPart); stringBuffer.append(TEXT_71); - } + stringBuffer.append(labelFigureClassName); stringBuffer.append(TEXT_72); - } + } stringBuffer.append(TEXT_73); + } + stringBuffer.append(TEXT_74); } } - stringBuffer.append(TEXT_74); + stringBuffer.append(TEXT_75); int width = 40; int height = 40; @@ -482,83 +486,85 @@ if (defSizeAttrs != null) { height = defSizeAttrs.getHeight(); } - stringBuffer.append(TEXT_75); - stringBuffer.append(width); stringBuffer.append(TEXT_76); - stringBuffer.append(height); + stringBuffer.append(width); stringBuffer.append(TEXT_77); + stringBuffer.append(height); + stringBuffer.append(TEXT_78); if (genNode.getViewmap().find(ResizeConstraints.class) != null) { final ResizeConstraints rc = (ResizeConstraints) genNode.getViewmap().find(ResizeConstraints.class); final String javaUtilList = importManager.getImportedName("java.util.List"); - stringBuffer.append(TEXT_78); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy")); stringBuffer.append(TEXT_79); - stringBuffer.append(javaUtilList); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy")); stringBuffer.append(TEXT_80); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); + stringBuffer.append(javaUtilList); stringBuffer.append(TEXT_81); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); stringBuffer.append(TEXT_82); - stringBuffer.append(javaUtilList); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); stringBuffer.append(TEXT_83); - stringBuffer.append(importManager.getImportedName("java.util.ArrayList")); + stringBuffer.append(javaUtilList); stringBuffer.append(TEXT_84); + stringBuffer.append(importManager.getImportedName("java.util.ArrayList")); + stringBuffer.append(TEXT_85); for (Iterator it = rc.getResizeHandleNames().iterator(); it.hasNext();) { String next = (String) it.next(); - stringBuffer.append(TEXT_85); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.ResizableHandleKit")); stringBuffer.append(TEXT_86); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.PositionConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.ResizableHandleKit")); stringBuffer.append(TEXT_87); - stringBuffer.append(next); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.PositionConstants")); stringBuffer.append(TEXT_88); + stringBuffer.append(next); + stringBuffer.append(TEXT_89); } for (Iterator it = rc.getNonResizeHandleNames().iterator(); it.hasNext();) { String next = (String) it.next(); - stringBuffer.append(TEXT_89); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.NonResizableHandleKit")); stringBuffer.append(TEXT_90); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.PositionConstants")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.NonResizableHandleKit")); stringBuffer.append(TEXT_91); - stringBuffer.append(next); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.PositionConstants")); stringBuffer.append(TEXT_92); - } + stringBuffer.append(next); stringBuffer.append(TEXT_93); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); + } stringBuffer.append(TEXT_94); - stringBuffer.append(javaUtilList); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); stringBuffer.append(TEXT_95); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.MoveHandle")); + stringBuffer.append(javaUtilList); stringBuffer.append(TEXT_96); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.MoveHandle")); stringBuffer.append(TEXT_97); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.handles.MoveHandle")); stringBuffer.append(TEXT_98); + } + stringBuffer.append(TEXT_99); if (!useFlowLayout) { String layoutClassName = importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout"); - stringBuffer.append(TEXT_99); - stringBuffer.append(layoutClassName); stringBuffer.append(TEXT_100); stringBuffer.append(layoutClassName); stringBuffer.append(TEXT_101); - } else { + stringBuffer.append(layoutClassName); stringBuffer.append(TEXT_102); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayout")); + } else { stringBuffer.append(TEXT_103); - stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle")); + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayout")); stringBuffer.append(TEXT_104); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle")); stringBuffer.append(TEXT_105); + } + stringBuffer.append(TEXT_106); if (!genNode.getLabels().isEmpty()) { GenNodeLabel primaryLabel = (GenNodeLabel) genNode.getLabels().get(0); - stringBuffer.append(TEXT_106); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_107); - stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_108); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(TEXT_109); + stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())); + stringBuffer.append(TEXT_110); } boolean hasExternalLabels = false; @@ -571,57 +577,57 @@ for (Iterator labels = genNode.getLabels().iterator(); labels.hasNext();) { } if (hasExternalLabels) { - stringBuffer.append(TEXT_109); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); - stringBuffer.append(TEXT_110); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); stringBuffer.append(TEXT_111); - if (hasFixedChildren) { + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_112); - } else { + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); stringBuffer.append(TEXT_113); - } + if (hasFixedChildren) { stringBuffer.append(TEXT_114); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); + } else { stringBuffer.append(TEXT_115); - stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); + } stringBuffer.append(TEXT_116); stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); stringBuffer.append(TEXT_117); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart")); + stringBuffer.append(TEXT_118); + stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart")); + stringBuffer.append(TEXT_119); for (Iterator labels = genNode.getLabels().iterator(); labels.hasNext();) { GenNodeLabel label = (GenNodeLabel) labels.next(); if (label instanceof GenExternalNodeLabel) { - stringBuffer.append(TEXT_118); + stringBuffer.append(TEXT_120); stringBuffer.append(importManager.getImportedName(label.getEditPartQualifiedClassName())); - stringBuffer.append(TEXT_119); + stringBuffer.append(TEXT_121); } } - stringBuffer.append(TEXT_120); + stringBuffer.append(TEXT_122); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart")); - stringBuffer.append(TEXT_121); + stringBuffer.append(TEXT_123); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart")); - stringBuffer.append(TEXT_122); + stringBuffer.append(TEXT_124); stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName())); - stringBuffer.append(TEXT_123); + stringBuffer.append(TEXT_125); } else { if (hasFixedChildren) { - stringBuffer.append(TEXT_124); + stringBuffer.append(TEXT_126); } } if (genNode.getViewmap() instanceof InnerClassViewmap) { - stringBuffer.append(TEXT_125); + stringBuffer.append(TEXT_127); stringBuffer.append(((InnerClassViewmap) genNode.getViewmap()).getClassBody()); } - stringBuffer.append(TEXT_126); + stringBuffer.append(TEXT_128); importManager.emitSortedImports(); - stringBuffer.append(TEXT_127); + stringBuffer.append(TEXT_129); return stringBuffer.toString(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeLabelEditPartGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeLabelEditPartGenerator.java index c5a04c882..6bc220ef3 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeLabelEditPartGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/parts/NodeLabelEditPartGenerator.java @@ -22,8 +22,8 @@ public class NodeLabelEditPartGenerator protected final String TEXT_5 = NL + NL + "/**" + NL + " * @generated" + NL + " */" + NL + "public class "; protected final String TEXT_6 = " extends CompartmentEditPart implements ITextAwareEditPart {"; protected final String TEXT_7 = NL; - protected final String TEXT_8 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static String VISUAL_ID = \""; - protected final String TEXT_9 = "\";"; + protected final String TEXT_8 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final int VISUAL_ID = "; + protected final String TEXT_9 = ";"; protected final String TEXT_10 = NL; protected final String TEXT_11 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; protected final String TEXT_12 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate "; diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java index aa9855b89..7cf710901 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java @@ -47,9 +47,9 @@ public class ChildContainerCanonicalEditPolicyGenerator { protected final String TEXT_28 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);"; protected final String TEXT_29 = NL + "\tswitch (nodeVID) {"; protected final String TEXT_30 = NL + "\tcase "; - protected final String TEXT_31 = ": {"; + protected final String TEXT_31 = ".VISUAL_ID: {"; protected final String TEXT_32 = NL + "\tif ("; - protected final String TEXT_33 = " == nodeVID) {"; + protected final String TEXT_33 = ".VISUAL_ID == nodeVID) {"; protected final String TEXT_34 = NL + "\t\tresult.add(nextValue);"; protected final String TEXT_35 = NL; protected final String TEXT_36 = "\t\tbreak;"; @@ -87,7 +87,7 @@ public class ChildContainerCanonicalEditPolicyGenerator { protected final String TEXT_68 = ") "; protected final String TEXT_69 = ";"; protected final String TEXT_70 = NL + "\t\tif ("; - protected final String TEXT_71 = " == "; + protected final String TEXT_71 = ".VISUAL_ID == "; protected final String TEXT_72 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; protected final String TEXT_73 = NL + "\t\t\tphantomNodes.add(nextDestination);"; protected final String TEXT_74 = NL; @@ -340,11 +340,11 @@ for (Iterator entries = entrySet.iterator(); entries.hasNext();) { GenNode nextNode = (GenNode) genNodesIterator.next(); if (generateSwitch) { stringBuffer.append(TEXT_30); - stringBuffer.append(nextNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_31); } else { stringBuffer.append(TEXT_32); - stringBuffer.append(nextNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_33); } stringBuffer.append(TEXT_34); @@ -464,7 +464,7 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu } if (phantomsOnly) { stringBuffer.append(TEXT_70); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_71); stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_72); diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java index 33adf9808..485a5f9ca 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java @@ -47,9 +47,9 @@ public class DiagramCanonicalEditPolicyGenerator { protected final String TEXT_28 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);"; protected final String TEXT_29 = NL + "\tswitch (nodeVID) {"; protected final String TEXT_30 = NL + "\tcase "; - protected final String TEXT_31 = ": {"; + protected final String TEXT_31 = ".VISUAL_ID: {"; protected final String TEXT_32 = NL + "\tif ("; - protected final String TEXT_33 = " == nodeVID) {"; + protected final String TEXT_33 = ".VISUAL_ID == nodeVID) {"; protected final String TEXT_34 = NL + "\t\tresult.add(nextValue);"; protected final String TEXT_35 = NL; protected final String TEXT_36 = "\t\tbreak;"; @@ -82,7 +82,7 @@ public class DiagramCanonicalEditPolicyGenerator { protected final String TEXT_63 = ") it.next();" + NL + "\tif (nextResourceObject == diagramModelObject) {" + NL + "\t\tcontinue;" + NL + "\t}" + NL + "\tint nodeVID = "; protected final String TEXT_64 = ".INSTANCE.getNodeVisualID(diagram, nextResourceObject);" + NL + "\tswitch (nodeVID) {"; protected final String TEXT_65 = NL + "\tcase "; - protected final String TEXT_66 = ": {" + NL + "\t\t\tphantomNodes.add(nextResourceObject);"; + protected final String TEXT_66 = ".VISUAL_ID: {" + NL + "\t\t\tphantomNodes.add(nextResourceObject);"; protected final String TEXT_67 = NL; protected final String TEXT_68 = "\t\tbreak;" + NL + "\t}"; protected final String TEXT_69 = "\t}" + NL + "}"; @@ -140,7 +140,7 @@ public class DiagramCanonicalEditPolicyGenerator { protected final String TEXT_121 = " modelElement = view.getElement();" + NL + "\t\tint diagramElementVisualID = "; protected final String TEXT_122 = ".getVisualID(view);" + NL + "\t\tswitch (diagramElementVisualID) {"; protected final String TEXT_123 = NL + "\t\tcase "; - protected final String TEXT_124 = ":"; + protected final String TEXT_124 = ".VISUAL_ID:"; protected final String TEXT_125 = " { myEObject2ViewMap.put(modelElement, view);" + NL + "\t\t\tstoreLinks(modelElement, getDiagram());" + NL + "\t\t}" + NL + "\t\tdefault: {" + NL + "\t\t}" + NL + "\t\tfor ("; protected final String TEXT_126 = " children = view.getChildren().iterator(); children.hasNext();) {" + NL + "\t\t\t"; protected final String TEXT_127 = " childView = ("; @@ -199,7 +199,7 @@ public class DiagramCanonicalEditPolicyGenerator { protected final String TEXT_180 = " src = container;"; protected final String TEXT_181 = NL + "\t\t\tint linkVID = "; protected final String TEXT_182 = ".INSTANCE.getLinkWithClassVisualID(nextValue);" + NL + "\t\t\tif ("; - protected final String TEXT_183 = " == linkVID) {" + NL + "\t\t\t\tmyLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID));" + NL + "\t\t\t}"; + protected final String TEXT_183 = ".VISUAL_ID == linkVID) {" + NL + "\t\t\t\tmyLinkDescriptors.add(new LinkDescriptor(src, dst, nextValue, linkVID));" + NL + "\t\t\t}"; protected final String TEXT_184 = NL + "\t\t\t}"; protected final String TEXT_185 = NL + "\t\t}"; protected final String TEXT_186 = NL + "\t\t}"; @@ -221,74 +221,75 @@ public class DiagramCanonicalEditPolicyGenerator { protected final String TEXT_202 = ") "; protected final String TEXT_203 = ";"; protected final String TEXT_204 = NL + "\t\tif ("; - protected final String TEXT_205 = " == "; + protected final String TEXT_205 = ".VISUAL_ID == "; protected final String TEXT_206 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; protected final String TEXT_207 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; protected final String TEXT_208 = "."; protected final String TEXT_209 = ", "; - protected final String TEXT_210 = "));"; + protected final String TEXT_210 = ".VISUAL_ID));"; protected final String TEXT_211 = NL + "\t\t"; protected final String TEXT_212 = " nextNode = ViewService.createNode(diagram, nextDestination, "; - protected final String TEXT_213 = ".VISUAL_ID, "; - protected final String TEXT_214 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextDestination, nextNode);" + NL + "\t\tcreate"; - protected final String TEXT_215 = "Children(nextNode, nextDestination);"; - protected final String TEXT_216 = NL; - protected final String TEXT_217 = NL + "\t\t}"; + protected final String TEXT_213 = ".getType("; + protected final String TEXT_214 = ".VISUAL_ID), "; + protected final String TEXT_215 = ".DIAGRAM_PREFERENCES_HINT);" + NL + "\t\tmyEObject2NodeMap.put(nextDestination, nextNode);" + NL + "\t\tcreate"; + protected final String TEXT_216 = "Children(nextNode, nextDestination);"; + protected final String TEXT_217 = NL; protected final String TEXT_218 = NL + "\t\t}"; - protected final String TEXT_219 = NL + "\t}"; - protected final String TEXT_220 = NL; - protected final String TEXT_221 = "\tif ("; - protected final String TEXT_222 = ".eINSTANCE.get"; - protected final String TEXT_223 = "().isSuperTypeOf(containerMetaclass)) {"; - protected final String TEXT_224 = NL + "\t\tfor ("; - protected final String TEXT_225 = " destinations = "; - protected final String TEXT_226 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; - protected final String TEXT_227 = " nextDestination = ("; - protected final String TEXT_228 = ") destinations.next();"; - protected final String TEXT_229 = NL + "\t\t"; - protected final String TEXT_230 = " nextDestination = ("; - protected final String TEXT_231 = ") "; - protected final String TEXT_232 = ";"; - protected final String TEXT_233 = NL + "\t\tif ("; - protected final String TEXT_234 = " == "; - protected final String TEXT_235 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; - protected final String TEXT_236 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; - protected final String TEXT_237 = "."; - protected final String TEXT_238 = ", "; - protected final String TEXT_239 = "));"; - protected final String TEXT_240 = NL; - protected final String TEXT_241 = NL + "\t\t}"; + protected final String TEXT_219 = NL + "\t\t}"; + protected final String TEXT_220 = NL + "\t}"; + protected final String TEXT_221 = NL; + protected final String TEXT_222 = "\tif ("; + protected final String TEXT_223 = ".eINSTANCE.get"; + protected final String TEXT_224 = "().isSuperTypeOf(containerMetaclass)) {"; + protected final String TEXT_225 = NL + "\t\tfor ("; + protected final String TEXT_226 = " destinations = "; + protected final String TEXT_227 = ".iterator(); destinations.hasNext();) {" + NL + "\t\t\t"; + protected final String TEXT_228 = " nextDestination = ("; + protected final String TEXT_229 = ") destinations.next();"; + protected final String TEXT_230 = NL + "\t\t"; + protected final String TEXT_231 = " nextDestination = ("; + protected final String TEXT_232 = ") "; + protected final String TEXT_233 = ";"; + protected final String TEXT_234 = NL + "\t\tif ("; + protected final String TEXT_235 = ".VISUAL_ID == "; + protected final String TEXT_236 = ".INSTANCE.getNodeVisualID(diagram, nextDestination)) {"; + protected final String TEXT_237 = NL + "\t\tmyLinkDescriptors.add(new LinkDescriptor(container, nextDestination, "; + protected final String TEXT_238 = "."; + protected final String TEXT_239 = ", "; + protected final String TEXT_240 = ".VISUAL_ID));"; + protected final String TEXT_241 = NL; protected final String TEXT_242 = NL + "\t\t}"; - protected final String TEXT_243 = NL + "\t}"; - protected final String TEXT_244 = NL + "}" + NL + "\t"; - protected final String TEXT_245 = NL; - protected final String TEXT_246 = "/**" + NL + " * @generated" + NL + " */" + NL + "private "; - protected final String TEXT_247 = " getDiagram() {" + NL + "\treturn (("; - protected final String TEXT_248 = ") getHost().getModel()).getDiagram();" + NL + "}" + NL; - protected final String TEXT_249 = NL; - protected final String TEXT_250 = "/**" + NL + " * @generated" + NL + " */" + NL + "private class LinkDescriptor {" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_251 = " mySource;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_252 = " myDestination;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_253 = " myLinkElement;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate int myVisualID;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; - protected final String TEXT_254 = " mySemanticAdapter;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; - protected final String TEXT_255 = " source, "; - protected final String TEXT_256 = " destination, "; - protected final String TEXT_257 = " linkElement, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = linkElement;" + NL + "\t\tmySemanticAdapter = new "; - protected final String TEXT_258 = "(linkElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; - protected final String TEXT_259 = " source, "; - protected final String TEXT_260 = " destination, "; - protected final String TEXT_261 = " elementType, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = null;" + NL + "\t\tfinal "; - protected final String TEXT_262 = " elementTypeCopy = elementType;" + NL + "\t\tmySemanticAdapter = new "; - protected final String TEXT_263 = "() {" + NL + "\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\tif ("; - protected final String TEXT_264 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\treturn elementTypeCopy;" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate LinkDescriptor("; - protected final String TEXT_265 = " source, "; - protected final String TEXT_266 = " destination, int linkVID) {" + NL + "\t\tmySource = source;" + NL + "\t\tmyDestination = destination;" + NL + "\t\tmyVisualID = linkVID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_267 = " getSource() {" + NL + "\t\treturn mySource;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_268 = " getDestination() {" + NL + "\t\treturn myDestination;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_269 = " getLinkElement() {" + NL + "\t\treturn myLinkElement;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected int getVisualID() {" + NL + "\t\treturn myVisualID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; - protected final String TEXT_270 = " getSemanticAdapter() {" + NL + "\t\treturn mySemanticAdapter;" + NL + "\t}" + NL + "}"; - protected final String TEXT_271 = NL + NL + "}"; - protected final String TEXT_272 = NL; + protected final String TEXT_243 = NL + "\t\t}"; + protected final String TEXT_244 = NL + "\t}"; + protected final String TEXT_245 = NL + "}" + NL + "\t"; + protected final String TEXT_246 = NL; + protected final String TEXT_247 = "/**" + NL + " * @generated" + NL + " */" + NL + "private "; + protected final String TEXT_248 = " getDiagram() {" + NL + "\treturn (("; + protected final String TEXT_249 = ") getHost().getModel()).getDiagram();" + NL + "}" + NL; + protected final String TEXT_250 = NL; + protected final String TEXT_251 = "/**" + NL + " * @generated" + NL + " */" + NL + "private class LinkDescriptor {" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_252 = " mySource;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_253 = " myDestination;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_254 = " myLinkElement;" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate int myVisualID;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate "; + protected final String TEXT_255 = " mySemanticAdapter;" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; + protected final String TEXT_256 = " source, "; + protected final String TEXT_257 = " destination, "; + protected final String TEXT_258 = " linkElement, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = linkElement;" + NL + "\t\tmySemanticAdapter = new "; + protected final String TEXT_259 = "(linkElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected LinkDescriptor("; + protected final String TEXT_260 = " source, "; + protected final String TEXT_261 = " destination, "; + protected final String TEXT_262 = " elementType, int linkVID) {" + NL + "\t\tthis(source, destination, linkVID);" + NL + "\t\tmyLinkElement = null;" + NL + "\t\tfinal "; + protected final String TEXT_263 = " elementTypeCopy = elementType;" + NL + "\t\tmySemanticAdapter = new "; + protected final String TEXT_264 = "() {" + NL + "\t\t\tpublic Object getAdapter(Class adapter) {" + NL + "\t\t\t\tif ("; + protected final String TEXT_265 = ".class.equals(adapter)) {" + NL + "\t\t\t\t\treturn elementTypeCopy;" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprivate LinkDescriptor("; + protected final String TEXT_266 = " source, "; + protected final String TEXT_267 = " destination, int linkVID) {" + NL + "\t\tmySource = source;" + NL + "\t\tmyDestination = destination;" + NL + "\t\tmyVisualID = linkVID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_268 = " getSource() {" + NL + "\t\treturn mySource;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_269 = " getDestination() {" + NL + "\t\treturn myDestination;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_270 = " getLinkElement() {" + NL + "\t\treturn myLinkElement;" + NL + "\t}" + NL + "\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected int getVisualID() {" + NL + "\t\treturn myVisualID;" + NL + "\t}" + NL + "\t\t" + NL + "\t/**" + NL + " \t * @generated" + NL + " */" + NL + "\tprotected "; + protected final String TEXT_271 = " getSemanticAdapter() {" + NL + "\t\treturn mySemanticAdapter;" + NL + "\t}" + NL + "}"; + protected final String TEXT_272 = NL + NL + "}"; + protected final String TEXT_273 = NL; protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) { StringBuffer result = new StringBuffer(); @@ -492,11 +493,11 @@ for (Iterator entries = entrySet.iterator(); entries.hasNext();) { GenNode nextNode = (GenNode) genNodesIterator.next(); if (generateSwitch) { stringBuffer.append(TEXT_30); - stringBuffer.append(nextNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_31); } else { stringBuffer.append(TEXT_32); - stringBuffer.append(nextNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_33); } stringBuffer.append(TEXT_34); @@ -581,7 +582,7 @@ for (Iterator phantoms = genClass2Phantom.values().iterator(); phantoms.hasNext( GenTopLevelNode phantomNode = (GenTopLevelNode) phantoms.next(); stringBuffer.append(TEXT_65); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_66); stringBuffer.append(TEXT_67); stringBuffer.append(TEXT_68); @@ -699,7 +700,7 @@ for (Iterator containers = genDiagram.getAllContainers().iterator(); containers. } stringBuffer.append(TEXT_123); - stringBuffer.append(nextContainer.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextContainer.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_124); } @@ -826,7 +827,7 @@ for (Iterator it = genLinks.iterator(); it.hasNext();) { stringBuffer.append(TEXT_181); stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_182); - stringBuffer.append(nextLink.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_183); if (typeLinkModelFacet.getSourceMetaFeature() != null) { stringBuffer.append(TEXT_184); @@ -893,7 +894,7 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu } if (phantomsOnly) { stringBuffer.append(TEXT_204); - stringBuffer.append(phantomNode.getVisualID()); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_205); stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_206); @@ -903,34 +904,36 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu stringBuffer.append(TEXT_208); stringBuffer.append(nextLink.getUniqueIdentifier()); stringBuffer.append(TEXT_209); - stringBuffer.append(nextLink.getVisualID()); + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_210); if (createPhantoms) { stringBuffer.append(TEXT_211); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node")); stringBuffer.append(TEXT_212); - stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_213); - stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_214); - stringBuffer.append(phantomNode.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())); stringBuffer.append(TEXT_215); - } + stringBuffer.append(phantomNode.getUniqueIdentifier()); stringBuffer.append(TEXT_216); - if (phantomsOnly) { - stringBuffer.append(TEXT_217); } - if (genFeature.isListType()) { + stringBuffer.append(TEXT_217); + if (phantomsOnly) { stringBuffer.append(TEXT_218); } + if (genFeature.isListType()) { stringBuffer.append(TEXT_219); + } + stringBuffer.append(TEXT_220); } for (int linkIndex = 0; linkIndex < genLinks.size(); linkIndex++) { boolean phantomsOnly = false; - stringBuffer.append(TEXT_220); + stringBuffer.append(TEXT_221); GenLink nextLink = (GenLink) genLinks.get(linkIndex); if (false == nextLink.getModelFacet() instanceof FeatureModelFacet) { @@ -944,94 +947,92 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu continue; } - stringBuffer.append(TEXT_221); - stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); stringBuffer.append(TEXT_222); - stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); + stringBuffer.append(importManager.getImportedName(genFeature.getGenPackage().getQualifiedPackageInterfaceName())); stringBuffer.append(TEXT_223); - if (genFeature.isListType()) { + stringBuffer.append(genFeature.getGenClass().getClassifierAccessorName()); stringBuffer.append(TEXT_224); - stringBuffer.append(importManager.getImportedName("java.util.Iterator")); + if (genFeature.isListType()) { stringBuffer.append(TEXT_225); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(importManager.getImportedName("java.util.Iterator")); stringBuffer.append(TEXT_226); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); stringBuffer.append(TEXT_227); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_228); - } else { - stringBuffer.append(TEXT_229); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_229); + } else { stringBuffer.append(TEXT_230); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_231); - stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_232); + stringBuffer.append(getFeatureValueGetter("container", genFeature, true, importManager)); + stringBuffer.append(TEXT_233); } if (phantomsOnly) { - stringBuffer.append(TEXT_233); - stringBuffer.append(phantomNode.getVisualID()); stringBuffer.append(TEXT_234); - stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(phantomNode.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_235); - } + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_236); - stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); + } stringBuffer.append(TEXT_237); - stringBuffer.append(nextLink.getUniqueIdentifier()); + stringBuffer.append(importManager.getImportedName(genDiagram.getElementTypesQualifiedClassName())); stringBuffer.append(TEXT_238); - stringBuffer.append(nextLink.getVisualID()); + stringBuffer.append(nextLink.getUniqueIdentifier()); stringBuffer.append(TEXT_239); + stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_240); - if (phantomsOnly) { stringBuffer.append(TEXT_241); - } - if (genFeature.isListType()) { + if (phantomsOnly) { stringBuffer.append(TEXT_242); } + if (genFeature.isListType()) { stringBuffer.append(TEXT_243); - } + } stringBuffer.append(TEXT_244); + } stringBuffer.append(TEXT_245); stringBuffer.append(TEXT_246); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); stringBuffer.append(TEXT_247); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram")); stringBuffer.append(TEXT_248); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")); stringBuffer.append(TEXT_249); + stringBuffer.append(TEXT_250); // an inner class - stringBuffer.append(TEXT_250); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_251); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_252); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_253); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); - stringBuffer.append(TEXT_254); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_254); + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); stringBuffer.append(TEXT_255); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_256); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_257); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); - stringBuffer.append(TEXT_258); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(TEXT_258); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter")); stringBuffer.append(TEXT_259); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_260); - stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_261); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_262); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); - stringBuffer.append(TEXT_263); stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); + stringBuffer.append(TEXT_263); + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); stringBuffer.append(TEXT_264); - stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); + stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.IElementType")); stringBuffer.append(TEXT_265); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_266); @@ -1041,12 +1042,14 @@ if (phantomsOnly ? (!genFeature.isContains() || phantomNode == null) : (genFeatu stringBuffer.append(TEXT_268); stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_269); - stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); + stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject")); stringBuffer.append(TEXT_270); - } + stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IAdaptable")); stringBuffer.append(TEXT_271); - importManager.emitSortedImports(); + } stringBuffer.append(TEXT_272); + importManager.emitSortedImports(); + stringBuffer.append(TEXT_273); return stringBuffer.toString(); } }
\ No newline at end of file diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/MetricProviderGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/MetricProviderGenerator.java index 97ca9bf06..0d192d5bd 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/MetricProviderGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/MetricProviderGenerator.java @@ -509,7 +509,7 @@ String __javaOperationContainer; } } /*end of scope*/ stringBuffer.append(TEXT_111); - stringBuffer.append(nextMetric.getTarget() instanceof GenDiagramElementTarget ? ((GenDiagramElementTarget)nextMetric.getTarget()).getElement().getVisualID() : -1); + stringBuffer.append(nextMetric.getTarget() instanceof GenDiagramElementTarget ? importManager.getImportedName(((GenDiagramElementTarget) nextMetric.getTarget()).getElement().getEditPartQualifiedClassName()) + ".VISUAL_ID" : "-1"); stringBuffer.append(TEXT_112); if(nextMetric.getLowLimit()!=null){ stringBuffer.append(TEXT_113); diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ParserProviderGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ParserProviderGenerator.java index 9789e3735..8a2a77211 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ParserProviderGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ParserProviderGenerator.java @@ -62,11 +62,12 @@ public class ParserProviderGenerator protected final String TEXT_43 = NL + "\t\t\treturn get"; protected final String TEXT_44 = "();"; protected final String TEXT_45 = NL + "\t\t\tif ("; - protected final String TEXT_46 = ".VISUAL_ID.equals(viewType)) {" + NL + "\t\t\t\treturn get"; - protected final String TEXT_47 = "();" + NL + "\t\t\t}"; - protected final String TEXT_48 = NL + "\t\t}"; - protected final String TEXT_49 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IParser getParser(IAdaptable hint) {" + NL + "\t\tString viewType = (String) hint.getAdapter(String.class);" + NL + "\t\tIElementType type = (IElementType) hint.getAdapter(IElementType.class);" + NL + "\t\tif (type == null) {" + NL + "\t\t\tEObject element = (EObject) hint.getAdapter(EObject.class);" + NL + "\t\t\ttype = ElementTypeRegistry.getInstance().getElementType(element);" + NL + "\t\t}" + NL + "\t\treturn getParser(type, viewType);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic boolean provides(IOperation operation) {" + NL + "\t\tif (operation instanceof GetParserOperation) {" + NL + "\t\t\treturn getParser(((GetParserOperation) operation).getHint()) != null;" + NL + "\t\t}" + NL + "\t\treturn false;" + NL + "\t}" + NL + "}"; - protected final String TEXT_50 = NL; + protected final String TEXT_46 = ".getType("; + protected final String TEXT_47 = ".VISUAL_ID).equals(viewType)) {" + NL + "\t\t\t\treturn get"; + protected final String TEXT_48 = "();" + NL + "\t\t\t}"; + protected final String TEXT_49 = NL + "\t\t}"; + protected final String TEXT_50 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IParser getParser(IAdaptable hint) {" + NL + "\t\tString viewType = (String) hint.getAdapter(String.class);" + NL + "\t\tIElementType type = (IElementType) hint.getAdapter(IElementType.class);" + NL + "\t\tif (type == null) {" + NL + "\t\t\tEObject element = (EObject) hint.getAdapter(EObject.class);" + NL + "\t\t\ttype = ElementTypeRegistry.getInstance().getElementType(element);" + NL + "\t\t}" + NL + "\t\treturn getParser(type, viewType);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic boolean provides(IOperation operation) {" + NL + "\t\tif (operation instanceof GetParserOperation) {" + NL + "\t\t\treturn getParser(((GetParserOperation) operation).getHint()) != null;" + NL + "\t\t}" + NL + "\t\treturn false;" + NL + "\t}" + NL + "}"; + protected final String TEXT_51 = NL; public String generate(Object argument) { @@ -240,19 +241,21 @@ for (Iterator it1 = labels.keySet().iterator(); it1.hasNext(); ) { GenLabel genLabel = (GenLabel) it2.next(); stringBuffer.append(TEXT_45); - stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); + stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())); stringBuffer.append(TEXT_46); - stringBuffer.append(labelMethodNames.get(genLabel)); + stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName())); stringBuffer.append(TEXT_47); + stringBuffer.append(labelMethodNames.get(genLabel)); + stringBuffer.append(TEXT_48); } } - stringBuffer.append(TEXT_48); - } stringBuffer.append(TEXT_49); - importManager.emitSortedImports(); + } stringBuffer.append(TEXT_50); + importManager.emitSortedImports(); + stringBuffer.append(TEXT_51); return stringBuffer.toString(); } } diff --git a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ViewFactoryGenerator.java b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ViewFactoryGenerator.java index 6d4da6c72..4bd3b71bf 100644 --- a/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ViewFactoryGenerator.java +++ b/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/providers/ViewFactoryGenerator.java @@ -32,55 +32,59 @@ public class ViewFactoryGenerator protected final String TEXT_14 = NL + "\tprotected void decorateView(View view, IAdaptable semanticAdapter, String diagramKind){" + NL + "\t\tsuper.decorateView(view, semanticAdapter, diagramKind);"; protected final String TEXT_15 = NL + "\tprotected void decorateView(View containerView, View view, IAdaptable semanticAdapter," + NL + "\t\t\tString semanticHint, int index, boolean persisted) {" + NL + "\t\tif (semanticHint == null) { "; protected final String TEXT_16 = NL + "\t\t\tsemanticHint = "; - protected final String TEXT_17 = ".VISUAL_ID;" + NL + "\t\t\tview.setType(semanticHint);" + NL + "\t\t}"; - protected final String TEXT_18 = NL + "\t\tsuper.decorateView(containerView, view, semanticAdapter, semanticHint, index, persisted);" + NL + "\t\tif (!"; - protected final String TEXT_19 = ".MODEL_ID.equals("; - protected final String TEXT_20 = ".getModelID(containerView))) {" + NL + "\t\t\t"; - protected final String TEXT_21 = " shortcutAnnotation = "; - protected final String TEXT_22 = ".eINSTANCE.createEAnnotation();" + NL + "\t\t\tshortcutAnnotation.setSource(\"Shortcut\"); //$NON-NLS-1$" + NL + "\t\t\tshortcutAnnotation.getDetails().put(\"modelID\", "; - protected final String TEXT_23 = ".MODEL_ID);" + NL + "\t\t}"; - protected final String TEXT_24 = NL + "\t\t"; - protected final String TEXT_25 = ".setStructuralFeatureValue(view, "; - protected final String TEXT_26 = ".eINSTANCE.getLineStyle_LineColor()," + NL + "\t\t\t"; - protected final String TEXT_27 = ".colorToInteger("; - protected final String TEXT_28 = "."; - protected final String TEXT_29 = "));"; - protected final String TEXT_30 = NL + "\t\t"; - protected final String TEXT_31 = ".setStructuralFeatureValue(view, "; - protected final String TEXT_32 = ".eINSTANCE.getFillStyle_FillColor()," + NL + "\t\t\t"; - protected final String TEXT_33 = ".colorToInteger("; - protected final String TEXT_34 = "."; - protected final String TEXT_35 = "));"; - protected final String TEXT_36 = NL + "\t\tgetViewService().createNode(semanticAdapter, view, "; - protected final String TEXT_37 = ".VISUAL_ID," + NL + "\t\t\t"; - protected final String TEXT_38 = ".APPEND, true, getPreferencesHint());"; - protected final String TEXT_39 = NL + "\t\tgetViewService().createNode(semanticAdapter, view, "; - protected final String TEXT_40 = ".VISUAL_ID," + NL + "\t\t\t"; - protected final String TEXT_41 = ".APPEND, true, getPreferencesHint());"; - protected final String TEXT_42 = NL + "\t\tgetViewService().createNode(semanticAd |