natas_hw
/
UMLGraph
mirror of https://github.com/dspinellis/UMLGraph
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

The -noguillemot option will output two angle bracket pairs 

instead of round brackets around stereotypes.
This commit is contained in:
Diomidis Spinellis 2005-10-19 18:37:41 +00:00
parent df5e3ff3f3
commit 2fa05e6a36
10 changed files with 130 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gr/spinellis/umlgraph/doclet/ClassGraph.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/gr/spinellis/umlgraph/doclet/ClassInfo.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/gr/spinellis/umlgraph/doclet/Options.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/gr/spinellis/umlgraph/doclet/StringUtil.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/gr/spinellis/umlgraph/doclet/UmlGraph.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/org/umlgraph/doclet/ClassGraph.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/org/umlgraph/doclet/ClassInfo.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/org/umlgraph/doclet/Options.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/org/umlgraph/doclet/StringUtil.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();

22
src/org/umlgraph/doclet/UmlGraph.java
View File

@ -57,9 +57,9 @@ class Options implements Cloneable {
String apiDocRoot;
boolean useGuillemot;
/** Guillemot left (open) */
char guilOpen = '\u00ab';
String guilOpen = "\u00ab";
/** Guillemot right (close) */
char guilClose = '\u00bb';
String guilClose = "\u00bb";
Options() {
showQualified = false;
@ -166,8 +166,8 @@ class Options implements Cloneable {
} else if(opt[0].equals("-apidocmap")) {
apiDocMapFileName = opt[1];
} else if(opt[0].equals("-noguillemot")) {
guilOpen = '(';
guilClose = ')';
guilOpen = "\\<\\<";
guilClose = "\\>\\>";
} else
; // Do nothing, javadoc will handle the option or complain, if needed.
}
@ -358,18 +358,22 @@ class ClassGraph {
}
/**
* Convert &lt; and &gt; characters in the string to the respective guillemot characters,
* or return the same string if the use of those characters has been disabled.
* Convert &lt; and &gt; characters in the string to the respective guillemot characters.
*/
private String guillemize(String s) {
StringBuffer r = new StringBuffer(s);
for (int i = 0; i < r.length(); i++)
for (int i = 0; i < r.length();)
switch (r.charAt(i)) {
case '<':
r.setCharAt(i, opt.guilOpen);
r.replace(i, i + 1, opt.guilOpen);
i += opt.guilOpen.length();
break;
case '>':
r.setCharAt(i, opt.guilClose);
r.replace(i, i + 1, opt.guilClose);
i += opt.guilOpen.length();
break;
default:
i++;
break;
}
return r.toString();