Merge remote-tracking branch 'origin/master' into develop

Author: morandat

client.diff/src/main/java/com/github/gumtreediff/client/diff/ui/web/views/ScriptView.java

@@ -24,6 +24,7 @@
 import com.github.gumtreediff.actions.model.Action;
 import com.github.gumtreediff.gen.Generators;
 import com.github.gumtreediff.io.ActionsIoUtils;
+import com.github.gumtreediff.matchers.MappingStore;
 import com.github.gumtreediff.matchers.Matcher;
 import com.github.gumtreediff.matchers.Matchers;
 import com.github.gumtreediff.tree.TreeContext;
@@ -40,6 +41,12 @@
 
 public class ScriptView implements Renderable {
 
+    private final MappingStore mappings;
+
+    private final TreeContext src;
+
+    private final TreeContext dst;
+
     private File fSrc;
 
     private File fDst;
@@ -49,11 +56,12 @@ public class ScriptView implements Renderable {
     public ScriptView(File fSrc, File fDst) throws IOException {
         this.fSrc = fSrc;
         this.fDst = fDst;
-        TreeContext src = Generators.getInstance().getTree(fSrc.getAbsolutePath());
-        TreeContext dst = Generators.getInstance().getTree(fDst.getAbsolutePath());
+        src = Generators.getInstance().getTree(fSrc.getAbsolutePath());
+        dst = Generators.getInstance().getTree(fDst.getAbsolutePath());
         Matcher matcher = Matchers.getInstance().getMatcher(src.getRoot(), dst.getRoot());
         matcher.match();
-        ActionGenerator g = new ActionGenerator(src.getRoot(), dst.getRoot(), matcher.getMappings());
+        mappings = matcher.getMappings();
+        ActionGenerator g = new ActionGenerator(src.getRoot(), dst.getRoot(), mappings);
         g.generate();
         this.script = g.getActions();
     }
@@ -72,7 +80,7 @@ public void renderOn(HtmlCanvas html) throws IOException {
                 .write("Script ")
                 .small().content(String.format("%s -> %s", fSrc.getName(), fDst.getName()))
                 ._h3()
-                .pre().content(ActionsIoUtils.toText(this.script))
+                .pre().content(ActionsIoUtils.toText(src, this.script, mappings).toString())
                 ._div()
                 ._div()
                 ._div()

core/src/main/java/com/github/gumtreediff/actions/ActionGenerator.java

@@ -20,19 +20,7 @@
 
 package com.github.gumtreediff.actions;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.github.gumtreediff.actions.model.Delete;
-import com.github.gumtreediff.actions.model.Update;
-import com.github.gumtreediff.tree.AbstractTree;
-import com.github.gumtreediff.actions.model.Action;
-import com.github.gumtreediff.actions.model.Delete;
-import com.github.gumtreediff.actions.model.Insert;
-import com.github.gumtreediff.actions.model.Move;
-import com.github.gumtreediff.actions.model.Update;
+import com.github.gumtreediff.actions.model.*;
 import com.github.gumtreediff.matchers.Mapping;
 import com.github.gumtreediff.matchers.MappingStore;
 import com.github.gumtreediff.tree.AbstractTree;
@@ -41,6 +29,11 @@
 import gnu.trove.map.TIntObjectMap;
 import gnu.trove.map.hash.TIntObjectHashMap;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 public class ActionGenerator {
 
     private ITree origSrc;
@@ -87,7 +80,7 @@ public List<Action> getActions() {
         return actions;
     }
 
-    public void generate() {
+    public List<Action> generate() {
         ITree srcFakeRoot = new AbstractTree.FakeTree(newSrc);
         ITree dstFakeRoot = new AbstractTree.FakeTree(origDst);
         newSrc.setParent(srcFakeRoot);
@@ -156,8 +149,8 @@ public void generate() {
             }
         }
 
-
         //FIXME should ensure isomorphism.
+        return actions;
     }
 
     private void alignChildren(ITree w, ITree x) {