From: Mathieu Baudier Date: Wed, 22 Sep 2010 15:39:20 +0000 (+0000) Subject: Remove dependency of client.rcp on client.ui X-Git-Tag: argeo-slc-2.1.7~1159 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=8d63b14238448a9d11481e4071eba9d20e161ae2;p=gpl%2Fargeo-slc.git Remove dependency of client.rcp on client.ui git-svn-id: https://svn.argeo.org/slc/trunk@3796 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF index ed9125eee..56d20f9cb 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF +++ b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/MANIFEST.MF @@ -8,9 +8,7 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Import-Package: org.argeo.slc.client.ui.services, - org.argeo.slc.client.ui.views, - org.argeo.slc.core.test.tree;version="0.13.0.SNAPSHOT-r3768", +Import-Package: org.argeo.slc.core.test.tree;version="0.13.0.SNAPSHOT-r3768", org.argeo.slc.execution;version="0.13.0.SNAPSHOT-r3770", org.argeo.slc.process;version="0.13.0.SNAPSHOT-r3770", org.argeo.slc.runtime;version="0.13.0.SNAPSHOT-r3770", diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml deleted file mode 100644 index b171bae91..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp-osgi.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml b/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml deleted file mode 100644 index e3cdd91ee..000000000 --- a/eclipse/plugins/org.argeo.slc.client.rcp/META-INF/spring/rcp.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml index 2df055019..41eb2daa3 100644 --- a/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml +++ b/eclipse/plugins/org.argeo.slc.client.rcp/plugin.xml @@ -59,6 +59,18 @@ name="Exit"> + + + + + + + + + + + + \ No newline at end of file diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java new file mode 100644 index 000000000..6189591cb --- /dev/null +++ b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/listeners/TestManagerServiceAdapter.java @@ -0,0 +1,100 @@ +package org.argeo.slc.client.ui.listeners; + +import org.argeo.slc.SlcException; +import org.argeo.slc.client.ui.ClientUiPlugin; +import org.argeo.slc.core.attachment.Attachment; +import org.argeo.slc.core.attachment.SimpleAttachment; +import org.argeo.slc.core.test.tree.TreeTestResult; +import org.argeo.slc.core.test.tree.TreeTestResultListener; +import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest; +import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; +import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; +import org.argeo.slc.msg.test.tree.ResultPartRequest; +import org.argeo.slc.services.TestManagerService; +import org.argeo.slc.test.TestResultPart; +import org.eclipse.ui.handlers.IHandlerService; + +/** In memory access to a test manager service */ +public class TestManagerServiceAdapter implements TreeTestResultListener { + // private static final Log log = LogFactory + // .getLog(TestManagerServiceAdapter.class); + + private Boolean onlyOnClose = false; + + private TestManagerService testManagerService; + + public void resultPartAdded(TreeTestResult testResult, + TestResultPart testResultPart) { + if (onlyOnClose) + return; + + if (testResult.getResultParts().size() == 1 + && testResult.getResultParts().values().iterator().next() + .getParts().size() == 1) { + CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( + testResult); + testManagerService.createTreeTestResult(req); + } else { + ResultPartRequest req = new ResultPartRequest(testResult); + testManagerService.addResultPart(req); + } + } + + public void close(TreeTestResult testResult) { + + if (onlyOnClose) { + CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( + testResult); + testManagerService.createTreeTestResult(req); + } else { + CloseTreeTestResultRequest req = new CloseTreeTestResultRequest( + testResult); + testManagerService.closeTreeTestResult(req); + } + + // TODO : clean this -> pb of thread && commandID hardCoded. + // We force the refresh of the list view. + ClientUiPlugin.getDefault().getWorkbench().getDisplay().syncExec( + new Runnable() { + public void run() { + IHandlerService handlerService = (IHandlerService) ClientUiPlugin + .getDefault().getWorkbench().getService( + IHandlerService.class); + try { + handlerService + .executeCommand( + "org.argeo.slc.client.ui.RefreshResultList", + null); + } catch (Exception e) { + e.printStackTrace(); + throw new SlcException( + "Problem while rendering result. " + + e.getMessage()); + } + } + } + + ); + + } + + public void addAttachment(TreeTestResult testResult, Attachment attachment) { + if (onlyOnClose) + return; + AddTreeTestResultAttachmentRequest req = new AddTreeTestResultAttachmentRequest(); + req.setResultUuid(testResult.getUuid()); + req.setAttachment((SimpleAttachment) attachment); + testManagerService.addAttachment(req); + + } + + /** Publishes the test result only when it gets closed. */ + public void setOnlyOnClose(Boolean onlyOnClose) { + this.onlyOnClose = onlyOnClose; + } + + public void setTestManagerService(TestManagerService testManagerService) { + this.testManagerService = testManagerService; + } + +} diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java b/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java deleted file mode 100644 index 15de03a1d..000000000 --- a/eclipse/plugins/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/services/TestManagerServiceAdapter.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.argeo.slc.client.ui.services; - -import org.argeo.slc.SlcException; -import org.argeo.slc.client.ui.ClientUiPlugin; -import org.argeo.slc.core.attachment.Attachment; -import org.argeo.slc.core.attachment.SimpleAttachment; -import org.argeo.slc.core.test.tree.TreeTestResult; -import org.argeo.slc.core.test.tree.TreeTestResultListener; -import org.argeo.slc.msg.test.tree.AddTreeTestResultAttachmentRequest; -import org.argeo.slc.msg.test.tree.CloseTreeTestResultRequest; -import org.argeo.slc.msg.test.tree.CreateTreeTestResultRequest; -import org.argeo.slc.msg.test.tree.ResultPartRequest; -import org.argeo.slc.services.TestManagerService; -import org.argeo.slc.test.TestResultPart; -import org.eclipse.ui.handlers.IHandlerService; - -/** In memory access to a test manager service */ -public class TestManagerServiceAdapter implements TreeTestResultListener { - // private static final Log log = LogFactory - // .getLog(TestManagerServiceAdapter.class); - - private Boolean onlyOnClose = false; - - private TestManagerService testManagerService; - - public void resultPartAdded(TreeTestResult testResult, - TestResultPart testResultPart) { - if (onlyOnClose) - return; - - if (testResult.getResultParts().size() == 1 - && testResult.getResultParts().values().iterator().next() - .getParts().size() == 1) { - CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( - testResult); - testManagerService.createTreeTestResult(req); - } else { - ResultPartRequest req = new ResultPartRequest(testResult); - testManagerService.addResultPart(req); - } - } - - public void close(TreeTestResult testResult) { - - if (onlyOnClose) { - CreateTreeTestResultRequest req = new CreateTreeTestResultRequest( - testResult); - testManagerService.createTreeTestResult(req); - } else { - CloseTreeTestResultRequest req = new CloseTreeTestResultRequest( - testResult); - testManagerService.closeTreeTestResult(req); - } - - // TODO : clean this -> pb of thread && commandID hardCoded. - // We force the refresh of the list view. - ClientUiPlugin.getDefault().getWorkbench().getDisplay().syncExec( - new Runnable() { - public void run() { - IHandlerService handlerService = (IHandlerService) ClientUiPlugin - .getDefault().getWorkbench().getService( - IHandlerService.class); - try { - handlerService - .executeCommand( - "org.argeo.slc.client.ui.RefreshResultList", - null); - } catch (Exception e) { - e.printStackTrace(); - throw new SlcException( - "Problem while rendering result. " - + e.getMessage()); - } - } - } - - ); - - } - - public void addAttachment(TreeTestResult testResult, Attachment attachment) { - if (onlyOnClose) - return; - AddTreeTestResultAttachmentRequest req = new AddTreeTestResultAttachmentRequest(); - req.setResultUuid(testResult.getUuid()); - req.setAttachment((SimpleAttachment) attachment); - testManagerService.addAttachment(req); - - } - - /** Publishes the test result only when it gets closed. */ - public void setOnlyOnClose(Boolean onlyOnClose) { - this.onlyOnClose = onlyOnClose; - } - - public void setTestManagerService(TestManagerService testManagerService) { - this.testManagerService = testManagerService; - } - -}