bumping version

InteractiveFaultLocalization · May 14, 2021 · a94901f · a94901f
2 parents 2aecc3a + ff7765e
commit a94901f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 135 deletions.
diff --git a/...ot/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java b/...ot/bundles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/element/RuleElementUI.java
@@ -1,12 +1,10 @@
 package org.eclipse.sed.ifl.ide.gui.element;
 
-import org.eclipse.sed.ifl.control.score.SortingArg;
 import org.eclipse.sed.ifl.control.score.filter.BooleanRule;
 import org.eclipse.sed.ifl.control.score.filter.DoubleRule;
 import org.eclipse.sed.ifl.control.score.filter.LastActionRule;
 import org.eclipse.sed.ifl.control.score.filter.Rule;
 import org.eclipse.sed.ifl.control.score.filter.StringRule;
-import org.eclipse.sed.ifl.control.score.filter.SortRule;
 import org.eclipse.sed.ifl.ide.gui.icon.ScoreStatus;
 import org.eclipse.sed.ifl.util.event.INonGenericListenerCollection;
 import org.eclipse.sed.ifl.util.event.core.NonGenericListenerCollection;
@@ -113,24 +111,28 @@ protected void checkSubclass() {
 
 	private String setRuleValueLabelText() {
 		String rString = "";
-		String containsString = null;
+		String containsString = "contains ";
+		String negatedString = "";
+		if(this.rule.isNegated()) {
+			negatedString = "not ";
+		}
 		switch(this.rule.getDomain()) {
 		case "Score": rString = ((DoubleRule)this.rule).getRelation().concat(" ").concat(Double.toString(((DoubleRule)this.rule).getValue()));
 			icon = ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/rule_score_3.png");
 			break;
-		case "Name": containsString = ((StringRule)this.rule).isNegated() ? "not contains: " : "contains: ";
+		case "Name":
 			rString = containsString.concat(((StringRule)this.rule).getValue());
 			icon =  ((StringRule)this.rule).isNegated() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_no.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_yes.png");
 			break;
-		case "Signature": containsString = ((StringRule)this.rule).isNegated() ? "not contains: " : "contains: ";
+		case "Signature":
 			rString = containsString.concat(((StringRule)this.rule).getValue());
 			icon =  ((StringRule)this.rule).isNegated() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_no.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_yes.png");
 			break;
-		case "Parent type": containsString = ((StringRule)this.rule).isNegated() ? "not contains: " : "contains: ";
+		case "Parent type":
 			rString = containsString.concat(((StringRule)this.rule).getValue());
 			icon =  ((StringRule)this.rule).isNegated() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_no.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_yes.png");
 			break;
-		case "Path": containsString = ((StringRule)this.rule).isNegated() ? "not contains: " : "contains: ";
+		case "Path":
 			rString = containsString.concat(((StringRule)this.rule).getValue());
 			icon =  ((StringRule)this.rule).isNegated() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_no.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/containment_yes.png");
 			break;
@@ -141,7 +143,7 @@ private String setRuleValueLabelText() {
 			icon =  ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/context_size.png");;
 			break;
 		case "Interactivity": rString = ((BooleanRule)this.rule).isValue() == true ? "interactive" : "not interactive";
-			icon = ((BooleanRule)this.rule).isValue() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/false.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/true.png");
+			icon = ((BooleanRule)this.rule).isValue() ? ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/true.png") : ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/false.png");
 			break;
 		case "Last action": ScoreStatus status = ((LastActionRule)this.rule).getStatus();
 			if(status.equals(ScoreStatus.INCREASED))
@@ -152,18 +154,8 @@ private String setRuleValueLabelText() {
 					rString = "unchanged";
 			icon = ResourceManager.getPluginImage("org.eclipse.sed.ifl", ((LastActionRule)this.rule).getStatus().getIconPath());
 			break;
-		case "Sort": SortingArg arg = ((SortRule)this.rule).getArg();
-			String sortDomain = arg.getDomain();
-			if(arg.isDescending()) {
-				rString = sortDomain.concat(" descending");
-				icon = ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/down_arrow16.png");
-			} else if(!arg.isDescending()) {
-				rString = sortDomain.concat(" ascending");
-				icon = ResourceManager.getPluginImage("org.eclipse.sed.ifl", "icons/up_arrow16.png");
-			}
-			break;
 		}
-		return rString;
+		return negatedString.concat(rString);
 	}
 
 	public void setResultNumber(int resultNumber) {

diff --git a/...dles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/SortRuleCreator.java b/...dles/org.eclipse.sed.ifl/src/org/eclipse/sed/ifl/ide/gui/rulecreator/SortRuleCreator.java
diff --git a/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml b/org.eclipse.sed.ifl.root/features/org.eclipse.sed.ifl.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.sed.ifl.feature"
       label="iFL for Eclipse"
-      version="3.2.0.0"
+      version="3.3.0.0"
       provider-name="University of Szeged Department of Software Engineering">
 
    <description url="https://github.com/sed-szeged/iFL4Eclipse">

diff --git a/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml b/org.eclipse.sed.ifl.root/releng/org.eclipse.sed.ifl.update/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.eclipse.sed.ifl.feature_3.1.0.0.jar" id="org.eclipse.sed.ifl.feature" version="3.2.0.0">
+   <feature url="features/org.eclipse.sed.ifl.feature_3.1.0.0.jar" id="org.eclipse.sed.ifl.feature" version="3.3.0.0">
       <category name="iFL for Eclipse"/>
    </feature>
    <category-def name="iFL for Eclipse" label="iFL for Eclipse"/>