Attachment #41104 for bug #141280

View | Details | Raw Unified | Return to bug 141280
Collapse All | Expand All

Lines 20-26 Link Here

(-)templates/parts/directEditPolicy.javajetinc (-1 / +1 lines)
20	return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;	20	return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
21	}	21	}
22	<%	22	<%
23	if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {	23	if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
24	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();	24	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
25	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();	25	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
26	%>	26	%>

Lines 14-20 Link Here

(-)templates/parts/labelFigure.jetinc (-3 / +2 lines)
14	protected <%=importManager.getImportedName("org.eclipse.draw2d.Label")%> createLabel() {	14	protected <%=importManager.getImportedName("org.eclipse.draw2d.Label")%> createLabel() {
15	<%	15	<%
16	String figureQualifiedClassName = null;	16	String figureQualifiedClassName = null;
17	Viewmap viewmap = genLabel.getViewmap();
18	if (viewmap instanceof FigureViewmap) {	17	if (viewmap instanceof FigureViewmap) {
19	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();	18	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
20	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {	19	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {
Lines 52-59 Link Here
52	}	51	}
53		52
54	<%	53	<%
55	if (genLabel.getViewmap() instanceof InnerClassViewmap) {	54	if (viewmap instanceof InnerClassViewmap) {
56	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();	55	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
57	%>	56	%>
58	<%=classBody%>	57	<%=classBody%>
59	<%@ include file="mapmodeWorkaround.javajetinc"%>	58	<%@ include file="mapmodeWorkaround.javajetinc"%>

Lines 70-75 Link Here

(-)templates/parts/LinkLabelEditPart.javajet (+4 lines)
70	});	70	});
71	<%	71	<%
72	if (labelModelFacet instanceof FeatureLabelModelFacet == true \|\| labelModelFacet instanceof CompositeFeatureLabelModelFacet) {	72	if (labelModelFacet instanceof FeatureLabelModelFacet == true \|\| labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
		73	boolean isReadOnly = genLabel.isReadOnly();
73	%>	74	%>
74	<%@ include file="directEditPolicy.javajetinc"%>	75	<%@ include file="directEditPolicy.javajetinc"%>
75	<%	76	<%
Lines 241-246 Link Here
241	}	242	}
242	};	243	};
243		244
		245	<%
		246	final Viewmap viewmap = genLabel.getViewmap();
		247	%>
244	<%@ include file="labelFigure.jetinc"%>	248	<%@ include file="labelFigure.jetinc"%>
245	}	249	}
246	<%importManager.emitSortedImports();%>	250	<%importManager.emitSortedImports();%>

Lines 42-47 Link Here

(-)templates/parts/NodeLabelEditPart.javajet (+4 lines)
42	<%	42	<%
43	final String primaryView = "getUpdatableParent().getDiagramNode()";	43	final String primaryView = "getUpdatableParent().getDiagramNode()";
44	final String resolvedSemanticElement = "resolveSemanticElement()";	44	final String resolvedSemanticElement = "resolveSemanticElement()";
		45	final boolean isReadOnly = genLabel.isReadOnly();
45	%>	46	%>
46	<%@ include file="directEditPolicy.javajetinc"%>	47	<%@ include file="directEditPolicy.javajetinc"%>
47	}	48	}
Lines 196-201 Link Here
196	refreshFont();	197	refreshFont();
197	}	198	}
198	};	199	};
		200	<%
		201	final Viewmap viewmap = genLabel.getViewmap();
		202	%>
199	<%@ include file="labelFigure.jetinc"%>	203	<%@ include file="labelFigure.jetinc"%>
200	}	204	}
201	<%importManager.emitSortedImports();%>	205	<%importManager.emitSortedImports();%>

Lines 291-296 Link Here

(-)src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java (-4 / +7 lines)
291	stringBuffer.append(TEXT_16);	291	stringBuffer.append(TEXT_16);
292		292
293	if (labelModelFacet instanceof FeatureLabelModelFacet == true \|\| labelModelFacet instanceof CompositeFeatureLabelModelFacet) {	293	if (labelModelFacet instanceof FeatureLabelModelFacet == true \|\| labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
		294	boolean isReadOnly = genLabel.isReadOnly();
294		295
295	stringBuffer.append(TEXT_17);	296	stringBuffer.append(TEXT_17);
296	stringBuffer.append(TEXT_18);	297	stringBuffer.append(TEXT_18);
Lines 315-321 Link Here
315	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));	316	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
316	stringBuffer.append(TEXT_28);	317	stringBuffer.append(TEXT_28);
317		318
318	if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {	319	if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
319	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();	320	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
320	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();	321	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
321		322
Lines 754-759 Link Here
754	}	755	}
755		756
756	stringBuffer.append(TEXT_185);	757	stringBuffer.append(TEXT_185);
		758
		759	final Viewmap viewmap = genLabel.getViewmap();
		760
