From 27de74d3308850d59688ac9b6810202192996363 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Euzenat?= <Jerome.Euzenat@inria.fr>
Date: Wed, 17 Mar 2010 14:47:00 +0000
Subject: [PATCH] - small syntax twist due to Francois comments
---
examples/omwg/wine.xml | 6 ++--
.../exmo/align/parser/SyntaxElement.java | 30 ++++++++++---------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/examples/omwg/wine.xml b/examples/omwg/wine.xml
index 830970a4..26d2bd7e 100644
--- a/examples/omwg/wine.xml
+++ b/examples/omwg/wine.xml
@@ -78,8 +78,8 @@
<edoal:Class>
<edoal:and rdf:parseType="Collection">
<edoal:Class rdf:about="&vin;Vin"/>
- <edoal:PropertyValueRestriction>
- <edoal:onProperty>
+ <edoal:AttributeValueRestriction>
+ <edoal:onAttribute>
<edoal:Relation>
<edoal:compose rdf:parseType="Collection">
<edoal:Relation rdf:about="&vin;hasTerroir"/>
@@ -90,7 +90,7 @@
<edoal:comparator rdf:resource="&xsd;equals"/>
<!--edoal:value>loc:Aquitaine</edoal:value-->
<edoal:value><edoal:Instance rdf:about="&vin;Aquitaine"/></edoal:value>
- </edoal:PropertyValueRestriction>
+ </edoal:AttributeValueRestriction>
</edoal:and>
</edoal:Class>
</entity2>
diff --git a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
index b72ccb24..976ee2ce 100644
--- a/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
+++ b/src/fr/inrialpes/exmo/align/parser/SyntaxElement.java
@@ -83,14 +83,14 @@ public enum SyntaxElement {
TIME( Namespace.ALIGNMENT, "time"),
TYPE( Namespace.ALIGNMENT, "type"),
URI( Namespace.ALIGNMENT, "uri"),
- XML( Namespace.ALIGNMENT, "xml"),
+ XML( Namespace.ALIGNMENT, "xml"),
ONTOLOGY( Namespace.ALIGNMENT, "Ontology", true ),
LOCATION( Namespace.ALIGNMENT, "location"),
// EDOAL NAMESPACE
AND( Namespace.EDOAL, "and", Constructor.AND),
APPLY( Namespace.EDOAL, "Apply", true),
- ARGUMENTS( Namespace.EDOAL, "arguments"),
+ //ARGUMENTS( Namespace.EDOAL, "arguments"),
ATTR_TRANSF( Namespace.EDOAL, "transf"),
CLASS_EXPR( Namespace.EDOAL, "Class", true),//ALIGNMENT
CODOMAIN_RESTRICTION(Namespace.EDOAL, "CodomainRestriction", true),
@@ -98,33 +98,35 @@ public enum SyntaxElement {
COMPOSE( Namespace.EDOAL, "compose", Constructor.COMP),
DATATYPE( Namespace.EDOAL, "datatype"),
DOMAIN_RESTRICTION(Namespace.EDOAL, "DomainRestriction", true),
- FIRST( Namespace.EDOAL, "first"),
- ID( Namespace.EDOAL, "Id", true), // Useless
+ //FIRST( Namespace.EDOAL, "first"),
+ //ID( Namespace.EDOAL, "Id", true), // Useless
INSTANCE_EXPR( Namespace.EDOAL, "Instance", true),
INVERSE( Namespace.EDOAL, "inverse", Constructor.INVERSE),
- NEXT( Namespace.EDOAL, "next"),
+ //NEXT( Namespace.EDOAL, "next"),
NOT( Namespace.EDOAL, "not", Constructor.NOT),
- ONPROPERTY( Namespace.EDOAL, "onProperty"),
+ ONPROPERTY( Namespace.EDOAL, "onAttribute"),
OR( Namespace.EDOAL, "or", Constructor.OR),
- PARAMETERS( Namespace.EDOAL, "parameters"),
- PATH( Namespace.EDOAL, "Path", true),
- PROPERTIES( Namespace.EDOAL, "properties"),
+ //PARAMETERS( Namespace.EDOAL, "parameters"),
+ //PATH( Namespace.EDOAL, "Path", true),
+ //PROPERTIES( Namespace.EDOAL, "properties"),
PROPERTY( Namespace.EDOAL, "Property", true),
PROPERTY_EXPR( Namespace.EDOAL, "Property"), // ??
- PROPERTY_OCCURENCE_COND(Namespace.EDOAL, "PropertyOccurenceRestriction", true),
+ PROPERTY_OCCURENCE_COND(Namespace.EDOAL, "AttributeOccurenceRestriction", true),
PROPERTY_TYPE_COND(Namespace.EDOAL, "PropertyTypeRestriction", true),
- PROPERTY_VALUE_COND(Namespace.EDOAL, "PropertyValueRestriction", true),
+ RELATION_DOMAIN_COND(Namespace.EDOAL, "RelationDomainRestriction", true),
+ PROPERTY_VALUE_COND(Namespace.EDOAL, "AttributeValueRestriction", true),
REFLEXIVE( Namespace.EDOAL, "reflexive", Constructor.REFLEXIVE),
RELATION_EXPR( Namespace.EDOAL, "Relation", true),
//RESTRICTION(Namespace.EDOAL, "Restriction"),
- SERVICE( Namespace.EDOAL, "service"),
+ //SERVICE( Namespace.EDOAL, "service"),
SYMMETRIC( Namespace.EDOAL, "symmetric", Constructor.SYMMETRIC),
- TOCLASS( Namespace.EDOAL, "toClass"),
+ TOCLASS( Namespace.EDOAL, "class"),
TRANSF( Namespace.EDOAL, "transf"),
TRANSITIVE( Namespace.EDOAL, "transitive", Constructor.TRANSITIVE),
TYPE_COND( Namespace.EDOAL, "TypeRestriction", true),
VALUE( Namespace.EDOAL, "value"),
- VALUE_COND( Namespace.EDOAL, "ValueRestriction", true)
+ VAR( Namespace.EDOAL, "var"),
+ VALUE_COND( Namespace.EDOAL, "ValueRestriction", true),
;
/** Operator to determine how to combine the expressions */
--
GitLab