Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: cderoove/exapus
base: 41825f62b5
...
head fork: cderoove/exapus
compare: acaeb2fa31
  • 2 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
View
2  ExapusRAP/src/exapus/gui/editors/forest/tree/ForestTreeLabelProviders.java
@@ -115,6 +115,8 @@ public String getText(Object element) {
return packageTree.getName().toString() + ":" + in.getReferencingName().toString();
}
*/
+
+ return in.getReferencingName().toString();
}
return null;
}
View
5 ExapusRAP/src/exapus/model/forest/InboundFactForest.java
@@ -10,12 +10,13 @@
public class InboundFactForest extends FactForest {
+ public static UqName DEFAULT_TREE_NAME = new UqName("<Untagged>");
+
private PackageTree root;
public InboundFactForest(ExapusModel m) {
super(m, Direction.INBOUND);
- UqName rootName = new UqName("<Untagged>");
- root = new PackageTree(rootName);
+ root = new PackageTree(DEFAULT_TREE_NAME);
addPackageTree(root);
}
View
18 ExapusRAP/src/exapus/model/view/evaluator/APICentricTaggingSelectionVisitor.java
@@ -63,6 +63,8 @@ public boolean apply(Selection selection) {
@Override
public boolean visitInboundReference(final InboundRef inboundRef) {
FactForest forestCopy = getCopy();
+ PackageTree untaggedTree = forestCopy.getPackageTree(InboundFactForest.DEFAULT_TREE_NAME);
+
for(Selection selection : selections) {
//have to match all selection as they can each copy the ref to a different packagetree
if(selection.matchRef(inboundRef)
@@ -72,17 +74,15 @@ public boolean apply(Selection selection) {
return selection.matchRef(inboundRef.getDual());
}
})) {
- if(selection.hasTag()) {
- PackageTree tagTree = forestCopy.getOrAddPackageTree(new UqName(selection.getTagString()));
- tagTree.copyReference(inboundRef);
- return false;
- } else {
- PackageTree untaggedTree = forestCopy.getOrAddPackageTree(new UqName("<Untagged>"));
- untaggedTree.copyReference(inboundRef);
- return true;
+ PackageTree destinationTree;
+ if(selection.hasTag())
+ destinationTree = forestCopy.getOrAddPackageTree(new UqName(selection.getTagString()));
+ else
+ destinationTree = untaggedTree;
+ destinationTree.copyReference(inboundRef);
+ return true;
}
}
- }
return false;
}

No commit comments for this range

Something went wrong with that request. Please try again.