Commit Graph

84 Commits

Author SHA1 Message Date
Jürgen Doser 6a83e8243a typo...
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3129 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:29:11 +00:00
Jürgen Doser 44d9fd6c6b handle association classes as classifiers.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3128 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:27:06 +00:00
Jürgen Doser 1da326058f AssociationClass is now represented in XMI datatstructure directly
(this may break xmi2rep for a while...)

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3127 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-26 10:23:34 +00:00
Achim D. Brucker 956087e4a2 readded UML150CL.dtd
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3121 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-25 12:26:54 +00:00
Jürgen Doser ed7dd0c58e added check for environment variable UML2CDL_HOME, merged dummy.xmi and UML15OCL.dtd
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3119 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-23 11:18:24 +00:00
Jürgen Doser 946bc897f4 List.map => List.app to make mlton happier
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3117 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-22 12:02:31 +00:00
Achim D. Brucker 91cabacecb renaming
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3116 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-22 11:20:12 +00:00
Achim D. Brucker 078abb3d2d git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3114 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-21 18:22:50 +00:00
Achim D. Brucker 2f78b7aeeb git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3113 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-21 18:22:32 +00:00
Jürgen Doser d2c9e3321e taggedValues for informationTypes
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3112 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 16:40:24 +00:00
Jürgen Doser 62487325d5 support for taggedValues
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3111 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 16:11:45 +00:00
Jürgen Doser a18ccbf2db also handle dependencies in top-level model, not only in packages
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3110 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 15:04:23 +00:00
Jürgen Doser b9c847257e parse Interfaces as interfaces, not as primitive types
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3109 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 14:47:17 +00:00
Jürgen Doser de936e6745 some support for Dependencies between Classifiers (e.g., a class realizes an interface)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3108 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-21 14:17:47 +00:00
Jürgen Doser dd246533da added some auxiliary functions for handling states and transitions
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3107 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 16:20:08 +00:00
Jürgen Doser 7bf5fc4dce added states and transitions to xmi_idtable
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3105 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 13:26:26 +00:00
Jürgen Doser 7b2cd8f2e4 small fix to make parsing of packages safer
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3104 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-20 13:25:46 +00:00
Achim D. Brucker 838bb27f24 git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3103 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-20 12:13:24 +00:00
Achim D. Brucker 6332cfe676 git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3102 3260e6d1-4efc-4170-b0a7-36055960796d 2005-09-20 11:55:10 +00:00
Jürgen Doser f0ac1607e9 added reference from classifiers to activity graphs into xmi_idtable
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3098 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-19 16:03:43 +00:00
Achim D. Brucker de0cb4d9b4 updated/added cm files
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3093 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-19 06:10:47 +00:00
Jürgen Doser 6b81909579 fixed a nonexhaustive pattern match
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3075 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 15:56:28 +00:00
Jürgen Doser f75dab512f cd -> OS.FileSys.chDir
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3073 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:51:27 +00:00
Jürgen Doser 85e178d1f8 revert typo fix (Achim was faster...)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3072 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:49:35 +00:00
Jürgen Doser a87b1572d6 include original XMI.Classifier in Hashtable (xmi_idtable)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3071 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:33:59 +00:00
Achim D. Brucker 54df0876dd updated MLton support
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3070 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:33:06 +00:00
Jürgen Doser 0d761ea3dd added auxiliary function
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3069 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:32:21 +00:00
Jürgen Doser a9a46e16c3 fixed typo (missing paren)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3068 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:31:33 +00:00
Achim D. Brucker a53a861696 fixed syntax error
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3067 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 13:25:07 +00:00
Jürgen Doser 4f023966ff simplified some things by using new semantics of XmlTree.follow
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3065 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 11:31:24 +00:00
Jürgen Doser b07f4135e4 moved two (forgotten) insert functions into xmi_idtable
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3064 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:55:49 +00:00
Jürgen Doser 70c95f2abe support for stereotypes on XMI.Class's
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3063 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:54:51 +00:00
Jürgen Doser 8d2def2b44 XmlTree.follow now returns an empty list (of child trees) instead of throwing an error
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3062 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-15 10:52:35 +00:00
Jürgen Doser e02f2e6371 moved xmi.id table to a seperate structure and file
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3061 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 16:51:46 +00:00
Achim D. Brucker 0ab220228b a first step towards mlton support
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3060 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 13:24:57 +00:00
Achim D. Brucker b3095da12d a first step towards mlton support
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3059 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 13:24:44 +00:00
Jürgen Doser ccc635a0ee fixes bugs due to including of CDATA in XmlTree
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3057 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 09:21:47 +00:00
Jürgen Doser 6fa8fe4a36 parses CData (text between XML elements)
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3056 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-14 07:58:28 +00:00
Achim D. Brucker 3eac0ae7f6 Tagged Values (modulo Bug in XMLtree Schnittstelle)
und Stereotypes eingebaut.

Allerdings haben Transitionen noch keine stereotypes.


git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3055 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-13 20:15:00 +00:00
Jürgen Doser b9ef294de6 be more liberal in parsing association ends:
names, orderingKind, aggregationKind attributes are now optional in the XMI. 

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3052 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-13 15:56:31 +00:00
Achim D. Brucker a5671a5d4f Guards und Entries eingebaut.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3048 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 20:13:23 +00:00
Jürgen Doser 93620333cf added leading "<?xml version=...?>" line to the output of WriteXmlTree.
added small comment to WriteXmlTree

git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3046 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 08:58:30 +00:00
Jürgen Doser 376d29234f added UML:CallACtion, UML:Action.script and UML:ActionExpression to DTD, for compatibility with Poseidon 3.1
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3045 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-12 07:30:10 +00:00
Achim D. Brucker 552f62e765 Mehr States im xmi parser beruecksichtigt.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3044 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-09 14:58:20 +00:00
Achim D. Brucker 76390fcbee First xmi-parser for smoe activity graph.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3043 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 17:00:46 +00:00
Achim D. Brucker 964e16b176 First Version of xmi_activity_charts.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3042 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 10:27:14 +00:00
Achim D. Brucker dc631024a5 First Version of a StateMachine-xmi.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3041 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 10:11:43 +00:00
Achim D. Brucker 6d0b9307a7 Kommentierung verbessert.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3040 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:43:47 +00:00
Achim D. Brucker 8eac5e0f8a structural reform: end.
- xmi_state_machines introduced.

- file renaming: machine -> machines.


git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3039 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:26:32 +00:00
Achim D. Brucker 07e0e9f7ed Structural Reform: Splitting xmi.sml in subparts.
git-svn-id: https://projects.brucker.ch/su4sml/svn/infsec-import/trunk/src/su4sml@3038 3260e6d1-4efc-4170-b0a7-36055960796d
2005-09-08 09:16:50 +00:00