Merge pull request #99 from FlorianLehmann/master

Missing TypeDeclaration name in gen.jdt

Author: jrfaller

gen.jdt/src/main/java/com/github/gumtreediff/gen/jdt/JdtVisitor.java

@@ -48,6 +48,7 @@ protected String getLabel(ASTNode n) {
         if (n instanceof Assignment) return ((Assignment) n).getOperator().toString();
         if (n instanceof TextElement) return n.toString();
         if (n instanceof TagElement) return ((TagElement) n).getTagName();
+        if (n instanceof TypeDeclaration) return ((TypeDeclaration) n).isInterface()?"interface":"class";
 
         return "";
     }

gen.jdt/src/test/java/com/github/gumtreediff/gen/jdt/TestIssue98.java

@@ -0,0 +1,54 @@
+/*
+ * This file is part of GumTree.
+ *
+ * GumTree is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GumTree 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with GumTree.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Copyright 2011-2015 Jean-Rémy Falleri <[email protected]>
+ * Copyright 2011-2015 Floréal Morandat <[email protected]>
+ */
+
+package com.github.gumtreediff.gen.jdt;
+
+import com.github.gumtreediff.actions.ActionGenerator;
+import com.github.gumtreediff.actions.model.Action;
+import com.github.gumtreediff.matchers.Matcher;
+import com.github.gumtreediff.matchers.Matchers;
+import com.github.gumtreediff.tree.ITree;
+import com.github.gumtreediff.tree.TreeContext;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+public class TestIssue98 {
+
+    @Test
+    public void shouldHaveDifferentTree() throws IOException {
+        String left = "public interface Main { }";
+        String right = "public class Main { }";
+
+        ITree leftTree = new JdtTreeGenerator().generateFromString(left).getRoot();
+        ITree rightTree = new JdtTreeGenerator().generateFromString(right).getRoot();
+        Matcher m = Matchers.getInstance().getMatcher(leftTree, rightTree);
+        m.match();
+
+        ActionGenerator g = new ActionGenerator(leftTree, rightTree, m.getMappings());
+        List<Action> actions = g.generate();
+
+        assertEquals(1, actions.size());
+    }
+
+}