From 0435986b9292feda52424fba0dc15f1a18c9e178 Mon Sep 17 00:00:00 2001
From: real-prometheus <real.prometheus@gmail.com>
Date: Fri, 23 Aug 2013 02:27:53 +0200
Subject: [PATCH] Added support for options tags in ContextView and PackageView
 using the UmlGraphDoc docklet for javadoc generation with integrated Uml.

---
 .../java/org/umlgraph/doclet/ContextView.java | 23 +++++++++++++------
 .../java/org/umlgraph/doclet/PackageView.java |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 src/main/java/org/umlgraph/doclet/ContextView.java
 mode change 100644 => 100755 src/main/java/org/umlgraph/doclet/PackageView.java

diff --git a/src/main/java/org/umlgraph/doclet/ContextView.java b/src/main/java/org/umlgraph/doclet/ContextView.java
old mode 100644
new mode 100755
index b284f8a..7d8d9cd
--- a/src/main/java/org/umlgraph/doclet/ContextView.java
+++ b/src/main/java/org/umlgraph/doclet/ContextView.java
@@ -74,27 +74,36 @@ public class ContextView implements OptionProvider {
     }
 
     public Options getOptionsFor(ClassDoc cd) {
+    Options opt;
 	if (globalOptions.matchesHideExpression(cd.toString()) || !matcher.matches(cd)) {
-	    return hideOptions;
+		opt = hideOptions;
 	} else if (cd.equals(this.cd)) {
-	    return centerOptions;
+		opt = centerOptions;
 	} else if(cd.containingPackage().equals(this.cd.containingPackage())){
-	    return packageOptions;
+		opt = packageOptions;
 	} else {
-	    return globalOptions;
+		opt = globalOptions;
 	}
+	Options optionClone = (Options) opt.clone();
+	overrideForClass(optionClone, cd);
+	return optionClone;
     }
 
     public Options getOptionsFor(String name) {
+    Options opt;
 	if (!matcher.matches(name))
-	    return hideOptions;
+		opt = hideOptions;
 	else if (name.equals(cd.name()))
-	    return centerOptions;
+		opt = centerOptions;
 	else
-	    return globalOptions;
+		opt = globalOptions;
+	Options optionClone = (Options) opt.clone();
+	overrideForClass(optionClone, name);
+	return optionClone;
     }
 
     public void overrideForClass(Options opt, ClassDoc cd) {
+    	opt.setOptions(cd);
 	if (opt.matchesHideExpression(cd.toString()) || !matcher.matches(cd))
 	    opt.setOption(HIDE_OPTIONS);
 	if (cd.equals(this.cd))
diff --git a/src/main/java/org/umlgraph/doclet/PackageView.java b/src/main/java/org/umlgraph/doclet/PackageView.java
old mode 100644
new mode 100755
index 168db4d..6329fa5
--- a/src/main/java/org/umlgraph/doclet/PackageView.java
+++ b/src/main/java/org/umlgraph/doclet/PackageView.java
@@ -55,6 +55,7 @@ public class PackageView implements OptionProvider {
     }
 
     public void overrideForClass(Options opt, ClassDoc cd) {
+	opt.setOptions(cd);
 	opt.showQualified = false;
 	if (!matcher.matches(cd) || parent.getGlobalOptions().matchesHideExpression(cd.name()))
 	    opt.setOption(new String[] { "-hide" });