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=1596576&r1=1596575&r2=1596576&view=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=1596576&r1=1596575&r2=1596576&view=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=1596576&r1=1596575&r2=1596576&view=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);
initPage(testPage);
testPage.createControl(getPageBook());
+ testPage.restoreState(memento);
PageRec result = new PageRec(part, testPage);
return result;
}
@@ -64,7 +70,9 @@ public class TestPageBookView extends Pa
@Override
protected void doDestroyPage(IWorkbenchPart part, PageRec pageRecord) {
- pageRecord.page.dispose();
+ TestViewPage testViewPage = (TestViewPage)pageRecord.page;
+ testViewPage.saveState(memento);
+ testViewPage.dispose();
}
@Override
@@ -82,6 +90,12 @@ public class TestPageBookView extends Pa
}
@Override
+ public void init(IViewSite site, IMemento memento) throws PartInitException {
+ super.init(site, memento);
+ this.memento = memento;
+ }
+
+ @Override
protected boolean isImportant(IWorkbenchPart part) {
return
part.getSite().getId().equals("org.apache.uima.ruta.ide.ui.editor.RutaEditor");
}
Modified:
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestViewPage.java
URL:
http://svn.apache.org/viewvc/uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestViewPage.java?rev=1596576&r1=1596575&r2=1596576&view=diff
==============================================================================
---
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestViewPage.java
(original)
+++
uima/ruta/trunk/ruta-ep-addons/src/main/java/org/apache/uima/ruta/testing/ui/views/TestViewPage.java
Wed May 21 14:03:02 2014
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.uima.cas.CAS;
import org.apache.uima.ruta.addons.RutaAddonsPlugin;
import org.apache.uima.ruta.ide.core.builder.RutaProjectUtils;
@@ -35,7 +36,6 @@ import org.apache.uima.ruta.testing.ui.v
import org.apache.uima.ruta.testing.ui.views.fp.FalsePositiveView;
import org.apache.uima.ruta.testing.ui.views.tp.TruePositiveView;
import org.apache.uima.ruta.testing.ui.views.util.CASLoader;
-import org.apache.uima.ruta.testing.ui.views.util.Caretaker;
import org.apache.uima.ruta.testing.ui.views.util.EvalDataProcessor;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -66,16 +66,15 @@ import org.eclipse.swt.events.KeyAdapter
import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -85,8 +84,6 @@ import org.eclipse.ui.part.Page;
public class TestViewPage extends Page implements IPageBookViewPage {
- private Caretaker caretaker;
-
private Composite overlay;
private IResource script = null;
@@ -107,7 +104,6 @@ public class TestViewPage extends Page i
private ListLabelProvider labelProvider;
-
public TestViewPage(Composite parent, IResource scriptResource) {
this(scriptResource);
this.overlay = new Composite(parent, 0);
@@ -117,7 +113,6 @@ public class TestViewPage extends Page i
public TestViewPage(IResource scriptResource) {
super();
this.script = scriptResource;
- this.caretaker = new Caretaker();
}
@Override
@@ -330,9 +325,6 @@ public class TestViewPage extends Page i
}
table.setHeaderVisible(true);
table.setLinesVisible(true);
-
- caretaker = new Caretaker((ArrayList<TestCasData>) listviewer.getInput());
-
}
protected void openInCasEditor(IPath resultPath) {
@@ -410,24 +402,53 @@ public class TestViewPage extends Page i
}
}
- public Caretaker getCaretaker() {
- return this.caretaker;
+ public void saveState(IMemento memento) {
+ List<String> it = getIncludedTypes();
+ StringBuilder sb1 = new StringBuilder();
+ for (String each : it) {
+ sb1.append(each);
+ sb1.append(";");
+ }
+ List<String> et = getExcludedTypes();
+ StringBuilder sb2 = new StringBuilder();
+ for (String each : et) {
+ sb2.append(each);
+ sb2.append(";");
+ }
+ memento.createChild("includedTypes", sb1.toString());
+ memento.createChild("excludedTypes", sb2.toString());
}
- public void saveState() {
- if (listviewer.getInput() != null) {
- caretaker.saveState(listviewer);
+ public void restoreState(IMemento memento) {
+ if (memento == null)
+ return;
+
+ IMemento itm = memento.getChild("includedTypes");
+ if (itm != null) {
+ String id = itm.getID();
+ String[] split = id.split("");
+ List<String> l = new ArrayList<String>();
+ for (String string : split) {
+ if (!StringUtils.isBlank(string)) {
+ l.add(string);
+ }
+ }
+ setIncludedTypes(l);
}
- }
- public void previousState() {
- ArrayList<TestCasData> stuff = (ArrayList<TestCasData>)
caretaker.getPreviousState();
- listviewer.setInput(stuff);
- }
+ IMemento etm = memento.getChild("excludedTypes");
+ if (etm != null) {
+ String id = etm.getID();
+ String[] split = id.split("");
+ List<String> l = new ArrayList<String>();
+ for (String string : split) {
+ if (!StringUtils.isBlank(string)) {
+ l.add(string);
+ }
+ }
+ setExcludedTypes(l);
+ }
- public void nextState() {
- listviewer.setInput(caretaker.getNextState());
- listviewer.refresh();
}
@Override
