Attachment 41104 Details for Bug 141280 – Fixes the subj

[patch] Fixes the subj

141280.patch (text/plain), 15.04 KB, created by Boris Blajer

on 2006-05-11 08:38:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Blajer

Created: 2006-05-11 08:38:47 EDT

Size: 15.04 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.codegen.lite
>Index: templates/parts/directEditPolicy.javajetinc
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/directEditPolicy.javajetinc,v
>retrieving revision 1.1
>diff -u -r1.1 directEditPolicy.javajetinc
>--- templates/parts/directEditPolicy.javajetinc	13 Apr 2006 21:20:15 -0000	1.1
>+++ templates/parts/directEditPolicy.javajetinc	11 May 2006 12:12:58 -0000
>@@ -20,7 +20,7 @@
> 							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
> 						}
> <%
>-if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {
>+if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
> 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
> 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
> %>
>Index: templates/parts/labelFigure.jetinc
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/labelFigure.jetinc,v
>retrieving revision 1.1
>diff -u -r1.1 labelFigure.jetinc
>--- templates/parts/labelFigure.jetinc	13 Apr 2006 21:20:15 -0000	1.1
>+++ templates/parts/labelFigure.jetinc	11 May 2006 12:12:58 -0000
>@@ -14,7 +14,6 @@
> 	protected <%=importManager.getImportedName("org.eclipse.draw2d.Label")%> createLabel() {
> <%
> String figureQualifiedClassName = null;
>-Viewmap viewmap = genLabel.getViewmap();
> if (viewmap instanceof FigureViewmap) {
> 	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
> 	if (figureQualifiedClassName == null || figureQualifiedClassName.trim().length() == 0) {
>@@ -52,8 +51,8 @@
> 	}
> 
> <%
>-if (genLabel.getViewmap() instanceof InnerClassViewmap) {
>-	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();
>+if (viewmap instanceof InnerClassViewmap) {
>+	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
> %>
> <%=classBody%>
> <%@ include file="mapmodeWorkaround.javajetinc"%>
>Index: templates/parts/ChildNodeEditPart.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/ChildNodeEditPart.javajet,v
>retrieving revision 1.2
>diff -u -r1.2 ChildNodeEditPart.javajet
>--- templates/parts/ChildNodeEditPart.javajet	26 Apr 2006 11:58:48 -0000	1.2
>+++ templates/parts/ChildNodeEditPart.javajet	11 May 2006 12:12:58 -0000
>@@ -1,14 +1,13 @@
> <%@ jet package="org.eclipse.gmf.codegen.templates.lite.parts" class="ChildNodeEditPartGenerator"
> 	imports="java.util.* org.eclipse.gmf.codegen.gmfgen.* org.eclipse.gmf.common.codegen.* org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.ecore.*"%>
> <%
>-GenNode genChildNode = (GenNode) ((Object[]) argument)[0];
>-GenNodeLabel genLabel = (GenNodeLabel) genChildNode.getLabels().get(0);
>+GenChildLabelNode genChildNode = (GenChildLabelNode) ((Object[]) argument)[0];
> GenNode genHost = genChildNode;
> GenNode genNode = genChildNode;	/*var used by componentEditPolicy.javajetinc*/
> GenClass underlyingMetaClass = genHost.getDomainMetaClass();
> GenDiagram genDiagram = genChildNode.getDiagram();
> final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
>-LabelModelFacet labelModelFacet = genLabel.getModelFacet();
>+LabelModelFacet labelModelFacet = genChildNode.getLabelModelFacet();
> %>
> <%@ include file="../copyright4java.jetinc"%>
> 
>@@ -57,7 +56,14 @@
> 	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
> 	final String primaryView = "getDiagramNode()";
> %>
>+<%
>+{
>+boolean isReadOnly = genChildNode.isLabelReadOnly();
>+%>
> <%@ include file="directEditPolicy.javajetinc"%>
>+<%
>+}
>+%>
> <%@ include file="componentEditPolicy.javajetinc"%>
> 	}
> 
>@@ -190,6 +196,9 @@
> <%@ include file="refreshers.javajetinc/fontColor.javajetinc"%>
> 	}
> 
>+<%
>+final Viewmap viewmap = genChildNode.getViewmap();
>+%>
> <%@ include file="labelFigure.jetinc"%>
> }
> <%importManager.emitSortedImports();%>
>Index: templates/parts/LinkLabelEditPart.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/LinkLabelEditPart.javajet,v
>retrieving revision 1.2
>diff -u -r1.2 LinkLabelEditPart.javajet
>--- templates/parts/LinkLabelEditPart.javajet	26 Apr 2006 11:58:48 -0000	1.2
>+++ templates/parts/LinkLabelEditPart.javajet	11 May 2006 12:12:58 -0000
>@@ -70,6 +70,7 @@
> 		});
> <%
> if (labelModelFacet instanceof FeatureLabelModelFacet == true || labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
>+	boolean isReadOnly = genLabel.isReadOnly();
> %>
> <%@ include file="directEditPolicy.javajetinc"%>
> <%
>@@ -241,6 +242,9 @@
> 		}
> 	};
> 
>+<%
>+final Viewmap viewmap = genLabel.getViewmap();
>+%>
> <%@ include file="labelFigure.jetinc"%>
> }
> <%importManager.emitSortedImports();%>
>Index: templates/parts/NodeLabelEditPart.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/NodeLabelEditPart.javajet,v
>retrieving revision 1.2
>diff -u -r1.2 NodeLabelEditPart.javajet
>--- templates/parts/NodeLabelEditPart.javajet	26 Apr 2006 11:58:48 -0000	1.2
>+++ templates/parts/NodeLabelEditPart.javajet	11 May 2006 12:12:58 -0000
>@@ -42,6 +42,7 @@
> <%
> 	final String primaryView = "getUpdatableParent().getDiagramNode()";
> 	final String resolvedSemanticElement = "resolveSemanticElement()";
>+	final boolean isReadOnly = genLabel.isReadOnly();
> %>
> <%@ include file="directEditPolicy.javajetinc"%>
> 	}
>@@ -196,6 +197,9 @@
> 			refreshFont();
> 		}
> 	};
>+<%
>+final Viewmap viewmap = genLabel.getViewmap();
>+%>
> <%@ include file="labelFigure.jetinc"%>
> }
> <%importManager.emitSortedImports();%>
>Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java,v
>retrieving revision 1.2
>diff -u -r1.2 LinkLabelEditPartGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java	26 Apr 2006 11:58:49 -0000	1.2
>+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java	11 May 2006 12:12:57 -0000
>@@ -291,6 +291,7 @@
>     stringBuffer.append(TEXT_16);
>     
> if (labelModelFacet instanceof FeatureLabelModelFacet == true || labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
>+	boolean isReadOnly = genLabel.isReadOnly();
> 
>     stringBuffer.append(TEXT_17);
>     stringBuffer.append(TEXT_18);
>@@ -315,7 +316,7 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
>     stringBuffer.append(TEXT_28);
>     
>-if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {
>+if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
> 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
> 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
> 
>@@ -754,6 +755,9 @@
> }
> 
>     stringBuffer.append(TEXT_185);
>+    
>+final Viewmap viewmap = genLabel.getViewmap();
>+
>     stringBuffer.append(TEXT_186);
>     stringBuffer.append(TEXT_187);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
>@@ -764,7 +768,6 @@
>     stringBuffer.append(TEXT_190);
>     
> String figureQualifiedClassName = null;
>-Viewmap viewmap = genLabel.getViewmap();
> if (viewmap instanceof FigureViewmap) {
> 	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
> 	if (figureQualifiedClassName == null || figureQualifiedClassName.trim().length() == 0) {
>@@ -795,8 +798,8 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
>     stringBuffer.append(TEXT_200);
>     
>-if (genLabel.getViewmap() instanceof InnerClassViewmap) {
>-	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();
>+if (viewmap instanceof InnerClassViewmap) {
>+	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
> 
>     stringBuffer.append(TEXT_201);
>     stringBuffer.append(classBody);
>Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java,v
>retrieving revision 1.2
>diff -u -r1.2 ChildNodeEditPartGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java	26 Apr 2006 11:58:49 -0000	1.2
>+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java	11 May 2006 12:12:57 -0000
>@@ -270,14 +270,13 @@
>   {
>     final StringBuffer stringBuffer = new StringBuffer();
>     
>-GenNode genChildNode = (GenNode) ((Object[]) argument)[0];
>-GenNodeLabel genLabel = (GenNodeLabel) genChildNode.getLabels().get(0);
>+GenChildLabelNode genChildNode = (GenChildLabelNode) ((Object[]) argument)[0];
> GenNode genHost = genChildNode;
> GenNode genNode = genChildNode;	/*var used by componentEditPolicy.javajetinc*/
> GenClass underlyingMetaClass = genHost.getDomainMetaClass();
> GenDiagram genDiagram = genChildNode.getDiagram();
> final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
>-LabelModelFacet labelModelFacet = genLabel.getModelFacet();
>+LabelModelFacet labelModelFacet = genChildNode.getLabelModelFacet();
> 
>     stringBuffer.append(TEXT_1);
>     
>@@ -326,6 +325,10 @@
> 	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
> 	final String primaryView = "getDiagramNode()";
> 
>+    
>+{
>+boolean isReadOnly = genChildNode.isLabelReadOnly();
>+
>     stringBuffer.append(TEXT_18);
>     stringBuffer.append(TEXT_19);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
>@@ -349,7 +352,7 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
>     stringBuffer.append(TEXT_29);
>     
>-if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {
>+if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
> 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
> 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
> 
>@@ -500,6 +503,9 @@
> }
> 
>     stringBuffer.append(TEXT_89);
>+    
>+}
>+
>     stringBuffer.append(TEXT_90);
>     stringBuffer.append(TEXT_91);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
>@@ -868,6 +874,9 @@
>     stringBuffer.append(TEXT_226);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
>     stringBuffer.append(TEXT_227);
>+    
>+final Viewmap viewmap = genChildNode.getViewmap();
>+
>     stringBuffer.append(TEXT_228);
>     stringBuffer.append(TEXT_229);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
>@@ -878,7 +887,6 @@
>     stringBuffer.append(TEXT_232);
>     
> String figureQualifiedClassName = null;
>-Viewmap viewmap = genLabel.getViewmap();
> if (viewmap instanceof FigureViewmap) {
> 	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
> 	if (figureQualifiedClassName == null || figureQualifiedClassName.trim().length() == 0) {
>@@ -909,8 +917,8 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
>     stringBuffer.append(TEXT_242);
>     
>-if (genLabel.getViewmap() instanceof InnerClassViewmap) {
>-	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();
>+if (viewmap instanceof InnerClassViewmap) {
>+	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
> 
>     stringBuffer.append(TEXT_243);
>     stringBuffer.append(classBody);
>Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java,v
>retrieving revision 1.2
>diff -u -r1.2 NodeLabelEditPartGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java	26 Apr 2006 11:58:49 -0000	1.2
>+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java	11 May 2006 12:12:58 -0000
>@@ -266,6 +266,7 @@
>     
> 	final String primaryView = "getUpdatableParent().getDiagramNode()";
> 	final String resolvedSemanticElement = "resolveSemanticElement()";
>+	final boolean isReadOnly = genLabel.isReadOnly();
> 
>     stringBuffer.append(TEXT_15);
>     stringBuffer.append(TEXT_16);
>@@ -290,7 +291,7 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
>     stringBuffer.append(TEXT_26);
>     
>-if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {
>+if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
> 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
> 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
> 
>@@ -712,6 +713,9 @@
> }
> 
>     stringBuffer.append(TEXT_178);
>+    
>+final Viewmap viewmap = genLabel.getViewmap();
>+
>     stringBuffer.append(TEXT_179);
>     stringBuffer.append(TEXT_180);
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
>@@ -722,7 +726,6 @@
>     stringBuffer.append(TEXT_183);
>     
> String figureQualifiedClassName = null;
>-Viewmap viewmap = genLabel.getViewmap();
> if (viewmap instanceof FigureViewmap) {
> 	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
> 	if (figureQualifiedClassName == null || figureQualifiedClassName.trim().length() == 0) {
>@@ -753,8 +756,8 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
>     stringBuffer.append(TEXT_193);
>     
>-if (genLabel.getViewmap() instanceof InnerClassViewmap) {
>-	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();
>+if (viewmap instanceof InnerClassViewmap) {
>+	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
> 
>     stringBuffer.append(TEXT_194);
>     stringBuffer.append(classBody);

Actions: View | Diff

Attachments on bug 141280: 41104