groovy git commit: Minor refactoring: Generify GroovydocHolder

[sunlan]

Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_6_X f7e2c46a0 -> 00768041b


Minor refactoring: Generify GroovydocHolder

(cherry picked from commit e0b787d)


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/00768041
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/00768041
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/00768041

Branch: refs/heads/GROOVY_2_6_X
Commit: 00768041b3fe08603a80deb39738c17b2da9deb4
Parents: f7e2c46
Author: sunlan 
Authored: Mon Sep 11 07:53:49 2017 +0800
Committer: sunlan 
Committed: Mon Sep 11 07:54:49 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 16 
 src/main/groovy/lang/groovydoc/GroovydocHolder.java |  8 ++--
 src/main/org/codehaus/groovy/ast/ClassNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/FieldNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/MethodNode.java|  4 ++--
 5 files changed, 22 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
index 7b281ff..d7d4204 100644
--- a/src/main/groovy/lang/groovydoc/Groovydoc.java
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -28,23 +28,23 @@ import java.util.Objects;
 public class Groovydoc {
 private final String content;
 private List tagList;
-private final GroovydocHolder groovydocHolder;
+private final GroovydocHolder holder;
 
 public Groovydoc(String content, GroovydocHolder groovydocHolder) {
 this.content = content;
-this.groovydocHolder = groovydocHolder;
+this.holder = groovydocHolder;
 }
 
 public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
 this.content = content;
-this.groovydocHolder = new GroovydocHolder() {
+this.holder = new GroovydocHolder() {
 @Override
 public Groovydoc getGroovydoc() {
 return Groovydoc.this;
 }
 
 @Override
-public Object getInstance() {
+public AnnotatedElement getInstance() {
 return annotatedElement;
 }
 };
@@ -71,8 +71,8 @@ public class Groovydoc {
  * Get the holder of the groovydoc
  * @return the groovydoc holder
  */
-public GroovydocHolder getGroovydocHolder() {
-return groovydocHolder;
+public GroovydocHolder getHolder() {
+return holder;
 }
 
 @Override
@@ -81,12 +81,12 @@ public class Groovydoc {
 if (o == null || getClass() != o.getClass()) return false;
 Groovydoc groovydoc = (Groovydoc) o;
 return Objects.equals(content, groovydoc.content) &&
-Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+Objects.equals(holder, groovydoc.holder);
 }
 
 @Override
 public int hashCode() {
-return Objects.hash(content, groovydocHolder);
+return Objects.hash(content, holder);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/groovy/lang/groovydoc/GroovydocHolder.java
--
diff --git a/src/main/groovy/lang/groovydoc/GroovydocHolder.java 
b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
index 8db3135..eb41df4 100644
--- a/src/main/groovy/lang/groovydoc/GroovydocHolder.java
+++ b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
@@ -21,7 +21,7 @@ package groovy.lang.groovydoc;
 /**
  * Represents Groovydoc Holder
  */
-public interface GroovydocHolder {
+public interface GroovydocHolder {
 String DOC_COMMENT = "_DOC_COMMENT"; // keys for meta data
 /**
  * Get the groovydoc
@@ -29,5 +29,9 @@ public interface GroovydocHolder {
  */
 Groovydoc getGroovydoc();
 
-Object getInstance();
+/**
+ * Get GroovydocHolder instance
+ * @return GroovydocHolder instance
+ */
+T getInstance();
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/00768041/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java 
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index fcf7cd6..f7ad48d 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -18,13 +18,13 @@
  */
 package org.codehaus.groovy.ast;
 
+import groovy.lang.groovydoc.Groovydoc;
 import groovy.lang.groovydoc.GroovydocHolder;
 import 

groovy git commit: Minor refactoring: Generify GroovydocHolder

[sunlan]

Repository: groovy
Updated Branches:
  refs/heads/master 43067475c -> e0b787dcf


Minor refactoring: Generify GroovydocHolder


Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/e0b787dc
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/e0b787dc
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/e0b787dc

Branch: refs/heads/master
Commit: e0b787dcfc50c1084aac7112ba9d8a2cc6aa0cfa
Parents: 4306747
Author: sunlan 
Authored: Mon Sep 11 07:53:49 2017 +0800
Committer: sunlan 
Committed: Mon Sep 11 07:53:49 2017 +0800

--
 src/main/groovy/lang/groovydoc/Groovydoc.java   | 16 
 src/main/groovy/lang/groovydoc/GroovydocHolder.java |  8 ++--
 src/main/org/codehaus/groovy/ast/ClassNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/FieldNode.java |  6 +++---
 src/main/org/codehaus/groovy/ast/MethodNode.java|  4 ++--
 5 files changed, 22 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/groovy/lang/groovydoc/Groovydoc.java
--
diff --git a/src/main/groovy/lang/groovydoc/Groovydoc.java 
b/src/main/groovy/lang/groovydoc/Groovydoc.java
index 7b281ff..d7d4204 100644
--- a/src/main/groovy/lang/groovydoc/Groovydoc.java
+++ b/src/main/groovy/lang/groovydoc/Groovydoc.java
@@ -28,23 +28,23 @@ import java.util.Objects;
 public class Groovydoc {
 private final String content;
 private List tagList;
-private final GroovydocHolder groovydocHolder;
+private final GroovydocHolder holder;
 
 public Groovydoc(String content, GroovydocHolder groovydocHolder) {
 this.content = content;
-this.groovydocHolder = groovydocHolder;
+this.holder = groovydocHolder;
 }
 
 public Groovydoc(final String content, final AnnotatedElement 
annotatedElement) {
 this.content = content;
-this.groovydocHolder = new GroovydocHolder() {
+this.holder = new GroovydocHolder() {
 @Override
 public Groovydoc getGroovydoc() {
 return Groovydoc.this;
 }
 
 @Override
-public Object getInstance() {
+public AnnotatedElement getInstance() {
 return annotatedElement;
 }
 };
@@ -71,8 +71,8 @@ public class Groovydoc {
  * Get the holder of the groovydoc
  * @return the groovydoc holder
  */
-public GroovydocHolder getGroovydocHolder() {
-return groovydocHolder;
+public GroovydocHolder getHolder() {
+return holder;
 }
 
 @Override
@@ -81,12 +81,12 @@ public class Groovydoc {
 if (o == null || getClass() != o.getClass()) return false;
 Groovydoc groovydoc = (Groovydoc) o;
 return Objects.equals(content, groovydoc.content) &&
-Objects.equals(groovydocHolder, groovydoc.groovydocHolder);
+Objects.equals(holder, groovydoc.holder);
 }
 
 @Override
 public int hashCode() {
-return Objects.hash(content, groovydocHolder);
+return Objects.hash(content, holder);
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/groovy/lang/groovydoc/GroovydocHolder.java
--
diff --git a/src/main/groovy/lang/groovydoc/GroovydocHolder.java 
b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
index 8db3135..eb41df4 100644
--- a/src/main/groovy/lang/groovydoc/GroovydocHolder.java
+++ b/src/main/groovy/lang/groovydoc/GroovydocHolder.java
@@ -21,7 +21,7 @@ package groovy.lang.groovydoc;
 /**
  * Represents Groovydoc Holder
  */
-public interface GroovydocHolder {
+public interface GroovydocHolder {
 String DOC_COMMENT = "_DOC_COMMENT"; // keys for meta data
 /**
  * Get the groovydoc
@@ -29,5 +29,9 @@ public interface GroovydocHolder {
  */
 Groovydoc getGroovydoc();
 
-Object getInstance();
+/**
+ * Get GroovydocHolder instance
+ * @return GroovydocHolder instance
+ */
+T getInstance();
 }

http://git-wip-us.apache.org/repos/asf/groovy/blob/e0b787dc/src/main/org/codehaus/groovy/ast/ClassNode.java
--
diff --git a/src/main/org/codehaus/groovy/ast/ClassNode.java 
b/src/main/org/codehaus/groovy/ast/ClassNode.java
index fcf7cd6..f7ad48d 100644
--- a/src/main/org/codehaus/groovy/ast/ClassNode.java
+++ b/src/main/org/codehaus/groovy/ast/ClassNode.java
@@ -18,13 +18,13 @@
  */
 package org.codehaus.groovy.ast;
 
+import groovy.lang.groovydoc.Groovydoc;
 import groovy.lang.groovydoc.GroovydocHolder;
 import org.codehaus.groovy.GroovyBugError;
 import