scope="prototype">
<property name="processController" ref="processController" />
<property name="modulesManager" ref="modulesManager" />
- <property name="session">
- <bean factory-bean="repository" factory-method="login" />
- </property>
+ <property name="repository" ref="repository" />
</bean>
</beans>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd">
-
- <bean id="session" class="org.argeo.jcr.spring.ThreadBoundSession">
- <property name="repository" ref="repository" />
- </bean>
-</beans>
<bean id="jcrExecutionModulesView" class="org.argeo.slc.client.ui.views.JcrExecutionModulesView"
scope="prototype">
- <property name="session" ref="session" />
+ <property name="repository" ref="repository" />
<property name="modulesManager" ref="modulesManager" />
</bean>
<bean id="jcrProcessListView" class="org.argeo.slc.client.ui.views.JcrProcessListView"
scope="prototype">
- <property name="session" ref="session" />
+ <property name="repository" ref="repository" />
</bean>
<bean id="jcrResultListView" class="org.argeo.slc.client.ui.views.JcrResultListView"
scope="prototype">
- <property name="session" ref="session" />
+ <property name="repository" ref="repository" />
</bean>
-</beans>
+ <bean id="jcrResultTreeView" class="org.argeo.slc.client.ui.views.JcrResultTreeView"
+ scope="prototype">
+ <property name="repository" ref="repository" />
+ </bean>
+
+</beans>
\ No newline at end of file
name="Results"
restorable="true">
</view>
+ <view
+ id="org.argeo.slc.client.ui.jcrResultTreeView"
+ class="org.argeo.eclipse.spring.SpringExtensionFactory"
+ icon="icons/results.gif"
+ name="Results"
+ restorable="true">
+ </view>
<view
id="org.argeo.slc.client.ui.jcrProcessListView"
class="org.argeo.eclipse.spring.SpringExtensionFactory"
IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT,
0.3f, editorArea);
left.addView(ClientUiPlugin.ID + ".jcrExecutionModulesView");
- left.addView(ClientUiPlugin.ID + ".jcrResultListView");
+ // left.addView(ClientUiPlugin.ID + ".jcrResultListView");
+ left.addView(ClientUiPlugin.ID + ".jcrResultTreeView");
// Sleak view for SWT resource debugging
// left.addView("org.eclipse.swt.tools.views.SleakView");
*/\r
package org.argeo.slc.client.ui.commands;\r
\r
-/*\r
- * Copyright (C) 2007-2012 Mathieu Baudier\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
import java.util.Iterator;\r
\r
import org.argeo.slc.client.ui.ClientUiPlugin;\r
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
@Override
public void dispose() {
JcrUtils.logoutQuietly(session);
+ super.dispose();
}
/** Actually runs the process. */
editorDirtyStateChanged();
} catch (RepositoryException e) {
throw new SlcException("Cannot save " + processNode, e);
- } finally {
- JcrUtils.discardQuietly(session);
+ // } finally {
+ // JcrUtils.discardQuietly(session);
}
}
// }
/** Expects one session per editor. */
+ @Deprecated
public void setSession(Session session) {
this.session = session;
}
+ public void setRepository(Repository repository) {
+ try {
+ session = repository.login();
+ } catch (RepositoryException re) {
+ throw new SlcException("Unable to log in Repository " + repository,
+ re);
+ }
+ }
+
public void setProcessController(ProcessController processController) {
this.processController = processController;
}
public void setModulesManager(ExecutionModulesManager modulesManager) {
this.modulesManager = modulesManager;
}
-
}
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.NodeType;
import org.argeo.eclipse.ui.jcr.NodeElementComparer;
import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
+import org.argeo.jcr.JcrUtils;
import org.argeo.slc.SlcException;
import org.argeo.slc.client.ui.ClientUiPlugin;
import org.argeo.slc.client.ui.SlcImages;
}
}
+ public void dispose() {
+ JcrUtils.logoutQuietly(session);
+ super.dispose();
+ }
+
// DEPENDENCY INJECTION
+
+ public void setModulesManager(ExecutionModulesManager modulesManager) {
+ this.modulesManager = modulesManager;
+ }
+
+ @Deprecated
public void setSession(Session session) {
this.session = session;
}
- public void setModulesManager(ExecutionModulesManager modulesManager) {
- this.modulesManager = modulesManager;
+ public void setRepository(Repository repository) {
+ try {
+ session = repository.login();
+ } catch (RepositoryException re) {
+ throw new SlcException("Unable to log in Repository " + repository,
+ re);
+ }
}
}
\ No newline at end of file
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.Property;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.observation.Event;
viewer.getControl().setFocus();
}
- @Override
- public void dispose() {
- JcrUtils.unregisterQuietly(session.getWorkspace(), processesObserver);
- super.dispose();
- }
-
class ContentProvider implements IStructuredContentProvider {
public Object[] getElements(Object inputElement) {
}
+ @Deprecated
public void setSession(Session session) {
this.session = session;
}
+ public void dispose() {
+ JcrUtils.unregisterQuietly(session.getWorkspace(), processesObserver);
+ JcrUtils.logoutQuietly(session);
+ super.dispose();
+ }
+
+ public void setRepository(Repository repository) {
+ try {
+ session = repository.login();
+ } catch (RepositoryException re) {
+ throw new SlcException("Unable to log in Repository " + repository,
+ re);
+ }
+ }
+
}
\ No newline at end of file
import javax.jcr.Node;
import javax.jcr.NodeIterator;
+import javax.jcr.Repository;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.observation.Event;
viewer.getControl().setFocus();
}
- @Override
- public void dispose() {
- JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
- super.dispose();
- }
-
class ViewContentProvider implements IStructuredContentProvider {
public Object[] getElements(Object inputElement) {
}
}
+ @Deprecated
public void setSession(Session session) {
this.session = session;
}
+
+ public void dispose() {
+ JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
+ JcrUtils.logoutQuietly(session);
+ super.dispose();
+ }
+
+ public void setRepository(Repository repository) {
+ try {
+ session = repository.login();
+ } catch (RepositoryException re) {
+ throw new SlcException("Unable to log in Repository " + repository,
+ re);
+ }
+ }
}
\ No newline at end of file
import javax.jcr.Node;\r
import javax.jcr.NodeIterator;\r
import javax.jcr.Property;\r
+import javax.jcr.Repository;\r
import javax.jcr.RepositoryException;\r
import javax.jcr.Session;\r
import javax.jcr.nodetype.NodeType;\r
}\r
\r
/* DEPENDENCY INJECTION */\r
+ @Deprecated\r
public void setSession(Session session) {\r
this.session = session;\r
}\r
+\r
+ public void dispose() {\r
+ // JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);\r
+ JcrUtils.logoutQuietly(session);\r
+ super.dispose();\r
+ }\r
+\r
+ public void setRepository(Repository repository) {\r
+ try {\r
+ session = repository.login();\r
+ } catch (RepositoryException re) {\r
+ throw new SlcException("Unable to log in Repository " + repository,\r
+ re);\r
+ }\r
+ }\r
}
\ No newline at end of file
projects / gpl / argeo-slc.git / commitdiff