X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.data%2Fscl%2FData%2FXML.scl;h=7f836aaa43b5abcb2da0f7428d461432b1e05ee2;hp=b49f6a6c1771ca696541f20a3ebc00844d7d6092;hb=a5a1c8cd3203e8e5743073060b2f2ea430cef86c;hpb=a8758de5bc19e5adb3f618d3038743a164f09912

diff --git a/bundles/org.simantics.scl.data/scl/Data/XML.scl b/bundles/org.simantics.scl.data/scl/Data/XML.scl
index b49f6a6c1..7f836aaa4 100644
--- a/bundles/org.simantics.scl.data/scl/Data/XML.scl
+++ b/bundles/org.simantics.scl.data/scl/Data/XML.scl
@@ -1,122 +1,126 @@
-import "OSGi"
-
-importJava "org.jdom2.Document" where
-    data Document
-    
-    @JavaName "<init>"
-    createDocument :: Element -> <Proc> Document
-    
-    @JavaName getRootElement
-    rootElementOf :: Document -> <Proc> Element
-    
-    @JavaName setRootElement
-    setRootElement :: Document -> Element -> <Proc> ()
-    
-importJava "org.jdom2.Element" where
-    data Element
-    
-    @JavaName "<init>"
-    createElement :: String -> <Proc> Element
-    
-    @JavaName getName
-    nameOf :: Element -> <Proc> String
-    
-    @JavaName getText
-    textOf :: Element -> <Proc> String
-    
-    @JavaName getParentElement
-    parentOf :: Element -> <Proc> Maybe Element
-    
-    @JavaName getChildren
-    childrenWithNameOf :: Element -> String -> <Proc> [Element]
-    
-    @JavaName getChildren
-    childrenOf :: Element -> <Proc> [Element]
-    
-    @JavaName getChild
-    childWithNameOf :: Element -> String -> <Proc> Maybe Element
-    
-    @JavaName getAttributeValue
-    attributeOf :: Element -> String -> <Proc> Maybe String
-    
-    @JavaName getAttributes
-    attributesOf :: Element -> <Proc> [Attribute]
-    
-    @JavaName addContent
-    addChild :: Element -> Element -> <Proc> ()
-    
-    setName :: Element -> String -> <Proc> ()
-    
-    setText :: Element -> String -> <Proc> ()
-    
-    setAttribute :: Element -> String -> String -> <Proc> ()
-    
-importJava "org.jdom2.Attribute" where
-    data Attribute
-    
-    @JavaName getValue
-    valueOfAttribute :: Attribute -> <Proc> String
-    
-    @JavaName getName
-    nameOfAttribute :: Attribute -> <Proc> String
-
-Element ?parentElement ?childName ?childElement :-
-    @ffb 1.0
-    ?childName = nameOf ?childElement
-    Optional ?parentElement (parentOf ?childElement)
-        
-    @bbf 10.0
-    ?childElement <- childrenWithNameOf ?parentElement ?childName
-
-    @bff 10.0
-    ?childElement <- childrenOf ?parentElement
-    ?childName = nameOf ?childElement
-    
-    @enforce
-    Execute (addNamedChild ?parentElement ?childName ?childElement)
-    
-Attribute ?element ?attributeName ?attributeValue :-
-    @bbf 0.95
-    Optional ?attributeValue (attributeOf ?element ?attributeName)
-
-    @bff 4.0
-    ?attribute <- attributesOf ?element
-    ?attributeName = nameOfAttribute ?attribute
-    ?attributeValue = valueOfAttribute ?attribute
-
-    @enforce
-    Execute do
-        setAttribute ?element ?attributeName ?attributeValue
-
-TextContent ?element ?textContent :-
-    @bf 1
-    ?textContent = textOf ?element
-    
-    @enforce
-    Execute do
-        setText ?element ?textContent
-
-XPathElement ?parentElement ?xpathExpression ?childElement :-
-    @bbf 10
-    ?childElement <- elementsByXPath ?parentElement ?xpathExpression
-
-importJava "org.simantics.scl.data.xml.JDomHelper" where
-    parseString :: String -> <Proc> Document
-    parseFile :: String -> <Proc> Document
-    outputString :: Document -> <Proc> String
-    
-    elementsByXPath :: Element -> String -> <Proc> [Element]
-    addNamedChild :: Element -> String -> Element -> <Proc> ()
-    setNamespace :: Document -> String -> <Proc> ()
-    setElementNamespace :: Element -> String -> <Proc> ()
-    clearNamespace :: Document -> <Proc> ()
-    clearElementNamespace :: Element -> <Proc> ()
-    sortChildrenWith :: (Element -> Element -> <e> Integer) -> Element -> <Proc,e> () 
-    
-    parseStringWithSchemaFile :: String -> String -> <Proc> Document
-    //parseStringWithSchemaURL  :: URL    -> String -> <Proc> Document
-    parseFileWithSchemaFile   :: String -> String -> <Proc> Document
-    //parseFileWithSchemaURL    :: URL    -> String -> <Proc> Document
-
-sortChildrenBy :: Ord a => (Element -> <e> a) -> Element -> <Proc,e> ()
+import "OSGi"
+
+importJava "org.jdom2.Document" where
+    data Document
+    
+    @JavaName "<init>"
+    createDocument :: Element -> <Proc> Document
+    
+    @JavaName getRootElement
+    rootElementOf :: Document -> <Proc> Element
+    
+    @JavaName setRootElement
+    setRootElement :: Document -> Element -> <Proc> ()
+    
+importJava "org.jdom2.Element" where
+    data Element
+    
+    @JavaName "<init>"
+    createElement :: String -> <Proc> Element
+    
+    @JavaName getName
+    nameOf :: Element -> <Proc> String
+    
+    @JavaName getText
+    textOf :: Element -> <Proc> String
+    
+    @JavaName getParentElement
+    parentOf :: Element -> <Proc> Maybe Element
+    
+    @JavaName getChildren
+    childrenWithNameOf :: Element -> String -> <Proc> [Element]
+    
+    @JavaName getChildren
+    childrenOf :: Element -> <Proc> [Element]
+    
+    @JavaName getChild
+    childWithNameOf :: Element -> String -> <Proc> Maybe Element
+    
+    @JavaName getAttributeValue
+    attributeOf :: Element -> String -> <Proc> Maybe String
+    
+    @JavaName getAttributes
+    attributesOf :: Element -> <Proc> [Attribute]
+    
+    @JavaName addContent
+    addChild :: Element -> Element -> <Proc> ()
+    
+    setName :: Element -> String -> <Proc> ()
+    
+    setText :: Element -> String -> <Proc> ()
+    
+    setAttribute :: Element -> String -> String -> <Proc> ()
+    
+importJava "org.jdom2.Attribute" where
+    data Attribute
+    
+    @JavaName getValue
+    valueOfAttribute :: Attribute -> <Proc> String
+    
+    @JavaName getName
+    nameOfAttribute :: Attribute -> <Proc> String
+
+Element ?parentElement ?childName ?childElement :-
+    @ffb 1.0
+    ?childName = nameOf ?childElement
+    Optional ?parentElement (parentOf ?childElement)
+        
+    @bbf 10.0
+    ?childElement <- childrenWithNameOf ?parentElement ?childName
+
+    @bff 10.0
+    ?childElement <- childrenOf ?parentElement
+    ?childName = nameOf ?childElement
+    
+    @enforce
+    Execute (addNamedChild ?parentElement ?childName ?childElement)
+    
+Attribute ?element ?attributeName ?attributeValue :-
+    @bbf 0.95
+    Optional ?attributeValue (attributeOf ?element ?attributeName)
+
+    @bff 4.0
+    ?attribute <- attributesOf ?element
+    ?attributeName = nameOfAttribute ?attribute
+    ?attributeValue = valueOfAttribute ?attribute
+
+    @enforce
+    Execute do
+        setAttribute ?element ?attributeName ?attributeValue
+
+TextContent ?element ?textContent :-
+    @bf 1
+    ?textContent = textOf ?element
+    
+    @enforce
+    Execute do
+        setText ?element ?textContent
+
+XPathElement ?parentElement ?xpathExpression ?childElement :-
+    @bbf 10
+    ?childElement <- elementsByXPath ?parentElement ?xpathExpression
+
+importJava "org.simantics.scl.data.xml.JDomHelper" where
+    parseString :: String -> <Proc> Document
+    parseFile :: String -> <Proc> Document
+    outputString :: Document -> <Proc> String
+    
+    elementsByXPath :: Element -> String -> <Proc> [Element]
+    addNamedChild :: Element -> String -> Element -> <Proc> ()
+    setNamespace :: Document -> String -> <Proc> ()
+    setElementNamespace :: Element -> String -> <Proc> ()
+    clearNamespace :: Document -> <Proc> ()
+    clearElementNamespace :: Element -> <Proc> ()
+    sortChildrenWith :: (Element -> Element -> <e> Integer) -> Element -> <Proc,e> () 
+    
+    parseStringWithSchemaFile :: String -> String -> <Proc> Document
+    //parseStringWithSchemaURL  :: URL    -> String -> <Proc> Document
+    parseFileWithSchemaFile   :: String -> String -> <Proc> Document
+    //parseFileWithSchemaURL    :: URL    -> String -> <Proc> Document
+
+    addCDATA :: Element -> String -> <Proc> ()
+    getCDATAs :: Element -> <Proc> [String]
+
+
+sortChildrenBy :: Ord a => (Element -> <e> a) -> Element -> <Proc,e> ()
 sortChildrenBy f el = sortChildrenWith (\x y -> compare (f x) (f y)) el 
\ No newline at end of file