svn commit: r1596527 - /uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Author: degenaro
Date: Wed May 21 10:15:02 2014
New Revision: 1596527
URL: http://svn.apache.org/r1596527
Log:
UIMA-3825 DUCC Web Server (WS) needs to account for unusable memory
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java?rev=1596527r1=1596526r2=1596527view=diff
==
---
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/DuccMachinesData.java
Wed May 21 10:15:02 2014
@@ -229,13 +229,13 @@ public class DuccMachinesData {
nameToIpMap.put(machineName,ip.toString());
// mem: total
long nodeMemTotal = nodeMetrics.getNodeMemory().getMemTotal();
- logger.info(location, jobid, node: +machineName+
+memTotal: +nodeMemTotal);
+ logger.debug(location, jobid, node: +machineName+
+memTotal: +nodeMemTotal);
long lvalMemTotal = (long) ((1.0*nodeMemTotal)/(1024*1024)+0.5);
msi.memoryTotal = lvalMemTotal;
String memTotal = +lvalMemTotal/*+memUnits*/;
// mem: free
long nodeMemFree = nodeMetrics.getNodeMemory().getMemFree();
- logger.info(location, jobid, node: +machineName+ +memFree:
+nodeMemFree);
+ logger.debug(location, jobid, node: +machineName+
+memFree: +nodeMemFree);
long lvalMemFree = (long) ((1.0*nodeMemFree)/(1024*1024)+0.5);
String memFree = +lvalMemFree/*+memUnits*/;
// shares: total
svn commit: r1596532 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/rule/ main/java/org/apache/uima/ruta/rule/quantifier/ test/java/org/apache/uima/ruta/
Author: pkluegl
Date: Wed May 21 10:32:42 2014
New Revision: 1596532
URL: http://svn.apache.org/r1596532
Log:
UIMA-3820
- fixed several bugs for inner mark in greedy iteration
- added hotfix for failed match in greedy iteration in a wildcard lookahead -
should not revolve to successful match, but should end the lookahead
- added tests, one still fails (right to left matching)
Added:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
(with props)
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RuleMatch.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/MinMaxReluctant.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/PlusReluctant.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/QuestionReluctant.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/quantifier/StarReluctant.java
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java?rev=1596532r1=1596531r2=1596532view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElement.java
Wed May 21 10:32:42 2014
@@ -77,7 +77,7 @@ public class ComposedRuleElement extends
MapRuleMatch, ComposedRuleElementMatch ruleMatches = new
HashMapRuleMatch, ComposedRuleElementMatch();
for (RuleElement each : elements) {
ComposedRuleElementMatch extendedContainerMatch =
containerMatch.copy();
-RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
+RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch, true);
ComposedRuleElementMatch composedMatch =
createComposedMatch(extendedMatch,
extendedContainerMatch, stream);
ListRuleMatch startRuleMatches = each.startMatch(extendedMatch,
null, composedMatch,
@@ -185,7 +185,7 @@ public class ComposedRuleElement extends
MapRuleMatch, ComposedRuleElementMatch ruleMatches = new
HashMapRuleMatch, ComposedRuleElementMatch();
for (RuleElement each : elements) {
ComposedRuleElementMatch extendedContainerMatch =
containerMatch.copy();
-RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
+RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch,
after);
ComposedRuleElementMatch composedMatch =
createComposedMatch(extendedMatch,
extendedContainerMatch, stream);
ListRuleMatch continueRuleMatches = each.continueMatch(after,
annotation, extendedMatch,
@@ -218,7 +218,7 @@ public class ComposedRuleElement extends
MapRuleMatch, ComposedRuleElementMatch ruleMatches = new
HashMapRuleMatch, ComposedRuleElementMatch();
for (RuleElement each : elements) {
ComposedRuleElementMatch extendedContainerMatch =
containerMatch.copy();
-RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch);
+RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch,
after);
ComposedRuleElementMatch composedMatch =
createComposedMatch(extendedMatch,
extendedContainerMatch, stream);
ListRuleMatch continueRuleMatches = each.continueMatch(after,
annotation, extendedMatch,
@@ -412,8 +412,13 @@ public class ComposedRuleElement extends
parentContainerMatch, sideStepOrigin, entryPoint, stream,
crowd);
}
} else {
- result = fallback(after, failed, annotation, ruleMatch, ruleApply,
parentContainerMatch,
- sideStepOrigin, entryPoint, stream, crowd);
+ if (this.equals(entryPoint)) {
+// hotfix for UIMA-3820
+result.add(ruleMatch);
+ } else {
+result = fallback(after, failed, annotation, ruleMatch, ruleApply,
parentContainerMatch,
+sideStepOrigin, entryPoint, stream, crowd);
+ }
}
} else {
if (continueMatch) {
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
URL:
svn commit: r1596533 - /uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
Author: pkluegl
Date: Wed May 21 10:33:48 2014
New Revision: 1596533
URL: http://svn.apache.org/r1596533
Log:
UIMA-3820
- commented failing test for now
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java?rev=1596533r1=1596532r2=1596533view=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
Wed May 21 10:33:48 2014
@@ -33,37 +33,37 @@ import org.junit.Test;
public class MarkInGreedyComposedTest {
- @Test
- public void testWildCardFollowedByComposedReversed() {
-String document = 1 x f B e d B x c A b a A 1;
-String script = ;
-script += ( ( (SW{REGEXP(\x\)} SW ) #) {- T1} )+ @NUM;;
-CAS cas = null;
-try {
- cas = RutaTestUtils.getCAS(document);
- Ruta.apply(cas, script);
-} catch (Exception e) {
- e.printStackTrace();
-}
-
-Type t = null;
-AnnotationIndexAnnotationFS ai = null;
-FSIteratorAnnotationFS iterator = null;
-
-t = RutaTestUtils.getTestType(cas, 1);
-ai = cas.getAnnotationIndex(t);
-iterator = ai.iterator();
-//for (AnnotationFS a : ai) {
-// System.out.println(a.getCoveredText());
+// @Test
+// public void testWildCardFollowedByComposedReversed() {
+//String document = 1 x f B e d B x c A b a A 1;
+//String script = ;
+//script += ( ( (SW{REGEXP(\x\)} SW ) #) {- T1} )+ @NUM;;
+//CAS cas = null;
+//try {
+// cas = RutaTestUtils.getCAS(document);
+// Ruta.apply(cas, script);
+//} catch (Exception e) {
+// e.printStackTrace();
//}
-assertEquals(2, ai.size());
-assertEquals(x f B e d B, iterator.next().getCoveredText());
-assertEquals(x c A b a A, iterator.next().getCoveredText());
-
-if (cas != null) {
- cas.release();
-}
- }
+//
+//Type t = null;
+//AnnotationIndexAnnotationFS ai = null;
+//FSIteratorAnnotationFS iterator = null;
+//
+//t = RutaTestUtils.getTestType(cas, 1);
+//ai = cas.getAnnotationIndex(t);
+//iterator = ai.iterator();
+for (AnnotationFS a : ai) {
+ System.out.println(a.getCoveredText());
+}
+//assertEquals(2, ai.size());
+//assertEquals(x f B e d B, iterator.next().getCoveredText());
+//assertEquals(x c A b a A, iterator.next().getCoveredText());
+//
+//if (cas != null) {
+// cas.release();
+//}
+// }
@Test
public void testWildCardFollowedByComposed() {
svn commit: r1596558 - in /uima/ruta/trunk/ruta-core/src: main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java test/java/org/a
Author: pkluegl
Date: Wed May 21 12:30:41 2014
New Revision: 1596558
URL: http://svn.apache.org/r1596558
Log:
UIMA-3820
- fixed right-to-left matching
- added more tests
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java?rev=1596558r1=1596557r2=1596558view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/ComposedRuleElementMatch.java
Wed May 21 12:30:41 2014
@@ -209,12 +209,16 @@ public class ComposedRuleElementMatch ex
each.setContainerMatch(copy);
// really need to copy all?
boolean isCurrentOne = false;
-if (after counter == value.size() - 1) {
- isCurrentOne = true;
-}
-if (!after counter == 0) {
+if (counter == value.size() - 1) {
isCurrentOne = true;
}
+// should not be neccessary because empty matches are listed last
+// if (after counter == value.size() - 1) {
+// isCurrentOne = true;
+// }
+// if (!after counter == 0) {
+// isCurrentOne = true;
+// }
if (each instanceof ComposedRuleElementMatch isCurrentOne) {
newValue.add(((ComposedRuleElementMatch)
each).copy2(extendedContainerMatch, after));
} else {
Modified:
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java?rev=1596558r1=1596557r2=1596558view=diff
==
---
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
(original)
+++
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/WildCardRuleElement.java
Wed May 21 12:30:41 2014
@@ -124,14 +124,11 @@ public class WildCardRuleElement extends
AnnotationFS nextOne = annotation;
boolean doneHere = false;
while (!doneHere (nextOne = getNextPositionForComposed(cre, after,
nextOne, stream)) != null) {
-// RutaBasic endAnchor = stream.getEndAnchor(nextOne.getBegin());
-// RutaBasic anchor = stream.getAnchor(!after, nextOne);
int pointer = after ? nextOne.getBegin() : nextOne.getEnd();
RutaBasic anchor = stream.getAnchor(!after, pointer);
ComposedRuleElementMatch extendedContainerMatch = containerMatch.copy();
RuleMatch extendedMatch = ruleMatch.copy(extendedContainerMatch, after);
AnnotationFS coveredByWildCard = getCoveredByWildCard(after, annotation,
nextOne, stream);
-
doMatch(coveredByWildCard, extendedMatch, extendedContainerMatch,
annotation == null, stream,
crowd);
if (extendedMatch.matched()) {
Modified:
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java?rev=1596558r1=1596557r2=1596558view=diff
==
---
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
(original)
+++
uima/ruta/trunk/ruta-core/src/test/java/org/apache/uima/ruta/MarkInGreedyComposedTest.java
Wed May 21 12:30:41 2014
@@ -33,37 +33,65 @@ import org.junit.Test;
public class MarkInGreedyComposedTest {
-// @Test
-// public void testWildCardFollowedByComposedReversed() {
-//String document = 1 x f B e d B x c A b a A 1;
-//String script = ;
-//script += ( ( (SW{REGEXP(\x\)} SW ) #) {- T1} )+ @NUM;;
-//CAS cas = null;
-//try {
-// cas = RutaTestUtils.getCAS(document);
-// Ruta.apply(cas, script);
-//} catch (Exception e) {
-// e.printStackTrace();
-//}
-//
-//Type t = null;
-//AnnotationIndexAnnotationFS ai = null;
-//FSIteratorAnnotationFS iterator = null;
-//
-//t = RutaTestUtils.getTestType(cas, 1);
-//ai = cas.getAnnotationIndex(t);
-//iterator = ai.iterator();
-for (AnnotationFS a : ai) {
- System.out.println(a.getCoveredText());
-}
-//assertEquals(2, ai.size());
-//assertEquals(x f B e d B,
svn commit: r1596568 - in /uima/ruta/trunk: ruta-core-ext/src/main/java/org/apache/uima/ruta/block/ ruta-core-ext/src/test/java/org/apache/uima/ruta/block/ ruta-core/src/main/java/org/apache/uima/ruta
Author: pkluegl
Date: Wed May 21 13:06:36 2014
New Revision: 1596568
URL: http://svn.apache.org/r1596568
Log:
UIMA-3833
- added new extension: ONLYONCE block
- added test
- added ide extension
Added:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java
(with props)
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlockExtension.java
(with props)
uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyOnceBlockTest.java
(with props)
uima/ruta/trunk/ruta-ep-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlockIDEExtension.java
(with props)
Modified:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyFirstBlock.java
uima/ruta/trunk/ruta-core-ext/src/test/java/org/apache/uima/ruta/block/OnlyFirstBlockTest.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/RutaStream.java
uima/ruta/trunk/ruta-core/src/main/java/org/apache/uima/ruta/rule/RutaRuleElement.java
uima/ruta/trunk/ruta-ep-core-ext/plugin.xml
Modified:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyFirstBlock.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyFirstBlock.java?rev=1596568r1=1596567r2=1596568view=diff
==
---
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyFirstBlock.java
(original)
+++
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyFirstBlock.java
Wed May 21 13:06:36 2014
@@ -32,7 +32,6 @@ import org.apache.uima.ruta.rule.Abstrac
import org.apache.uima.ruta.rule.AbstractRuleMatch;
import org.apache.uima.ruta.rule.RuleApply;
import org.apache.uima.ruta.rule.RuleMatch;
-import org.apache.uima.ruta.rule.RutaRule;
import org.apache.uima.ruta.rule.RutaRuleElement;
import org.apache.uima.ruta.visitor.InferenceCrowd;
Added:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java?rev=1596568view=auto
==
---
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java
(added)
+++
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java
Wed May 21 13:06:36 2014
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.uima.ruta.block;
+
+import org.apache.uima.ruta.RutaBlock;
+import org.apache.uima.ruta.RutaScriptBlock;
+import org.apache.uima.ruta.RutaStream;
+import org.apache.uima.ruta.ScriptApply;
+import org.apache.uima.ruta.visitor.InferenceCrowd;
+
+/**
+ * A block construct in UIMA Ruta, in which each rule matches only once and
additional positions are
+ * skipped.
+ *
+ */
+public class OnlyOnceBlock extends RutaScriptBlock {
+
+ public OnlyOnceBlock(RutaBlock parent, String defaultNamespace) {
+super(null, null, null, parent, defaultNamespace);
+ }
+
+ @Override
+ public ScriptApply apply(RutaStream stream, InferenceCrowd crowd) {
+boolean oldSetting = stream.isOnlyOnce();
+stream.setOnlyOnce(true);
+ScriptApply result = super.apply(stream, crowd);
+stream.setOnlyOnce(oldSetting);
+return result;
+ }
+
+}
Propchange:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlock.java
--
svn:eol-style = native
Added:
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlockExtension.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlockExtension.java?rev=1596568view=auto
==
---
uima/ruta/trunk/ruta-core-ext/src/main/java/org/apache/uima/ruta/block/OnlyOnceBlockExtension.java
(added)
+++
svn commit: r1596576 - in /uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui: handlers/ views/ views/util/
Author: pkluegl
Date: Wed May 21 14:03:02 2014
New Revision: 1596576
URL: http://svn.apache.org/r1596576
Log:
UIMA-3782
- removed old state stuff of testing view
- started with memento for type lists, not yet correctly integrated
Removed:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/NextTestCaseHandler.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/PreviousTestCaseHandler.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/util/Caretaker.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/util/Memento.java
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RemoveTestsHandler.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestViewPage.java
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RemoveTestsHandler.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RemoveTestsHandler.java?rev=1596576r1=1596575r2=1596576view=diff
==
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RemoveTestsHandler.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RemoveTestsHandler.java
Wed May 21 14:03:02 2014
@@ -37,19 +37,14 @@ import org.eclipse.ui.handlers.HandlerUt
public class RemoveTestsHandler implements IHandler {
public void addHandlerListener(IHandlerListener handlerListener) {
-// TODO Auto-generated method stub
-
}
public void dispose() {
-// TODO Auto-generated method stub
-
}
public Object execute(ExecutionEvent event) throws ExecutionException {
TestPageBookView debugView = (TestPageBookView)
HandlerUtil.getActivePart(event);
TestViewPage activePage = (TestViewPage) debugView.getCurrentPage();
-activePage.saveState();
TableViewer viewer = activePage.getViewer();
List list = (List) viewer.getInput();
if (viewer.getSelection() == null) {
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java?rev=1596576r1=1596575r2=1596576view=diff
==
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/handlers/RerunActionHandler.java
Wed May 21 14:03:02 2014
@@ -145,7 +145,6 @@ public class RerunActionHandler implemen
// handle GUI
final TestPageBookView testPageView = (TestPageBookView)
HandlerUtil.getActivePart(event);
final TestViewPage debugPage = (TestViewPage)
testPageView.getCurrentPage();
- debugPage.saveState();
testPageView.showBusy(true);
// init variables
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java?rev=1596576r1=1596575r2=1596576view=diff
==
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestPageBookView.java
Wed May 21 14:03:02 2014
@@ -19,10 +19,14 @@
package org.apache.uima.ruta.testing.ui.views;
+import org.apache.uima.ruta.addons.RutaAddonsPlugin;
import org.eclipse.core.resources.IResource;
import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IViewSite;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PartInitException;
import org.eclipse.ui.part.EditorPart;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.IPage;
@@ -32,7 +36,8 @@ import org.eclipse.ui.part.PageBookView;
public class TestPageBookView extends PageBookView {
-
+ private IMemento memento;
+
public TestPageBookView() {
}
@@ -56,6 +61,7 @@ public class TestPageBookView extends Pa
TestViewPage testPage = new TestViewPage(r);
svn commit: r1596578 - /uima/ruta/trunk/ruta-ep-addons/plugin.xml
Author: pkluegl Date: Wed May 21 14:04:46 2014 New Revision: 1596578 URL: http://svn.apache.org/r1596578 Log: UIMA-3782 - removed commands of state stuff Modified: uima/ruta/trunk/ruta-ep-addons/plugin.xml Modified: uima/ruta/trunk/ruta-ep-addons/plugin.xml URL: http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/plugin.xml?rev=1596578r1=1596577r2=1596578view=diff == --- uima/ruta/trunk/ruta-ep-addons/plugin.xml (original) +++ uima/ruta/trunk/ruta-ep-addons/plugin.xml Wed May 21 14:04:46 2014 @@ -180,16 +180,6 @@ under the License. name=Rerun Command /command command - defaultHandler=org.apache.uima.ruta.testing.ui.handlers.NextTestCaseHandler -id=org.apache.uima.ruta.testing.nextTestCase -name=NextTestCase - /command - command - defaultHandler=org.apache.uima.ruta.testing.ui.handlers.PreviousTestCaseHandler -id=org.apache.uima.ruta.testing.PreviousTestCase -name=PreviousTestCase - /command - command defaultHandler=org.apache.uima.ruta.testing.ui.handlers.LoadFilesFromFolderHandler id=org.apache.uima.ruta.testing.LoadFolderCommand name=LoadFolderCommand
