The element tree was not displaying the actually used type. Made it get the data for type from the right location. BLD200308110100
authorcliffwd@netbeans.org
Wed, 06 Aug 2003 21:36:34 +0000
changeset 1327ee059a2999af
parent 1326 d68a2112e8c9
child 1328 723f1c782485
The element tree was not displaying the actually used type. Made it get the data for type from the right location.
schema2beans/test/unit/src/data/goldenfiles/TestMain/testAttr.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testBook.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testBookXMLSchema.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testEvents.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testExceptions.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testFind.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testMdd.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testValid.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testVeto.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass
schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass
     1.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testAttr.pass	Wed Aug 06 21:15:06 2003 +0000
     1.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testAttr.pass	Wed Aug 06 21:36:34 2003 +0000
     1.3 @@ -19,7 +19,7 @@
     1.4  		ref : Ref[1,n]
     1.5  			page : String
     1.6  			line : String
     1.7 -	available : Boolean
     1.8 +	available : boolean
     1.9  		EMPTY : String
    1.10  
    1.11  Compiling
     2.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBook.pass	Wed Aug 06 21:15:06 2003 +0000
     2.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBook.pass	Wed Aug 06 21:36:34 2003 +0000
     2.3 @@ -12,9 +12,9 @@
     2.4  		paragraph : String[0,n]
     2.5  		comment2 : String[0,1]
     2.6  	summary : String[0,1]
     2.7 -	good : Boolean
     2.8 +	good : boolean
     2.9  		EMPTY : String
    2.10 -	available : Boolean
    2.11 +	available : boolean
    2.12  		EMPTY : String
    2.13  	extra : Extra
    2.14  		| size-cm : String
     3.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBookXMLSchema.pass	Wed Aug 06 21:15:06 2003 +0000
     3.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testBookXMLSchema.pass	Wed Aug 06 21:36:34 2003 +0000
     3.3 @@ -6,7 +6,7 @@
     3.4  		ref : Ref[1,n]
     3.5  			page : int
     3.6  			line : int
     3.7 -			rating : float
     3.8 +			rating : java.lang.Float
     3.9  			groupRating : float
    3.10  	chapter : Chapter[1,n]
    3.11  		comment : java.lang.String[0,1]
    3.12 @@ -20,8 +20,8 @@
    3.13  		| size-inches : java.lang.String 	[pattern (\d+x\d+)]
    3.14  		| size : java.lang.String 	[pattern (\d+x\d+)]
    3.15  		color : java.lang.String[0,1]
    3.16 -		| weight-lb : float
    3.17 -		| weight-kg : float
    3.18 +		| weight-lb : java.lang.Float
    3.19 +		| weight-kg : java.lang.Float
    3.20  
    3.21  Compiling
    3.22  Finished compiling: 0
     4.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass	Wed Aug 06 21:15:06 2003 +0000
     4.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEncoding.pass	Wed Aug 06 21:36:34 2003 +0000
     4.3 @@ -24,18 +24,18 @@
     4.4  		  	  | 	  ATTRIBUTE : Attribute...
     4.5  		  	  | 	  	[attr: NAME CDATA #REQUIRED ]
     4.6  		  	  | 	)[1,n]
     4.7 -		  	  | TRUE : Boolean
     4.8 +		  	  | TRUE : boolean
     4.9  		  	  | 	EMPTY : String
    4.10 -		  	  | FALSE : Boolean
    4.11 +		  	  | FALSE : boolean
    4.12  		  	  | 	EMPTY : String
    4.13 -		  	  | NIL : Boolean
    4.14 +		  	  | NIL : boolean
    4.15  		  	  | 	EMPTY : String
    4.16  		  	)[0,n]
    4.17  		  ANNOTATION : Annotation[0,n]
    4.18  		  	[attr: OBJECTTYPE CDATA #REQUIRED ]
    4.19  		  	[attr: NAME CDATA #REQUIRED ]
    4.20  		  	[attr: VIEW CDATA #IMPLIED ]
    4.21 -		  	PROPERTYSHEET : Boolean[0,1]
    4.22 +		  	PROPERTYSHEET : boolean[0,1]
    4.23  		  		[attr: CLASS CDATA #REQUIRED ]
    4.24  		  		[attr: TAB CDATA #REQUIRED ]
    4.25  		  		EMPTY : String
    4.26 @@ -57,11 +57,11 @@
    4.27  		  		  | 	  ATTRIBUTE : Attribute...
    4.28  		  		  | 	  	[attr: NAME CDATA #REQUIRED ]
    4.29  		  		  | 	)[1,n]
    4.30 -		  		  | TRUE : Boolean
    4.31 +		  		  | TRUE : boolean
    4.32  		  		  | 	EMPTY : String
    4.33 -		  		  | FALSE : Boolean
    4.34 +		  		  | FALSE : boolean
    4.35  		  		  | 	EMPTY : String
    4.36 -		  		  | NIL : Boolean
    4.37 +		  		  | NIL : boolean
    4.38  		  		  | 	EMPTY : String
    4.39  		  		)[0,n]
    4.40  		)[0,n]
     5.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEvents.pass	Wed Aug 06 21:15:06 2003 +0000
     5.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testEvents.pass	Wed Aug 06 21:36:34 2003 +0000
     5.3 @@ -11,9 +11,9 @@
     5.4  		paragraph : String[0,n]
     5.5  	summary : String[0,1]
     5.6  	author : String[1,n]
     5.7 -	good : Boolean
     5.8 +	good : boolean
     5.9  		EMPTY : String
    5.10 -	available : Boolean
    5.11 +	available : boolean
    5.12  		EMPTY : String
    5.13  
    5.14  Compiling
     6.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testExceptions.pass	Wed Aug 06 21:15:06 2003 +0000
     6.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testExceptions.pass	Wed Aug 06 21:36:34 2003 +0000
     6.3 @@ -2,7 +2,7 @@
     6.4  Bean Tree:
     6.5  EXCEPS : Exceps
     6.6  	BLUE : String[0,1]
     6.7 -	GREEN : Boolean[0,1]
     6.8 +	GREEN : boolean[0,1]
     6.9  		EMPTY : String
    6.10  
    6.11  Compiling
     7.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testFind.pass	Wed Aug 06 21:15:06 2003 +0000
     7.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testFind.pass	Wed Aug 06 21:36:34 2003 +0000
     7.3 @@ -19,7 +19,7 @@
     7.4  		[attr: length CDATA #REQUIRED ]
     7.5  		[attr: lang CDATA #IMPLIED ]
     7.6  		[attr: size CDATA #FIXED 12]
     7.7 -	available : Boolean
     7.8 +	available : boolean
     7.9  		EMPTY : String
    7.10  
    7.11  Compiling
     8.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMdd.pass	Wed Aug 06 21:15:06 2003 +0000
     8.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMdd.pass	Wed Aug 06 21:36:34 2003 +0000
     8.3 @@ -11,7 +11,7 @@
     8.4  		comment : String[0,1]
     8.5  		paragraph : String[0,n]
     8.6  	summary : String[0,1]
     8.7 -	available : Boolean
     8.8 +	available : boolean
     8.9  		EMPTY : String
    8.10  	price : float
    8.11  	date : book.MyDate
     9.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Wed Aug 06 21:15:06 2003 +0000
     9.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testMerge.pass	Wed Aug 06 21:36:34 2003 +0000
     9.3 @@ -21,7 +21,7 @@
     9.4  		[attr: length CDATA #REQUIRED ]
     9.5  		[attr: lang CDATA #IMPLIED ]
     9.6  		[attr: size CDATA #FIXED 12]
     9.7 -	instock : Boolean
     9.8 +	instock : boolean
     9.9  		EMPTY : String
    9.10  	content : Content
    9.11  		title : String
    10.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testValid.pass	Wed Aug 06 21:15:06 2003 +0000
    10.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testValid.pass	Wed Aug 06 21:36:34 2003 +0000
    10.3 @@ -16,7 +16,7 @@
    10.4  		| year : String
    10.5  		| date : String
    10.6  		copyright : String
    10.7 -	paperback : Boolean[0,1]
    10.8 +	paperback : boolean[0,1]
    10.9  		EMPTY : String
   10.10  	summary : String[0,1]
   10.11  	isbn : String[0,1]
    11.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testVeto.pass	Wed Aug 06 21:15:06 2003 +0000
    11.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testVeto.pass	Wed Aug 06 21:36:34 2003 +0000
    11.3 @@ -12,7 +12,7 @@
    11.4  	summary : String[0,1]
    11.5  	author : String[1,n]
    11.6  	reviews : String[0,1]
    11.7 -	available : Boolean
    11.8 +	available : boolean
    11.9  		EMPTY : String
   11.10  
   11.11  Compiling
    12.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass	Wed Aug 06 21:15:06 2003 +0000
    12.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegator.pass	Wed Aug 06 21:36:34 2003 +0000
    12.3 @@ -89,7 +89,7 @@
    12.4  	welcome-file-list : WelcomeFileListType[0,1]
    12.5  		welcome-file : java.lang.String[1,n] 	[whiteSpace (collapse)]
    12.6  	error-page : ErrorPageType[0,n]
    12.7 -		| error-code : long
    12.8 +		| error-code : java.lang.Long
    12.9  		| exception-type : java.lang.String
   12.10  		location : java.lang.String
   12.11  	jsp-config : JspConfigType[0,1]
    13.1 --- a/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass	Wed Aug 06 21:15:06 2003 +0000
    13.2 +++ b/schema2beans/test/unit/src/data/goldenfiles/TestMain/testWebAppDelegatorBaseBean.pass	Wed Aug 06 21:36:34 2003 +0000
    13.3 @@ -137,7 +137,7 @@
    13.4  	welcome-file-list : WelcomeFileListType[0,1]
    13.5  		welcome-file : java.lang.String[1,n] 	[whiteSpace (collapse)]
    13.6  	error-page : ErrorPageType[0,n]
    13.7 -		| error-code : long
    13.8 +		| error-code : java.lang.Long
    13.9  		| exception-type : java.lang.String
   13.10  		location : java.lang.String
   13.11  	jsp-config : JspConfigType[0,1]