Adapt to changes in Commons

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

diff --git a/org.argeo.slc.client.ui.dist/pom.xml b/org.argeo.slc.client.ui.dist/pom.xml
index bb94b79460f2dce7a75e0777ab39a3e02024d3a6..8d865ae9dd25b87a557c44c8abb5d34285cc2b3a 100644 (file)
--- a/org.argeo.slc.client.ui.dist/pom.xml
+++ b/org.argeo.slc.client.ui.dist/pom.xml
@@ -17,11 +17,6 @@
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.cms.ui.workbench</artifactId>

diff --git a/org.argeo.slc.client.ui/pom.xml b/org.argeo.slc.client.ui/pom.xml
index c56121131cf070295209aabac8229df7982a62c3..c6d6592b91efddd5502b18e4b98568305e35d575 100644 (file)
--- a/org.argeo.slc.client.ui/pom.xml
+++ b/org.argeo.slc.client.ui/pom.xml
@@ -23,11 +23,6 @@
                        <artifactId>org.argeo.eclipse.ui</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons</groupId>
-                       <artifactId>org.argeo.eclipse.ui.workbench</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons</groupId>
                        <artifactId>org.argeo.eclipse.ui.rap</artifactId>

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java
index caf51cb550ea2bcd05a26a7e52ad27e89779069c..47a352131b96f3722d5d26e7667783f2471d5c04 100644 (file)
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/SlcExecutionPerspective.java
@@ -15,7 +15,6 @@
  */
 package org.argeo.slc.client.ui;
 
-import org.argeo.security.ui.SecurityUiPlugin;
 import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
@@ -38,7 +37,7 @@ public class SlcExecutionPerspective implements IPerspectiveFactory {
 
                IFolderLayout bottom = layout.createFolder("bottom",
                                IPageLayout.BOTTOM, 0.65f, editorArea);
-               bottom.addView(SecurityUiPlugin.PLUGIN_ID + ".logView");
+//             BOTTOM.ADDVIEW(SECURITYUIPLUGIN.PLUGIN_ID + ".LOGVIEW");
                bottom.addView(ClientUiPlugin.ID + ".jcrProcessListView");
        }
 }

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
index f6a20dc10194e23fc3b963b0609f2d6044083d66..8ab5c8f6f74dce185f458fff569cd6ccafdbd8d3 100644 (file)
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrProcessListView.java
@@ -65,6 +65,7 @@ public class JcrProcessListView extends ViewPart {
 
        private TableViewer viewer;
 
+       private Repository repository;
        private Session session;
 
        private EventListener processesObserver;
@@ -74,6 +75,12 @@ public class JcrProcessListView extends ViewPart {
        private Integer queryLimit = 2000;
 
        public void createPartControl(Composite parent) {
+               try {
+                       session = repository.login();
+               } catch (RepositoryException re) {
+                       throw new SlcException("Unable to log in Repository " + repository,
+                                       re);
+               }
                Table table = createTable(parent);
                viewer = new TableViewer(table);
                viewer.setLabelProvider(new LabelProvider());
@@ -241,11 +248,6 @@ public class JcrProcessListView extends ViewPart {
 
        }
 
-       @Deprecated
-       public void setSession(Session session) {
-               this.session = session;
-       }
-
        public void dispose() {
                JcrUtils.unregisterQuietly(session.getWorkspace(), processesObserver);
                JcrUtils.logoutQuietly(session);
@@ -253,12 +255,7 @@ public class JcrProcessListView extends ViewPart {
        }
 
        public void setRepository(Repository repository) {
-               try {
-                       session = repository.login();
-               } catch (RepositoryException re) {
-                       throw new SlcException("Unable to log in Repository " + repository,
-                                       re);
-               }
+               this.repository = repository;
        }
 
 }
\ No newline at end of file