Skip to content
Permalink
Browse files

Fixing generated compiler diags and adding State one

  • Loading branch information...
TimLethbridge committed May 10, 2019
1 parent 24f3505 commit 9d215eb472a219e3939d7ab0ea4fc15a51cc4d21
@@ -17,4 +17,6 @@ along with the user manual files
@outputumplesource
*/
use DiagramMaster.ump;
filter { include UmpleModel, UmpleClass, UmpleAssociation, UmpleInterface; hops {association 1;}}

// Activate this specific mixset
use CoreClassesOnly;

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -18,6 +18,40 @@ along with the user manual files
*/
generate GvClassDiagram "DiagramMaster.gv" --override-all;

// Activated in DiagramCoreMaster.ump
mixset CoreClassesOnly {
filter {
include UmpleModel, UmpleClass, UmpleAssociation, UmpleInterface;
hops {
association 1;
sub 5;
}
}
}

// Activated in DiagramStateMaster.gv
mixset StateClassesOnly {
filter {
include StateMachine, State, Transition;
hops {
association 1;
sub 2;}
}
}

// Default filter, will show almost everything (attempts to show everything result in a
// graph that won't properly display by graphViz.
filter {
include UmpleInternalParser, UmpleClass, CodeGeneratorWithSubptions, BasicExpression;
hops {
association 999;
}
hops {
sub 10;
}
}


use Master.ump;

// Pink for core Umple classes for parsing and the model
@@ -0,0 +1,22 @@
/*

Copyright: All contributers to the Umple Project

This file is made available subject to the open source license found at:
http://umple.org/license

This file is used to generate the diagram found at
http://umple.org/umple-compiler-classDiagram.shtml

To regenerate that diagram, compile this
Then move DiagramMastercd.gv to ../../umplewww
Then compile the result in umplewww with dot -Tsvg DiagramMastercd.gv -o Mastercd.svg
On the server Mastercd.sv needs to be placed in the umple.org directory
along with the user manual files

@outputumplesource
*/
use DiagramMaster.ump;

// Activate this specific mixset
use StateClassesOnly;

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -21,6 +21,7 @@ window.open("http:umple-compiler-javadoc/index.html?"+packageName+className+".ht
</head>
<body>
<h1>Class diagram of the Umple compiler, generated by Umple</h1>
<p>Other diagrams of part of Umple are available: <a href="umple-core-classDiagram.shtml">Core Umple class diagram</a>, &nbsp; <a href="umple-state-classDiagram.shtml">Umple state machine aspects class diagram</a></p>
<p>Zoom in (ctrl-+ or cmd-+) to see detail. Click on a class to go to the API reference for that class. Hover over a class to see its comment.</p>

<svg style="overflow-x: scroll; overflow-y: scroll;" width=6500 height=1500>
@@ -0,0 +1,34 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<script language="javascript">
Action = new Object();
Action.selectClass = function(className) {
packageName="cruise/umple/compiler/";
vmlclasses = Array("CodeSnippet", "Concern", "Variant", "VariationPoint", "VmlConsole", "VmlParser", "VmlSystem");
for (var clnum in vmlclasses) {
if (vmlclasses[clnum] == className) {
packageName="cruise/vml/";
}
}
window.open("http:umple-compiler-javadoc/index.html?"+packageName+className+".html");
}
</script>
<title>Class diagram of the core of the Umple compiler generated by Umple itself</title>
</head>
<body>
<h1>Class diagram of the core of the Umple compiler, generated by Umple</h1>
<p>Other diagrams of part of Umple are available: <a href="umple-compiler-classDiagram.shtml">Complete Umple class diagram</a>, &nbsp; <a href="umple-state-classDiagram.shtml">Umple state machine aspects class diagram</a></p>
<p>Zoom in (ctrl-+ or cmd-+) to see detail. Click on a class to go to the API reference for that class. Hover over a class to see its comment.</p>

<svg style="overflow-x: scroll; overflow-y: scroll;" width=6500 height=1500>
<!--#include virtual="DiagramCoreMastercd.svg" -->
</svg>



</body>
</html>
@@ -0,0 +1,34 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<script language="javascript">
Action = new Object();
Action.selectClass = function(className) {
packageName="cruise/umple/compiler/";
vmlclasses = Array("CodeSnippet", "Concern", "Variant", "VariationPoint", "VmlConsole", "VmlParser", "VmlSystem");
for (var clnum in vmlclasses) {
if (vmlclasses[clnum] == className) {
packageName="cruise/vml/";
}
}
window.open("http:umple-compiler-javadoc/index.html?"+packageName+className+".html");
}
</script>
<title>Class diagram of the state machine aspects of the Umple compiler generated by Umple itself</title>
</head>
<body>
<h1>Class diagram of the state machine aspects of the Umple compiler, generated by Umple</h1>
<p>Other diagrams of part of Umple are available: <a href="umple-compiler-classDiagram.shtml">Complete Umple class diagram</a>, &nbsp; <a href="umple-core-classDiagram.shtml">Core Umple class diagram</a></p>
<p>Zoom in (ctrl-+ or cmd-+) to see detail. Click on a class to go to the API reference for that class. Hover over a class to see its comment.</p>

<svg style="overflow-x: scroll; overflow-y: scroll;" width=6500 height=1500>
<!--#include virtual="DiagramCoreMastercd.svg" -->
</svg>



</body>
</html>

0 comments on commit 9d215eb

Please sign in to comment.
You can’t perform that action at this time.