Permalink
Browse files

New restriction classes

  • Loading branch information...
1 parent 7d487a8 commit 6cac3c2818f2bd710570f6add8a3d2863e72bff7 Michael Zimmermann committed Jul 30, 2008
Showing with 2,959 additions and 872 deletions.
  1. +15 −0 ToDo.txt
  2. BIN docs/AccessorMethods-Example1.jpg
  3. BIN docs/AccessorMethods-Example2.jpg
  4. BIN docs/Restrictions-and-AccessorMethods.odt
  5. +325 −0 docs/restrictions.diagrams
  6. +165 −0 docs/restrictions.owl
  7. +1 −1 src/java/de/incunabulum/jakuzi/exceptions/CarindinalityException.java
  8. +26 −0 src/java/de/incunabulum/jakuzi/exceptions/JakuziException.java
  9. +0 −26 src/java/de/incunabulum/jakuzi/exceptions/O4JException.java
  10. +20 −16 src/java/de/incunabulum/jakuzi/generator/Generator.java
  11. +0 −56 src/java/de/incunabulum/jakuzi/generator/JModelPreparation.java
  12. +12 −12 src/java/de/incunabulum/jakuzi/generator/JavaWriter.java
  13. +128 −0 src/java/de/incunabulum/jakuzi/generator/ModelPreparation.java
  14. +474 −191 src/java/de/incunabulum/jakuzi/generator/OwlReader.java
  15. +0 −2 src/java/de/incunabulum/jakuzi/generator/writer/ClassWriter.java
  16. +1 −1 src/java/de/incunabulum/jakuzi/generator/writer/InterfaceHelper.java
  17. +0 −2 src/java/de/incunabulum/jakuzi/generator/writer/TestWriter.java
  18. +53 −0 src/java/de/incunabulum/jakuzi/jmodel/JAllValuesRestriction.java
  19. +40 −0 src/java/de/incunabulum/jakuzi/jmodel/JBaseRestriction.java
  20. +120 −0 src/java/de/incunabulum/jakuzi/jmodel/JCardinalityRestriction.java
  21. +277 −113 src/java/de/incunabulum/jakuzi/jmodel/JClass.java
  22. +0 −76 src/java/de/incunabulum/jakuzi/jmodel/JClassRestriction.java
  23. +139 −0 src/java/de/incunabulum/jakuzi/jmodel/JInheritanceGraph.java
  24. +12 −2 src/java/de/incunabulum/jakuzi/jmodel/JMapped.java
  25. +103 −28 src/java/de/incunabulum/jakuzi/jmodel/JModel.java
  26. +84 −0 src/java/de/incunabulum/jakuzi/jmodel/JOtherRestriction.java
  27. +4 −3 src/java/de/incunabulum/jakuzi/jmodel/JPackage.java
  28. +215 −131 src/java/de/incunabulum/jakuzi/jmodel/JProperty.java
  29. +78 −0 src/java/de/incunabulum/jakuzi/jmodel/JPropertyRepresentation.java
  30. +107 −0 src/java/de/incunabulum/jakuzi/jmodel/JRestrictionsContainer.java
  31. +3 −3 src/java/de/incunabulum/jakuzi/jmodel/utils/DebugUtils.java
  32. +35 −0 src/java/de/incunabulum/jakuzi/jmodel/utils/LogUtils.java
  33. +27 −32 src/java/de/incunabulum/jakuzi/jmodel/utils/NamingUtils.java
  34. +2 −2 src/java/de/incunabulum/jakuzi/model/ResourceError.java
  35. +27 −0 src/java/de/incunabulum/jakuzi/model/RestrictionUtils.java
  36. +153 −0 src/java/de/incunabulum/jakuzi/model/XsdGraph.java
  37. +80 −0 src/java/de/incunabulum/jakuzi/model/XsdMapConfig.java
  38. +49 −0 src/java/de/incunabulum/jakuzi/model/XsdSchema.java
  39. +21 −0 src/java/de/incunabulum/jakuzi/model/XsdTypeMapper.java
  40. +64 −147 src/java/de/incunabulum/jakuzi/model/XsdUtils.java
  41. +65 −0 src/java/de/incunabulum/jakuzi/utils/GraphPathUtils.java
  42. +3 −3 src/resources/log4j.properties
  43. +6 −1 src/templates/clsProperty.vm
  44. +24 −21 src/templates/interface.vm
  45. +1 −3 src/test/de/incunabulum/jakuzi/test/Test.java
View
@@ -0,0 +1,15 @@
+
+Restrictions
+- Multiple allValues restrictions on one property in a single class should
+ - either be handled as intersection
+ - or similar to a restriction with an anonymous operand
+
+Misc:
+- How about OCL as query language?
+
+
+ JavaDocs:
+ - These are completely missing
+
+ Logging:
+ - Cleanup for info, warn, error
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
View
@@ -0,0 +1,325 @@
+<rdf:RDF
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cd="http://www.topbraidcomposer.org/2006/04/02/ClassDiagrams.owl#"
+ xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#">
+ <cd:Diagram>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >170</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >333</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >798</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassB"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >168</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >405</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >124</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassC"/>
+ </cd:URINode>
+ </cd:nodes>
+ <rdfs:label>AClassE Diagram</rdfs:label>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >140</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >235</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >153</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassA"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >140</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >235</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >813</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassA"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >117</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >50</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >575</cd:x>
+ <cd:class rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >175</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >512</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >666</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassD"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >102</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >487</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >369</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassX"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >201</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >137</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >782</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#OnPropertyRestrictions2"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >109</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >587</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >830</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassE"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >109</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >414</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >501</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassY2"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >104</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >243</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >459</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassZ"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >102</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >413</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >368</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassY"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >170</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >421</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >668</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassC"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:selectedResource rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#AClassE"/>
+ </cd:Diagram>
+ <cd:Diagram>
+ <cd:selectedResource rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassF"/>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >102</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >296</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >454</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassY"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >102</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >453</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >455</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassX"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >117</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >16</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >340</cd:x>
+ <cd:class rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >168</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >523</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >224</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassF"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >140</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >138</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >238</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassA"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >170</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >215</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >223</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassB"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >194</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >77</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >211</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#OnPropertyRestrictions"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >168</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >292</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >224</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassC"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >168</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >446</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >224</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassE"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >29</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >104</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >144</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >454</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassZ"/>
+ </cd:URINode>
+ </cd:nodes>
+ <cd:nodes>
+ <cd:URINode>
+ <cd:height rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >45</cd:height>
+ <cd:width rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >168</cd:width>
+ <cd:y rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >369</cd:y>
+ <cd:x rdf:datatype="http://www.w3.org/2001/XMLSchema#int"
+ >224</cd:x>
+ <cd:class rdf:resource="http://jakuzi.incunabulum.de/restrictions.owl#ClassD"/>
+ </cd:URINode>
+ </cd:nodes>
+ <rdfs:label>ClassF Diagram</rdfs:label>
+ </cd:Diagram>
+</rdf:RDF>
Oops, something went wrong.

0 comments on commit 6cac3c2

Please sign in to comment.