Merge pull request #45 from mahugnon/44-graphic-component-bug

44-graphic-component-bug
moosetechnology · Oct 30, 2019 · e232459 · e232459
2 parents 5b6de1e + f49f601
commit e232459
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/PowerBuilder-Parser-Core/PWBDataWindowGrammar.class.st b/PowerBuilder-Parser-Core/PWBDataWindowGrammar.class.st
@@ -94,7 +94,7 @@ PWBDataWindowGrammar >> graphicComponent [
 PWBDataWindowGrammar >> graphicComponentToken [
 	^ self
 		parserFor:
-			#('detail' 'footer' 'header' 'summary' 'rectangle' 'text' 'column' 'compute' 'htmltable' 'line' 'ellipse' 'groupbox' 'group' 'sparse' 'bitmap' 'report' 'button')
+			#('detail' 'footer' 'header' 'summary' 'rectangle' 'text' 'column' 'compute' 'htmltable' 'line' 'ellipse' 'groupbox' 'group' 'sparse' 'bitmap' 'report' 'button' 'roundrectangle')
 ]
 
 { #category : #'as yet unclassified' }

diff --git a/PowerBuilder-Parser-Tests/PWBDataWindowGrammarTest.class.st b/PowerBuilder-Parser-Tests/PWBDataWindowGrammarTest.class.st
@@ -182,6 +182,14 @@ PWBDataWindowGrammarTest >> testReport [
 	self parse: 'report(band=detail dataobject="bdwl_iri_510" x="1" y="20" height="137" width="3530" border="0" height.autosize=yes criteria="" nest_arguments=(("ad_seq_num"),("devise")) trail_footer = yes name=dw_det_1 slideup=directlyabove )' rule: #graphicComponent
 ]
 
+{ #category : #accessing }
+PWBDataWindowGrammarTest >> testRoundrectangleGraphicComponent [
+	self
+		parse:
+			'roundrectangle(band=detail ellipseheight="36" ellipsewidth="41"x="329" y="4" height="208" width="2633"  name=rr_1 visible="1" brush.hatch="6" brush.color="16777215" pen.style="0" pen.width="5" pen.color="20718592"  background.mode="2" background.color="15793151" background.transparency="0" background.gradient.color="8421504" background.gradient.transparency="0" background.gradient.angle="0" background.brushmode="0" background.gradient.repetition.mode="0" background.gradient.repetition.count="0" background.gradient.repetition.length="100" background.gradient.focus="0" background.gradient.scale="100" background.gradient.spread="100" tooltip.backcolor="134217752" tooltip.delay.initial="0" tooltip.delay.visible="32000" tooltip.enabled="0" tooltip.hasclosebutton="0" tooltip.icon="0" tooltip.isbubble="0" tooltip.maxwidth="0" tooltip.textcolor="134217751" tooltip.transparency="0" )'
+		rule: #graphicComponent
+]
+
 { #category : #accessing }
 PWBDataWindowGrammarTest >> testSparse [
 	self