From 9c1c48ccfd6912deac1bde4afeaa24c88f257743 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Tue, 16 Nov 2010 18:07:32 +0000 Subject: [PATCH] Finalise excel support for windows git-svn-id: https://svn.argeo.org/slc/trunk@3905 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../org.argeo.slc.demo.log4j/log4j.properties | 2 ++ .../ui/commands/ResultDetailsDisplayHandler.java | 2 +- .../argeo/slc/client/ui/views/ResultListView.java | 15 +++++++++++---- pom.xml | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties index eebe65485..f91d5ae0c 100644 --- a/demo/site/org.argeo.slc.demo.log4j/log4j.properties +++ b/demo/site/org.argeo.slc.demo.log4j/log4j.properties @@ -6,6 +6,8 @@ log4j.logger.org.argeo.security.mvc.ArgeoRememberMeServices=WARN log4j.logger.org.argeo.slc.client=TRACE +# Sparta Logger, if needed +#log4j.logger.com.capco.sparta.excel=TRACE log4j.logger.org.hibernate=WARN #log4j.logger.org.hibernate.jdbc=DEBUG diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ResultDetailsDisplayHandler.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ResultDetailsDisplayHandler.java index 7fb71bea9..fc82ddaaf 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ResultDetailsDisplayHandler.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ResultDetailsDisplayHandler.java @@ -33,7 +33,7 @@ public class ResultDetailsDisplayHandler extends AbstractHandler { ResultListView pbv = (ResultListView) HandlerUtil .getActiveWorkbenchWindow(event).getActivePage() .showView(ResultListView.ID); - uuid = pbv.getSelectedResult(); + uuid = pbv.getSelectedResult()[0]; } catch (PartInitException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java index 446548803..2e63d947e 100644 --- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java +++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java @@ -88,15 +88,22 @@ public class ResultListView extends ViewPart { return table; } - // TODO : Improve this method. - public String getSelectedResult() { + // TODO : Improve this methods. + public String[] getSelectedResult() { Object obj = ((IStructuredSelection) viewer.getSelection()) .getFirstElement(); + String[] attributes = new String[2]; + if (obj == null || !(obj instanceof ResultAttributes)) return null; - else - return ((ResultAttributes) obj).getUuid(); + else { + ResultAttributes ra = (ResultAttributes) obj; + attributes[0] = ra.getUuid(); + attributes[1] = (ra.getAttributes().get("testCase") == null) ? null + : ra.getAttributes().get("testCase"); + return attributes; + } } // View Specific inner class diff --git a/pom.xml b/pom.xml index 91b807c84..4d5a3bddd 100644 --- a/pom.xml +++ b/pom.xml @@ -27,9 +27,9 @@ runtime modules eclipse - dep server demo + dep integration-tests dist -- 2.39.2