From 1fecd5fe1c26bab769efa624d4ed4619101791a9 Mon Sep 17 00:00:00 2001 From: toby Date: Mon, 1 Aug 2016 14:55:10 -0400 Subject: [PATCH] add alternative labels in json output --- .../sugilite/communication/json/SugiliteFilterJSON.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/java/edu/cmu/hcii/sugilite/communication/json/SugiliteFilterJSON.java b/app/src/main/java/edu/cmu/hcii/sugilite/communication/json/SugiliteFilterJSON.java index fec8b8f7..098a8304 100644 --- a/app/src/main/java/edu/cmu/hcii/sugilite/communication/json/SugiliteFilterJSON.java +++ b/app/src/main/java/edu/cmu/hcii/sugilite/communication/json/SugiliteFilterJSON.java @@ -2,6 +2,10 @@ import android.graphics.Rect; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + import edu.cmu.hcii.sugilite.model.block.UIElementMatchingFilter; /** @@ -21,6 +25,8 @@ public SugiliteFilterJSON(UIElementMatchingFilter filter){ this.parentFilter = new SugiliteFilterJSON(filter.getParentFilter()); if(filter.getChildFilter() != null) this.childFilter = new SugiliteFilterJSON(filter.getChildFilter()); + if(filter.alternativeLabels != null && filter.alternativeLabels.size() > 0) + alternativeLabels = new HashSet<>(filter.alternativeLabels); } } public UIElementMatchingFilter toUIElementMatchingFilter(){ @@ -38,8 +44,11 @@ public UIElementMatchingFilter toUIElementMatchingFilter(){ filter.setParentFilter(parentFilter.toUIElementMatchingFilter()); if(childFilter != null) filter.setChildFilter(childFilter.toUIElementMatchingFilter()); + if(alternativeLabels != null) + filter.alternativeLabels = new HashSet<>(alternativeLabels); return filter; } public String text, contentDescription, viewId, packageName, className, boundsInScreen, boundsInParent; public SugiliteFilterJSON parentFilter, childFilter; + public Set> alternativeLabels; }