From cc2052d26124e25c8a63a7bc915d225d263c9e3a Mon Sep 17 00:00:00 2001 From: Diomidis Spinellis Date: Fri, 21 Oct 2005 21:40:26 +0000 Subject: [PATCH] Fix symbol for package visibility. See http://homepages.inf.ed.ac.uk/perdita/Book/changesForUML1.4.html and http://www.sparxsystems.com/resources/uml2_tutorial/uml2_classdiagram.html --- src/gr/spinellis/umlgraph/doclet/ClassGraph.java | 8 ++++---- src/gr/spinellis/umlgraph/doclet/ClassInfo.java | 8 ++++---- src/gr/spinellis/umlgraph/doclet/Options.java | 8 ++++---- src/gr/spinellis/umlgraph/doclet/StringUtil.java | 8 ++++---- src/gr/spinellis/umlgraph/doclet/UmlGraph.java | 8 ++++---- src/org/umlgraph/doclet/ClassGraph.java | 8 ++++---- src/org/umlgraph/doclet/ClassInfo.java | 8 ++++---- src/org/umlgraph/doclet/Options.java | 8 ++++---- src/org/umlgraph/doclet/StringUtil.java | 8 ++++---- src/org/umlgraph/doclet/UmlGraph.java | 8 ++++---- 10 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java index 798f685..81e4ebe 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassGraph.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java index 798f685..81e4ebe 100644 --- a/src/gr/spinellis/umlgraph/doclet/ClassInfo.java +++ b/src/gr/spinellis/umlgraph/doclet/ClassInfo.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/gr/spinellis/umlgraph/doclet/Options.java b/src/gr/spinellis/umlgraph/doclet/Options.java index 798f685..81e4ebe 100644 --- a/src/gr/spinellis/umlgraph/doclet/Options.java +++ b/src/gr/spinellis/umlgraph/doclet/Options.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/gr/spinellis/umlgraph/doclet/StringUtil.java b/src/gr/spinellis/umlgraph/doclet/StringUtil.java index 798f685..81e4ebe 100644 --- a/src/gr/spinellis/umlgraph/doclet/StringUtil.java +++ b/src/gr/spinellis/umlgraph/doclet/StringUtil.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java index 798f685..81e4ebe 100644 --- a/src/gr/spinellis/umlgraph/doclet/UmlGraph.java +++ b/src/gr/spinellis/umlgraph/doclet/UmlGraph.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/org/umlgraph/doclet/ClassGraph.java b/src/org/umlgraph/doclet/ClassGraph.java index 798f685..81e4ebe 100644 --- a/src/org/umlgraph/doclet/ClassGraph.java +++ b/src/org/umlgraph/doclet/ClassGraph.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/org/umlgraph/doclet/ClassInfo.java b/src/org/umlgraph/doclet/ClassInfo.java index 798f685..81e4ebe 100644 --- a/src/org/umlgraph/doclet/ClassInfo.java +++ b/src/org/umlgraph/doclet/ClassInfo.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/org/umlgraph/doclet/Options.java b/src/org/umlgraph/doclet/Options.java index 798f685..81e4ebe 100644 --- a/src/org/umlgraph/doclet/Options.java +++ b/src/org/umlgraph/doclet/Options.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/org/umlgraph/doclet/StringUtil.java b/src/org/umlgraph/doclet/StringUtil.java index 798f685..81e4ebe 100644 --- a/src/org/umlgraph/doclet/StringUtil.java +++ b/src/org/umlgraph/doclet/StringUtil.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); } diff --git a/src/org/umlgraph/doclet/UmlGraph.java b/src/org/umlgraph/doclet/UmlGraph.java index 798f685..81e4ebe 100644 --- a/src/org/umlgraph/doclet/UmlGraph.java +++ b/src/org/umlgraph/doclet/UmlGraph.java @@ -399,12 +399,12 @@ class ClassGraph { return; if (e.isPrivate()) opt.w.print('-'); - if (e.isPublic()) + else if (e.isPublic()) opt.w.print('+'); - if (e.isProtected()) + else if (e.isProtected()) opt.w.print('#'); - if (e.isPackagePrivate()) - opt.w.print('$'); + else if (e.isPackagePrivate()) + opt.w.print('~'); opt.w.print(' '); }