update 24 to fix issue #423

brunobuzzi · Jul 24, 2021 · 588e74a · 588e74a
1 parent c1b2422
commit 588e74a
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 16 deletions.
diff --git a/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/for.orbeonVersion..st b/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/for.orbeonVersion..st
diff --git a/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/newOn.for..st b/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/newOn.for..st
@@ -0,0 +1,6 @@
+instance creation
+newOn: anOrbeonSystemRoot for: xmlOrbeonFormDefinition
+
+	^self new 
+		setRoot: anOrbeonSystemRoot
+		xmlDefinition: xmlOrbeonFormDefinition
diff --git a/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/newOn.for.with..st b/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/class/newOn.for.with..st
@@ -0,0 +1,5 @@
+instance creation
+newOn: anOrbeonSystemRoot for: xmlOrbeonFormDefinition with: xmlOrbeonInstance
+
+	^self new 
+		setRoot: anOrbeonSystemRoot xmlDefinition: xmlOrbeonFormDefinition xmlInstanceDocument: xmlOrbeonInstance
diff --git a/.../OrbeonFormBuilder.class/instance/getFormLibraryDefinition_from2019_1_0_format_For.in..st b/.../OrbeonFormBuilder.class/instance/getFormLibraryDefinition_from2019_1_0_format_For.in..st
@@ -1,7 +1,7 @@
 data format version
 getFormLibraryDefinition_from2019_1_0_format_For: anOrbeonPublishedFormDefinition in: appName
 
-	^self getOrbeonApplicationClass 
+	^systemRoot 
 				formDefinitionNamed: 'library' 
 				version: anOrbeonPublishedFormDefinition libraryVersion "issue #393"
 				in: appName 

diff --git a/...age/OrbeonFormBuilder.class/instance/getFormLibraryDefinition_from4_0_0_format_For.in..st b/...age/OrbeonFormBuilder.class/instance/getFormLibraryDefinition_from4_0_0_format_For.in..st
@@ -1,4 +1,4 @@
 data format version
 getFormLibraryDefinition_from4_0_0_format_For: anOrbeonPublishedFormDefinition in: appName
 
-	^self getOrbeonApplicationClass formDefinitionNamed: 'library' in: appName
+	^systemRoot formDefinitionNamed: 'library' in: appName
diff --git a/...ry/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/instance/setRoot.xmlDefinition..st b/...ry/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/instance/setRoot.xmlDefinition..st
@@ -0,0 +1,7 @@
+private
+setRoot: anOrbeonSystemRoot xmlDefinition: xmlOrbeonFormDefinition
+
+	systemRoot := anOrbeonSystemRoot.
+	xmlDefinition := xmlOrbeonFormDefinition.
+
+	self parseXMLDefinition
diff --git a/...er.package/OrbeonFormBuilder.class/instance/setRoot.xmlDefinition.xmlInstanceDocument..st b/...er.package/OrbeonFormBuilder.class/instance/setRoot.xmlDefinition.xmlInstanceDocument..st
@@ -0,0 +1,10 @@
+private
+setRoot: anOrbeonSystemRoot xmlDefinition: xmlOrbeonFormDefinition xmlInstanceDocument: xmlOrbeonInstance
+
+	systemRoot := anOrbeonSystemRoot.
+
+	xmlDefinition := xmlOrbeonFormDefinition.
+
+	self parseXMLDefinition.
+
+	self parseXMLInstance: xmlOrbeonInstance
diff --git a/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/methodProperties.json b/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/methodProperties.json
@@ -1,8 +1,9 @@
 {
 	"class" : {
 		"for:" : "brunobb 04/07/2021 14:06",
-		"for:orbeonVersion:" : "brunobb 03/31/2021 10:09",
-		"for:with:" : "brunobb 04/07/2021 14:06" },
+		"for:with:" : "brunobb 04/07/2021 14:06",
+		"newOn:for:" : "brunobb 07/24/2021 12:54",
+		"newOn:for:with:" : "brunobb 07/24/2021 12:55" },
 	"instance" : {
 		"addAnyOnePermissionTo:fromString:" : "brunobb 03/31/2021 10:09",
 		"addPermissionTo:fromString:using:" : "brunobb 03/31/2021 10:44",
@@ -44,8 +45,8 @@
 		"getDescription" : "brunobb 04/15/2021 14:45",
 		"getFieldTypes" : "brunobb 04/15/2021 14:43",
 		"getFormLibraryDefinitionFor:in:" : "brunobb 03/31/2021 10:53",
-		"getFormLibraryDefinition_from2019_1_0_format_For:in:" : "brunobb 03/31/2021 10:35",
-		"getFormLibraryDefinition_from4_0_0_format_For:in:" : "brunobb 03/31/2021 10:36",
+		"getFormLibraryDefinition_from2019_1_0_format_For:in:" : "brunobb 07/24/2021 13:05",
+		"getFormLibraryDefinition_from4_0_0_format_For:in:" : "brunobb 07/24/2021 13:05",
 		"getFormName" : "brunobb 04/15/2021 14:45",
 		"getNameFrom:" : "brunobb 03/31/2021 10:11",
 		"getPermissions" : "brunobb 04/15/2021 14:42",
@@ -72,6 +73,8 @@
 		"searchFormFieldsIn:" : "brunobb 03/31/2021 10:46",
 		"searchFormFieldsNameIn:" : "brunobb 03/31/2021 10:12",
 		"setAvailableNodeValueWith:" : "brunobb 03/31/2021 10:12",
+		"setRoot:xmlDefinition:" : "brunobb 07/24/2021 12:54",
+		"setRoot:xmlDefinition:xmlInstanceDocument:" : "brunobb 07/24/2021 12:55",
 		"setXmlDefinition:" : "brunobb 04/07/2021 14:03",
 		"setXmlDefinition:setXmlInstanceDocument:" : "brunobb 04/07/2021 14:08",
 		"setXmlInstanceDocument:" : "brunobb 03/31/2021 10:12",

diff --git a/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/properties.json b/repository/OrbeonFormXmlReader.package/OrbeonFormBuilder.class/properties.json
@@ -10,7 +10,8 @@
 		"xmlDocument",
 		"xmlInstanceDocument",
 		"orbeonFormDefinition",
-		"orbeonFormInstance" ],
+		"orbeonFormInstance",
+		"systemRoot" ],
 	"name" : "OrbeonFormBuilder",
 	"pools" : [
 		 ],

diff --git a/repository/OrbeonFormXmlReader.package/monticello.meta/version b/repository/OrbeonFormXmlReader.package/monticello.meta/version