757	stringBuffer.append(TEXT_186);	761	stringBuffer.append(TEXT_186);
758	stringBuffer.append(TEXT_187);	762	stringBuffer.append(TEXT_187);
759	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));	763	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
Lines 764-770 Link Here
764	stringBuffer.append(TEXT_190);	768	stringBuffer.append(TEXT_190);
765		769
766	String figureQualifiedClassName = null;	770	String figureQualifiedClassName = null;
767	Viewmap viewmap = genLabel.getViewmap();
768	if (viewmap instanceof FigureViewmap) {	771	if (viewmap instanceof FigureViewmap) {
769	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();	772	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
770	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {	773	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {
Lines 795-802 Link Here
795	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));	798	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
796	stringBuffer.append(TEXT_200);	799	stringBuffer.append(TEXT_200);
797		800
798	if (genLabel.getViewmap() instanceof InnerClassViewmap) {	801	if (viewmap instanceof InnerClassViewmap) {
799	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();	802	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
800		803
801	stringBuffer.append(TEXT_201);	804	stringBuffer.append(TEXT_201);
802	stringBuffer.append(classBody);	805	stringBuffer.append(classBody);




  {
    final StringBuffer stringBuffer = new StringBuffer();
    
GenChildLabelNode genChildNode = (GenChildLabelNode) ((Object[]) argument)[0];
GenNodeLabel genLabel = (GenNodeLabel) genChildNode.getLabels().get(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 = genChildNode.getLabelModelFacet();

    stringBuffer.append(TEXT_1);
    

	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"));

    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
    stringBuffer.append(TEXT_29);
    
if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();


}

    stringBuffer.append(TEXT_89);
    
}

    stringBuffer.append(TEXT_90);
    stringBuffer.append(TEXT_91);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));

    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"));

    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) {

    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
    stringBuffer.append(TEXT_242);
    
if (viewmap instanceof InnerClassViewmap) {
	String classBody = ((InnerClassViewmap) viewmap).getClassBody();

    stringBuffer.append(TEXT_243);
    stringBuffer.append(classBody);

Return to bug 141280

Lines 270-283 Link Here

(-)src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java (-7 / +15 lines)
270	{	270	{
271	final StringBuffer stringBuffer = new StringBuffer();	271	final StringBuffer stringBuffer = new StringBuffer();
272		272
273	GenNode genChildNode = (GenNode) ((Object[]) argument)[0];	273	GenChildLabelNode genChildNode = (GenChildLabelNode) ((Object[]) argument)[0];
274	GenNodeLabel genLabel = (GenNodeLabel) genChildNode.getLabels().get(0);
275	GenNode genHost = genChildNode;	274	GenNode genHost = genChildNode;
276	GenNode genNode = genChildNode; /var used by componentEditPolicy.javajetinc/	275	GenNode genNode = genChildNode; /var used by componentEditPolicy.javajetinc/
277	GenClass underlyingMetaClass = genHost.getDomainMetaClass();	276	GenClass underlyingMetaClass = genHost.getDomainMetaClass();
278	GenDiagram genDiagram = genChildNode.getDiagram();	277	GenDiagram genDiagram = genChildNode.getDiagram();
279	final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];	278	final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
280	LabelModelFacet labelModelFacet = genLabel.getModelFacet();	279	LabelModelFacet labelModelFacet = genChildNode.getLabelModelFacet();
281		280
282	stringBuffer.append(TEXT_1);	281	stringBuffer.append(TEXT_1);
283		282
Lines 326-331 Link Here
326	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";	325	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
327	final String primaryView = "getDiagramNode()";	326	final String primaryView = "getDiagramNode()";
328		327
		328
		329	{
		330	boolean isReadOnly = genChildNode.isLabelReadOnly();
		331
329	stringBuffer.append(TEXT_18);	332	stringBuffer.append(TEXT_18);
330	stringBuffer.append(TEXT_19);	333	stringBuffer.append(TEXT_19);
331	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));	334	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
Lines 349-355 Link Here
349	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));	352	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
350	stringBuffer.append(TEXT_29);	353	stringBuffer.append(TEXT_29);
351		354
352	if (labelModelFacet instanceof FeatureLabelModelFacet && !genLabel.isReadOnly()) {	355	if (labelModelFacet instanceof FeatureLabelModelFacet && !isReadOnly) {
353	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();	356	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
354	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();	357	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
355		358
Lines 500-505 Link Here
500	}	503	}
501		504
502	stringBuffer.append(TEXT_89);	505	stringBuffer.append(TEXT_89);
		506
		507	}
		508
