You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2013/06/25 17:51:09 UTC
svn commit: r1496521 - in
/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta:
cde/ui/ConstraintSelectComposite.java query/ui/QueryComposite.java
Author: pkluegl
Date: Tue Jun 25 15:51:09 2013
New Revision: 1496521
URL: http://svn.apache.org/r1496521
Log:
no jira - fixed memento in cde view and check on null in query view
Modified:
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectComposite.java
uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectComposite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectComposite.java?rev=1496521&r1=1496520&r2=1496521&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectComposite.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/cde/ui/ConstraintSelectComposite.java Tue Jun 25 15:51:09 2013
@@ -25,6 +25,7 @@ import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.uima.ruta.addons.RutaAddonsPlugin;
import org.apache.uima.ruta.cde.IRutaConstraint;
import org.apache.uima.ruta.cde.RutaGEConstraint;
@@ -453,23 +454,26 @@ public class ConstraintSelectComposite e
IMemento currentMemento = memento.createChild("constraint", "SimpleRutaConstraint");
SimpleRutaRuleConstraint constraint = (SimpleRutaRuleConstraint) constraintData
.getConstraint();
- currentMemento.createChild("Rule", constraint.getData());
+ currentMemento.createChild("Data", constraint.getData());
currentMemento.createChild("Description", constraint.getDescription());
+ currentMemento.createChild("Weight", ""+constraintData.getWeight());
}
if (constraintData.getConstraint() instanceof RutaRuleListConstraint) {
IMemento currentMemento = memento.createChild("constraint", "ListRutaConstraint");
RutaRuleListConstraint constraint = (RutaRuleListConstraint) constraintData
.getConstraint();
- currentMemento.createChild("Rule", constraint.getData());
+ currentMemento.createChild("Data", constraint.getData());
currentMemento.createChild("Description", constraint.getDescription());
+ currentMemento.createChild("Weight", ""+constraintData.getWeight());
}
if (constraintData.getConstraint() instanceof RutaGEConstraint) {
IMemento currentMemento = memento.createChild("constraint", "GEConstraint");
RutaGEConstraint constraint = (RutaGEConstraint) constraintData.getConstraint();
- currentMemento.createChild("Rule", constraint.getData());
+ currentMemento.createChild("Data", constraint.getData());
currentMemento.createChild("Description", constraint.getDescription());
+ currentMemento.createChild("Weight", ""+constraintData.getWeight());
}
}
}
@@ -477,24 +481,36 @@ public class ConstraintSelectComposite e
public void restoreState(IMemento memento) {
for (IMemento constraintMemento : memento.getChildren("constraint")) {
if (constraintMemento.getID().equals("SimpleRutaConstraint")) {
- String rule = constraintMemento.getChild("Rule").getID();
+ String rule = constraintMemento.getChild("Data").getID();
String description = constraintMemento.getChild("Description").getID();
SimpleRutaRuleConstraint constraint = new SimpleRutaRuleConstraint(rule, description);
ConstraintData data = new ConstraintData(constraint);
+ String weightString = constraintMemento.getChild("Weight").getID();
+ if(!StringUtils.isBlank(weightString)) {
+ data.setWeight(Integer.parseInt(weightString));
+ }
constraintList.add(data);
}
if (constraintMemento.getID().equals("ListRutaConstraint")) {
- String rule = constraintMemento.getChild("Rule").getID();
+ String rule = constraintMemento.getChild("Data").getID();
String description = constraintMemento.getChild("Description").getID();
RutaRuleListConstraint constraint = new RutaRuleListConstraint(rule, description);
ConstraintData data = new ConstraintData(constraint);
+ String weightString = constraintMemento.getChild("Weight").getID();
+ if(!StringUtils.isBlank(weightString)) {
+ data.setWeight(Integer.parseInt(weightString));
+ }
constraintList.add(data);
}
if (constraintMemento.getID().equals("GEConstraint")) {
- String rule = constraintMemento.getChild("Rule").getID();
+ String rule = constraintMemento.getChild("Data").getID();
String description = constraintMemento.getChild("Description").getID();
RutaGEConstraint constraint = new RutaGEConstraint(rule, description);
ConstraintData data = new ConstraintData(constraint);
+ String weightString = constraintMemento.getChild("Weight").getID();
+ if(!StringUtils.isBlank(weightString)) {
+ data.setWeight(Integer.parseInt(weightString));
+ }
constraintList.add(data);
}
}
Modified: uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java?rev=1496521&r1=1496520&r2=1496521&view=diff
==============================================================================
--- uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java (original)
+++ uima/sandbox/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/query/ui/QueryComposite.java Tue Jun 25 15:51:09 2013
@@ -507,7 +507,7 @@ public class QueryComposite extends org.
if (editorInput instanceof FileEditorInput) {
FileEditorInput fei = (FileEditorInput) editorInput;
IFile file = fei.getFile();
- if (file.getLocationURI().equals(data.getFile().toURI())) {
+ if (data != null && file.getLocationURI().equals(data.getFile().toURI())) {
int begin = data.getBegin();
int end = data.getEnd();
ae.selectAndReveal(begin, end - begin);