From 19989b3736397228d924b0906bf19590c24adb67 Mon Sep 17 00:00:00 2001 From: Andrea Aime Date: Fri, 2 Jun 2006 09:19:00 +0000 Subject: [PATCH] String formatting fix, and don't show package names in the package class diagram (waste of space, all classes do come from the same package anyway) --- src/gr/spinellis/umlgraph/doclet/PackageView.java | 4 +++- src/org/umlgraph/doclet/PackageView.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/gr/spinellis/umlgraph/doclet/PackageView.java b/src/gr/spinellis/umlgraph/doclet/PackageView.java index 34e7aac..f9e8f68 100644 --- a/src/gr/spinellis/umlgraph/doclet/PackageView.java +++ b/src/gr/spinellis/umlgraph/doclet/PackageView.java @@ -30,7 +30,7 @@ public class PackageView implements OptionProvider { } public String getDisplayName() { - return "Package view for packages" + pd; + return "Package view for package " + pd; } public Options getGlobalOptions() { @@ -55,11 +55,13 @@ public class PackageView implements OptionProvider { } public void overrideForClass(Options opt, ClassDoc cd) { + opt.showQualified = false; if (!matcher.matches(cd) || parent.getGlobalOptions().matchesHideExpression(cd.name())) opt.setOption(new String[] { "-hide" }); } public void overrideForClass(Options opt, String className) { + opt.showQualified = false; if (!matcher.matches(className)) opt.setOption(new String[] { "-hide" }); } diff --git a/src/org/umlgraph/doclet/PackageView.java b/src/org/umlgraph/doclet/PackageView.java index 34e7aac..f9e8f68 100644 --- a/src/org/umlgraph/doclet/PackageView.java +++ b/src/org/umlgraph/doclet/PackageView.java @@ -30,7 +30,7 @@ public class PackageView implements OptionProvider { } public String getDisplayName() { - return "Package view for packages" + pd; + return "Package view for package " + pd; } public Options getGlobalOptions() { @@ -55,11 +55,13 @@ public class PackageView implements OptionProvider { } public void overrideForClass(Options opt, ClassDoc cd) { + opt.showQualified = false; if (!matcher.matches(cd) || parent.getGlobalOptions().matchesHideExpression(cd.name())) opt.setOption(new String[] { "-hide" }); } public void overrideForClass(Options opt, String className) { + opt.showQualified = false; if (!matcher.matches(className)) opt.setOption(new String[] { "-hide" }); }