503	stringBuffer.append(TEXT_90);	509	stringBuffer.append(TEXT_90);
504	stringBuffer.append(TEXT_91);	510	stringBuffer.append(TEXT_91);
505	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));	511	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
Lines 868-873 Link Here
868	stringBuffer.append(TEXT_226);	874	stringBuffer.append(TEXT_226);
869	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));	875	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
870	stringBuffer.append(TEXT_227);	876	stringBuffer.append(TEXT_227);
		877
		878	final Viewmap viewmap = genChildNode.getViewmap();
		879
871	stringBuffer.append(TEXT_228);	880	stringBuffer.append(TEXT_228);
872	stringBuffer.append(TEXT_229);	881	stringBuffer.append(TEXT_229);
873	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));	882	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
Lines 878-884 Link Here
878	stringBuffer.append(TEXT_232);	887	stringBuffer.append(TEXT_232);
879		888
880	String figureQualifiedClassName = null;	889	String figureQualifiedClassName = null;
881	Viewmap viewmap = genLabel.getViewmap();
882	if (viewmap instanceof FigureViewmap) {	890	if (viewmap instanceof FigureViewmap) {
883	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();	891	figureQualifiedClassName = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
884	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {	892	if (figureQualifiedClassName == null \|\| figureQualifiedClassName.trim().length() == 0) {
Lines 909-916 Link Here
909	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));	917	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
910	stringBuffer.append(TEXT_242);	918	stringBuffer.append(TEXT_242);
911		919
912	if (genLabel.getViewmap() instanceof InnerClassViewmap) {	920	if (viewmap instanceof InnerClassViewmap) {
913	String classBody = ((InnerClassViewmap) genLabel.getViewmap()).getClassBody();	921	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
914		922
915	stringBuffer.append(TEXT_243);	923	stringBuffer.append(TEXT_243);
916	stringBuffer.append(classBody);	924	stringBuffer.append(classBody);

Lines 1-14 Link Here

(-)templates/parts/ChildNodeEditPart.javajet (-3 / +12 lines)
1	<%@ jet package="org.eclipse.gmf.codegen.templates.lite.parts" class="ChildNodeEditPartGenerator"	1	<%@ jet package="org.eclipse.gmf.codegen.templates.lite.parts" class="ChildNodeEditPartGenerator"
2	imports="java.util.* org.eclipse.gmf.codegen.gmfgen.* org.eclipse.gmf.common.codegen.* org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.ecore.*"%>	2	imports="java.util.* org.eclipse.gmf.codegen.gmfgen.* org.eclipse.gmf.common.codegen.* org.eclipse.emf.codegen.ecore.genmodel.* org.eclipse.emf.ecore.*"%>
3	<%	3	<%
4	GenNode genChildNode = (GenNode) ((Object[]) argument)[0];	4	GenChildLabelNode genChildNode = (GenChildLabelNode) ((Object[]) argument)[0];
5	GenNodeLabel genLabel = (GenNodeLabel) genChildNode.getLabels().get(0);
6	GenNode genHost = genChildNode;	5	GenNode genHost = genChildNode;
7	GenNode genNode = genChildNode; /var used by componentEditPolicy.javajetinc/	6	GenNode genNode = genChildNode; /var used by componentEditPolicy.javajetinc/
8	GenClass underlyingMetaClass = genHost.getDomainMetaClass();	7	GenClass underlyingMetaClass = genHost.getDomainMetaClass();
9	GenDiagram genDiagram = genChildNode.getDiagram();	8	GenDiagram genDiagram = genChildNode.getDiagram();
10	final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];	9	final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
11	LabelModelFacet labelModelFacet = genLabel.getModelFacet();	10	LabelModelFacet labelModelFacet = genChildNode.getLabelModelFacet();
12	%>	11	%>
13	<%@ include file="../copyright4java.jetinc"%>	12	<%@ include file="../copyright4java.jetinc"%>
14		13
Lines 57-63 Link Here
57	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";	56	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
58	final String primaryView = "getDiagramNode()";	57	final String primaryView = "getDiagramNode()";
59	%>	58	%>
		59	<%
		60	{
		61	boolean isReadOnly = genChildNode.isLabelReadOnly();
		62	%>
60	<%@ include file="directEditPolicy.javajetinc"%>	63	<%@ include file="directEditPolicy.javajetinc"%>
		64	<%
		65	}
		66	%>
61	<%@ include file="componentEditPolicy.javajetinc"%>	67	<%@ include file="componentEditPolicy.javajetinc"%>
62	}	68	}
63		69
Lines 190-195 Link Here
190	<%@ include file="refreshers.javajetinc/fontColor.javajetinc"%>	196	<%@ include file="refreshers.javajetinc/fontColor.javajetinc"%>
191	}	197	}
192		198
		199	<%
		200	final Viewmap viewmap = genChildNode.getViewmap();
		201	%>
193	<%@ include file="labelFigure.jetinc"%>	202	<%@ include file="labelFigure.jetinc"%>
194	}	203	}
195	<%importManager.emitSortedImports();%>	204	<%importManager.emitSortedImports();%>