code review II

Author: luiscruz

plugin/src/main/java/org/autorefactor/refactoring/rules/AndroidDrawAllocationRefactoring.java

@@ -83,11 +83,7 @@ public boolean isMethodBindingSubclassOf(ITypeBinding typeBinding, List<String>
             ITypeBinding superClass = typeBinding;
             ITypeBinding objectType = ctx.getAST().resolveWellKnownType("java.lang.Object");
             while (superClass != null && !superClass.equals(objectType)) {
-                String className = superClass.getName();
-                if (className.contains("<")) {
-                    className = className.split("<", 2)[0];
-                }
-                if (superClassStrings.contains(className)) {
+                if (superClassStrings.contains(superClass.getErasure().getName())) {
                     return true;
                 }
                 superClass = superClass.getSuperclass();
@@ -107,8 +103,7 @@ public boolean visit(VariableDeclarationFragment node) {
                     InitializerVisitor initializerVisitor = new InitializerVisitor();
                     initializer.accept(initializerVisitor);
                     if (initializerVisitor.initializerCanBeExtracted) {
-                        Statement declarationStatement = (Statement) getFirstAncestorOrNull(node,
-                                VariableDeclarationStatement.class);
+                        Statement declarationStatement = getAncestor(node, VariableDeclarationStatement.class);
                         if (declarationStatement != null) {
                             final ASTBuilder b = this.ctx.getASTBuilder();
                             final Refactorings r = this.ctx.getRefactorings();

samples/src/test/java/org/autorefactor/refactoring/rules/samples_in/AndroidDrawAllocationSample.java

@@ -1,3 +1,29 @@
+/*
+ * AutoRefactor - Eclipse plugin to automatically refactor Java code bases.
+ *
+ * Copyright (C) 2016 Luis Cruz - Android Refactoring
+ * Copyright (C) 2016 Jean-Noël Rouvignac - code cleanups
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program under LICENSE-GNUGPL.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution under LICENSE-ECLIPSE, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.autorefactor.refactoring.rules.samples_in;
 
 import java.util.ArrayList;
@@ -13,16 +39,15 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.widget.Button;
-/** Some test data for the JavaPerformanceDetector */
-@SuppressWarnings("unused")
+
 public class AndroidDrawAllocationSample extends Button {
 
-	public AndroidDrawAllocationSample(Context context, AttributeSet attrs, int defStyle) {
+    private Rect cachedRect;
+
+    public AndroidDrawAllocationSample(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
-    private Rect cachedRect;
-
     @Override
     protected void onDraw(android.graphics.Canvas canvas) {
         super.onDraw(canvas);

samples/src/test/java/org/autorefactor/refactoring/rules/samples_out/AndroidDrawAllocationSample.java

@@ -1,3 +1,29 @@
+/*
+ * AutoRefactor - Eclipse plugin to automatically refactor Java code bases.
+ *
+ * Copyright (C) 2016 Luis Cruz - Android Refactoring
+ * Copyright (C) 2016 Jean-Noël Rouvignac - code cleanups
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program under LICENSE-GNUGPL.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution under LICENSE-ECLIPSE, and is
+ * available at http://www.eclipse.org/legal/epl-v10.html
+ */
 package org.autorefactor.refactoring.rules.samples_out;
 
 import java.util.ArrayList;
@@ -13,16 +39,15 @@
 import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.widget.Button;
-/** Some test data for the JavaPerformanceDetector */
-@SuppressWarnings("unused")
+
 public class AndroidDrawAllocationSample extends Button {
 
+    private Rect cachedRect;
+
 	public AndroidDrawAllocationSample(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
     }
 
-    private Rect cachedRect;
-
     String s = new String("bar");
 
     // This one should not be reported: