Skip to content

Import type labels of dst tree ctx into src tree ctx #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Import type labels of dst tree ctx into src tree ctx #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions client.diff/src/main/java/com/github/gumtreediff/client/diff/AbstractDiffClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ protected Matcher matchTrees() {
? matchers.getMatcher(getSrcTreeContext().getRoot(), getDstTreeContext().getRoot())
: matchers.getMatcher(opts.matcher, getSrcTreeContext().getRoot(), getDstTreeContext().getRoot());
matcher.match();
getSrcTreeContext().importTypeLabels(getDstTreeContext());
return matcher;
}

Expand Down
1 change: 1 addition & 0 deletions client.diff/src/main/java/com/github/gumtreediff/client/diff/web/DiffView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public DiffView(File fSrc, File fDst) throws IOException {
TreeContext dst = Generators.getInstance().getTree(fDst.getAbsolutePath());
Matcher matcher = Matchers.getInstance().getMatcher(src.getRoot(), dst.getRoot());
matcher.match();
src.importTypeLabels(dst);
diffs = new HtmlDiffs(fSrc, fDst, src, dst, matcher);
diffs.produce();
}
Expand Down
1 change: 1 addition & 0 deletions client.diff/src/main/java/com/github/gumtreediff/client/diff/web/ScriptView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public ScriptView(File fSrc, File fDst) throws IOException {
dst = Generators.getInstance().getTree(fDst.getAbsolutePath());
Matcher matcher = Matchers.getInstance().getMatcher(src.getRoot(), dst.getRoot());
matcher.match();
src.importTypeLabels(dst);
mappings = matcher.getMappings();
ActionGenerator g = new ActionGenerator(src.getRoot(), dst.getRoot(), mappings);
g.generate();
Expand Down
8 changes: 8 additions & 0 deletions core/src/main/java/com/github/gumtreediff/tree/TreeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,14 @@ else if (!typeLabel.equals(name))
throw new RuntimeException(String.format("Redefining type %d: '%s' with '%s'", type, typeLabel, name));
}

public void importTypeLabels(TreeContext ctx) {
for (Map.Entry<Integer, String> label : ctx.typeLabels.entrySet()) {
if (!typeLabels.containsValue(label.getValue())) {
typeLabels.put(label.getKey(), label.getValue());
}
}
}

public ITree createTree(int type, String label, String typeLabel) {
registerTypeLabel(type, typeLabel);
return new Tree(type, label);
Expand Down