Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2010-04-21 18:23:41 -0400
committeratikhomirov2010-04-21 18:23:41 -0400
commit1c90aa2fadb35115712a817c1de610db87fe9156 (patch)
tree9a3d131d68086709eef0d8f61fce635af8b643da /plugins/org.eclipse.gmf.graphdef.codegen/templates/attr
parent2c169c4cd7997528968371714b1f2aa69a2792a9 (diff)
downloadorg.eclipse.gmf-tooling-1c90aa2fadb35115712a817c1de610db87fe9156.tar.gz
org.eclipse.gmf-tooling-1c90aa2fadb35115712a817c1de610db87fe9156.tar.xz
org.eclipse.gmf-tooling-1c90aa2fadb35115712a817c1de610db87fe9156.zip
[262383] reverting lineWidth workaround as long as 263290 got default lineWidth == 1 backv20100421-2359
Diffstat (limited to 'plugins/org.eclipse.gmf.graphdef.codegen/templates/attr')
-rw-r--r--plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt7
1 files changed, 4 insertions, 3 deletions
diff --git a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
index 457a5f01a..5ee1af9a7 100644
--- a/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
+++ b/plugins/org.eclipse.gmf.graphdef.codegen/templates/attr/Shape.xpt
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2006 Borland Software Corporation
+ * Copyright (c) 2006, 2010 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
@@ -10,18 +10,19 @@
* Artem Tikhomirov (Borland) - initial API and implementation
*/
«IMPORT 'http://www.eclipse.org/gmf/2006/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
«REM»
org.eclipse.draw2d.Shape
private boolean fill = true, outline = true, xorFill, xorOutline;
+ lineAttributes.width = 1.0
+ lineAttributes.style = LINE_SOLID
«ENDREM»
«DEFINE shapeAttrs(figureVarName : String) FOR gmfgraph::Shape-»
«EXPAND fill(figureVarName)-»
«IF xorFill»«EXPAND xorFill(figureVarName)»«ENDIF-»
«IF not outline»«EXPAND outline(figureVarName)»«ENDIF-»
«IF xorOutline»«EXPAND xorOutline(figureVarName)»«ENDIF-»
-«REM» UNCONDITIONALLY generate setLineWidth, see bug 262383 IF lineWidth <> 1 «ENDREM»«EXPAND lineWidth(figureVarName)»«REM» ENDIF «ENDREM-»
+«IF lineWidth <> 1»«EXPAND lineWidth(figureVarName)»«ENDIF-»
«IF lineKind <> gmfgraph::LineKind::LINE_SOLID»«EXPAND lineKind(figureVarName)»«ENDIF-»
«ENDDEFINE»

Back to the top