output.. = target/classes/
bin.includes = META-INF/,\
.,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
+++ /dev/null
-package org.argeo.jcr.ui.explorer.browser;
-
-import javax.jcr.Session;
-
-import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
-import org.argeo.jcr.JcrUtils;
-
-public class HomeContentProvider extends SimpleNodeContentProvider {
-
- public HomeContentProvider(Session session) {
- super(session, new String[] { JcrUtils.getUserHomePath(session) });
- }
-
-}
import javax.jcr.Node;
import javax.jcr.Session;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.argeo.eclipse.ui.TreeParent;
import org.argeo.jcr.ArgeoJcrConstants;
import org.argeo.jcr.JcrUtils;
*
*/
public class NodeContentProvider implements ITreeContentProvider {
- private final static Log log = LogFactory.getLog(NodeContentProvider.class);
+ // private final static Log log =
+ // LogFactory.getLog(NodeContentProvider.class);
// Business Objects
final private RepositoryRegister repositoryRegister;
final private JcrKeyring jcrKeyring;
final private boolean sortChildren;
+ // reference for cleaning
+ private SingleJcrNode homeNode = null;
+ private RepositoriesNode repositoriesNode = null;
+
// Utils
private TreeObjectsComparator itemComparator = new TreeObjectsComparator();
this.sortChildren = sortChildren;
}
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ if (userSession != null) {
+ Node userHome = JcrUtils.getUserHome(userSession);
+ if (userHome != null) {
+ // TODO : find a way to dynamically get alias for the node
+ if (homeNode != null)
+ homeNode.dispose();
+ homeNode = new SingleJcrNode(null, userHome,
+ userSession.getUserID(), ArgeoJcrConstants.ALIAS_NODE);
+ }
+ }
+ if (repositoryRegister != null) {
+ if (repositoriesNode != null)
+ repositoriesNode.dispose();
+ repositoriesNode = new RepositoriesNode("Repositories",
+ repositoryRegister, null, jcrKeyring);
+ }
+ }
+
/**
* Sends back the first level of the Tree. Independent from inputElement
* that can be null
*/
public Object[] getElements(Object inputElement) {
List<Object> objs = new ArrayList<Object>();
- if (userSession != null) {
- Node userHome = JcrUtils.getUserHome(userSession);
- if (userHome != null)
- // TODO : find a way to dynamically get alias for the node
- objs.add(new SingleJcrNode(null, userHome, userSession
- .getUserID(), ArgeoJcrConstants.ALIAS_NODE));
- }
- if (repositoryRegister != null)
- objs.add(new RepositoriesNode("Repositories", repositoryRegister,
- null, jcrKeyring));
+ if (homeNode != null)
+ objs.add(homeNode);
+ if (repositoriesNode != null)
+ objs.add(repositoriesNode);
return objs.toArray();
}
}
public void dispose() {
+ if (homeNode != null)
+ homeNode.dispose();
+ if (repositoriesNode != null) {
+ // logs out open sessions
+ // see https://bugzilla.argeo.org/show_bug.cgi?id=23
+ repositoriesNode.dispose();
+ }
}
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
}
import org.eclipse.ui.forms.editor.FormEditor;
/**
- *
* Container for the node editor page. At creation time, it takes a JCR Node
* that cannot be changed afterwards.
- *
*/
public class GenericNodeEditor extends FormEditor {
private Node currentNode;
- private GenericNodePage genericNodePage;
private GenericPropertyPage genericPropertyPage;
private ChildNodesPage childNodesPage;
private NodeRightsManagementPage nodeRightsManagementPage;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
import org.argeo.jcr.ui.explorer.JcrExplorerConstants;
import org.argeo.jcr.ui.explorer.JcrExplorerPlugin;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
import org.eclipse.ui.forms.editor.FormPage;
-import org.eclipse.ui.forms.widgets.FormToolkit;
import org.eclipse.ui.forms.widgets.ScrolledForm;
/**
public class GenericPropertyPage extends FormPage implements
JcrExplorerConstants {
- private final static Log log = LogFactory.getLog(GenericPropertyPage.class);
-
- // local constants
- private final static String JCR_PROPERTY_NAME = "jcr:name";
+ // private final static Log log =
+ // LogFactory.getLog(GenericPropertyPage.class);
// Main business Objects
private Node currentNode;
- // This page widgets
- private FormToolkit tk;
- private TreeViewer complexTree;
-
public GenericPropertyPage(FormEditor editor, String title, Node currentNode) {
super(editor, "id", title);
this.currentNode = currentNode;
}
protected void createFormContent(IManagedForm managedForm) {
- tk = managedForm.getToolkit();
ScrolledForm form = managedForm.getForm();
- form.setText(JcrExplorerPlugin
- .getMessage("genericNodePageTitle"));
+ form.setText(JcrExplorerPlugin.getMessage("genericNodePageTitle"));
FillLayout layout = new FillLayout();
layout.marginHeight = 5;
layout.marginWidth = 5;
form.getBody().setLayout(layout);
- complexTree = createComplexTree(form.getBody());
+ createComplexTree(form.getBody());
// TODO remove following
// createPropertiesPart(form.getBody());
* keeps a reference to its parent {@link RepositoryNode}, to be able to
* retrieve alias of the current used repository
*/
-
public class WorkspaceNode extends TreeParent implements EventListener, UiNode {
private Session session = null;
}
}
+ @Override
+ public synchronized void dispose() {
+ logout();
+ super.dispose();
+ }
+
+ /** Logouts the session, does not nothing if there is no live session. */
public void logout() {
try {
if (session != null && session.isLive()) {
import javax.jcr.Property;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
-import javax.jcr.Session;
import javax.jcr.Value;
import javax.jcr.observation.Event;
import javax.jcr.observation.EventListener;
public void createPartControl(Composite parent) {
// look for session
- Session nodeSession = jcrKeyring != null ? jcrKeyring.getSession()
- : null;
+ // Session nodeSession = jcrKeyring != null ? jcrKeyring.getSession()
+ // : null;
// if (nodeSession == null) {
// Repository nodeRepository = JcrUtils.getRepositoryByAlias(
// repositoryRegister, ArgeoJcrConstants.ALIAS_NODE);
// try {
// nodeSession = nodeRepository.login();
// // TODO : enhance that to enable multirepository listener.
- // session = nodeSession;
// } catch (RepositoryException e1) {
// throw new ArgeoException("Cannot login to node repository");
// }
return propertiesViewer;
}
+ @Override
+ public void dispose() {
+ super.dispose();
+ }
+
@Override
protected TreeViewer getNodeViewer() {
return nodesViewer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.dialogs.Error;
+import org.argeo.eclipse.ui.ErrorFeedback;
import org.argeo.eclipse.ui.specific.ImportToServerWizardPage;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
final String objectPath = importPage.getObjectPath();
// We do not display a progress bar for one file only
- if (importPage.FILE_ITEM_TYPE.equals(objectType)) {
+ if (ImportToServerWizardPage.FILE_ITEM_TYPE.equals(objectType)) {
// In Rap we must force the "real" upload of the file
importPage.performFinish();
try {
return false;
}
return true;
- } else if (importPage.FOLDER_ITEM_TYPE.equals(objectType)) {
+ } else if (ImportToServerWizardPage.FOLDER_ITEM_TYPE.equals(objectType)) {
if (objectPath == null || !new File(objectPath).exists()) {
- Error.show("Directory " + objectPath + " does not exist");
+ ErrorFeedback.show("Directory " + objectPath + " does not exist");
return false;
}
}
});
} catch (Exception e) {
- Error.show("Cannot import " + objectPath, e);
+ ErrorFeedback.show("Cannot import " + objectPath, e);
failed = true;
}
projects / lgpl / argeo-commons.git / commitdiff