changeset 2330:8d0997a404a6

Fix merge errors
author jjg
date Mon, 18 Mar 2013 19:28:29 -0700
parents 6281d357caf2
children 40f46df6ec3a
files src/share/classes/com/sun/tools/javac/code/Symbol.java src/share/classes/javax/lang/model/element/ExecutableElement.java
diffstat 2 files changed, 0 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Mon Mar 18 19:16:54 2013 -0700
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Mon Mar 18 19:28:29 2013 -0700
@@ -1457,10 +1457,6 @@
             return asType().getReceiverType();
         }
 
-        public Type getReceiverType() {
-            return asType().getReceiverType();
-        }
-
         public Type getReturnType() {
             return asType().getReturnType();
         }
--- a/src/share/classes/javax/lang/model/element/ExecutableElement.java	Mon Mar 18 19:16:54 2013 -0700
+++ b/src/share/classes/javax/lang/model/element/ExecutableElement.java	Mon Mar 18 19:28:29 2013 -0700
@@ -88,17 +88,6 @@
     TypeMirror getReceiverType();
 
     /**
-     * Returns the type of this executable's receiver parameter,
-     * or {@link javax.lang.model.type.NoType NoType} 
-     * (kind {@link javax.lang.model.type.TypeKind#NONE NONE}) 
-     * if the ExecutableType represents the type of an executable 
-     * which is a static method or an initializer (static or instance)
-     * 
-     * @return the type of this executable's receiver parameter
-     */
-    TypeMirror getReceiverType();
-
-    /**
      * Returns {@code true} if this method or constructor accepts a variable
      * number of arguments and returns {@code false} otherwise.
      *