Finalise excel support for windows

git-svn-id: https://svn.argeo.org/slc/trunk@3905 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/demo/site/org.argeo.slc.demo.log4j/log4j.properties b/demo/site/org.argeo.slc.demo.log4j/log4j.properties
index eebe65485b5fa6b733ab730158012d94b4ab0ac0..f91d5ae0c9216658ce46ffa51d663894e72a0b76 100644 (file)
--- 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 7fb71bea9162a77cea481dc76cae83db6c11be92..fc82ddaafd9152e5ca44bf9f7a512877c7b338e5 100644 (file)
--- 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 446548803ef3996e17fe1b982181b3e912a351cf..2e63d947e79c71446f5a6790fb110d98c46b63f8 100644 (file)
--- 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 91b807c848b94dd27d167c5ce9abbd10cb679125..4d5a3bddd083af665863ba000788f0fac5388cbc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,9 @@
                <module>runtime</module>
                <module>modules</module>
                <module>eclipse</module>
-               <module>dep</module>
                <module>server</module>
                <module>demo</module>
+               <module>dep</module>
                <module>integration-tests</module>
                <!-- <module>archetypes</module> -->
                <module>dist</module>