From: Mathieu Baudier Date: Thu, 8 Sep 2011 12:16:23 +0000 (+0000) Subject: Code cleaning / documentation X-Git-Tag: argeo-commons-2.1.30~1159 X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=774e4da3fb247a95d327674045af5b5ab2a1a62a;p=lgpl%2Fargeo-commons.git Code cleaning / documentation Remote JCR git-svn-id: https://svn.argeo.org/commons/trunk@4736 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- diff --git a/demo/log4j.properties b/demo/log4j.properties index c4fba851e..b81332d45 100644 --- a/demo/log4j.properties +++ b/demo/log4j.properties @@ -6,6 +6,7 @@ log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=WARN log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN log4j.logger.org.apache.catalina=INFO +log4j.logger.org.apache.coyote=INFO log4j.logger.org.apache.directory.server=ERROR log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java index 03062e6af..487c2f629 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/AddFileFolder.java @@ -4,7 +4,7 @@ import javax.jcr.Node; import javax.jcr.RepositoryException; import javax.jcr.nodetype.NodeType; -import org.argeo.eclipse.ui.dialogs.Error; +import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.dialogs.SingleValue; import org.argeo.eclipse.ui.jcr.views.AbstractJcrBrowser; import org.eclipse.core.commands.AbstractHandler; @@ -14,6 +14,7 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; +/** Adds a node of type nt:folder */ public class AddFileFolder extends AbstractHandler { public Object execute(ExecutionEvent event) throws ExecutionException { @@ -36,12 +37,12 @@ public class AddFileFolder extends AbstractHandler { view.nodeAdded(parentNode, newNode); parentNode.getSession().save(); } catch (RepositoryException e) { - Error.show("Cannot create folder " + folderName + ErrorFeedback.show("Cannot create folder " + folderName + " under " + parentNode, e); } } } else { - Error.show("Can only add file folder to a node"); + ErrorFeedback.show("Can only add file folder to a node"); } } return null; diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNode.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNode.java index f7a99415f..4141375ce 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNode.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/commands/DeleteNode.java @@ -5,10 +5,8 @@ import java.util.Iterator; import javax.jcr.Node; import javax.jcr.RepositoryException; -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.jcr.views.AbstractJcrBrowser; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -19,8 +17,6 @@ import org.eclipse.ui.handlers.HandlerUtil; /** Deletes the selected nodes */ public class DeleteNode extends AbstractHandler { - private final static Log log = LogFactory.getLog(DeleteNode.class); - public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event) .getActivePage().getSelection(); @@ -46,7 +42,7 @@ public class DeleteNode extends AbstractHandler { if (ancestor != null) view.nodeRemoved(ancestor); } catch (Exception e) { - Error.show("Cannot delete node " + obj, e); + ErrorFeedback.show("Cannot delete node " + obj, e); } } return null; diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java index e395bcad9..462386e7b 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/editors/AbstractJcrQueryEditor.java @@ -235,7 +235,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { public Object[] getElements(Object inputElement) { if (inputElement instanceof List) - return ((List) inputElement).toArray(); + return ((List) inputElement).toArray(); // Never reached might be deleted in future release if (!(inputElement instanceof QueryResult)) diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java index 604151c6d..db19ab342 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/AbstractJcrBrowser.java @@ -15,18 +15,18 @@ public abstract class AbstractJcrBrowser extends ViewPart { public abstract void createPartControl(Composite parent); /** - * To be overidden to adapt size of form and result frames. + * To be overridden to adapt size of form and result frames. */ abstract protected int[] getWeights(); /** - * To be overidden to provide an adapted size nodeViewer + * To be overridden to provide an adapted size nodeViewer */ abstract protected TreeViewer createNodeViewer(Composite parent, ITreeContentProvider nodeContentProvider); /** - * To be overidden to retrieve the current nodeViewer + * To be overridden to retrieve the current nodeViewer */ abstract protected TreeViewer getNodeViewer(); diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java index 04971d155..0022f17d2 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java +++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/Error.java @@ -1,100 +1,17 @@ package org.argeo.eclipse.ui; -import java.io.PrintWriter; -import java.io.StringWriter; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.eclipse.jface.dialogs.IMessageProvider; -import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Point; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.PlatformUI; - -/** Generic error dialog to be used in try/catch blocks */ -public class Error extends TitleAreaDialog { - private final static Log log = LogFactory.getLog(Error.class); - private final String message; - private final Throwable exception; - - public static void show(String message, Throwable e) { - // rethrow ThreaDeath in order to make sure that RAP will properly clean - // up the UI thread - if (e instanceof ThreadDeath) - throw (ThreadDeath) e; - - new Error(getDisplay().getActiveShell(), message, e).open(); - } - - public static void show(String message) { - new Error(getDisplay().getActiveShell(), message, null).open(); - } - - /** Tries to find a display */ - private static Display getDisplay() { - try { - Display display = PlatformUI.getWorkbench().getDisplay(); - if (display != null) - return display; - else - return Display.getDefault(); - } catch (Exception e) { - return Display.getCurrent(); - } - } +/** + * @deprecated deprecated because of poor naming, use {@link ErrorFeedback} + * instead + */ +@Deprecated +public class Error extends ErrorFeedback { public Error(Shell parentShell, String message, Throwable e) { - super(parentShell); - this.message = message; - this.exception = e; - log.error(message, e); - } - - protected Point getInitialSize() { - if (exception != null) - return new Point(800, 600); - else - return new Point(400, 300); - } - - @Override - protected Control createDialogArea(Composite parent) { - Composite dialogarea = (Composite) super.createDialogArea(parent); - dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - Composite composite = new Composite(dialogarea, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); - composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - - setMessage(message != null ? message - + (exception != null ? ": " + exception.getMessage() : "") - : exception != null ? exception.getMessage() : "Unkown Error", - IMessageProvider.ERROR); - - if (exception != null) { - Text stack = new Text(composite, SWT.MULTI | SWT.LEAD | SWT.BORDER - | SWT.V_SCROLL | SWT.H_SCROLL); - stack.setEditable(false); - stack.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); - StringWriter sw = new StringWriter(); - exception.printStackTrace(new PrintWriter(sw)); - stack.setText(sw.toString()); - } - - parent.pack(); - return composite; - } - - protected void configureShell(Shell shell) { - super.configureShell(shell); - shell.setText("Error"); + super(parentShell, message, e); + // TODO Auto-generated constructor stub } } diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java new file mode 100644 index 000000000..bdbf64234 --- /dev/null +++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/ErrorFeedback.java @@ -0,0 +1,100 @@ +package org.argeo.eclipse.ui; + +import java.io.PrintWriter; +import java.io.StringWriter; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.eclipse.jface.dialogs.IMessageProvider; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PlatformUI; + +/** Generic error dialog to be used in try/catch blocks */ +public class ErrorFeedback extends TitleAreaDialog { + private final static Log log = LogFactory.getLog(ErrorFeedback.class); + + private final String message; + private final Throwable exception; + + public static void show(String message, Throwable e) { + // rethrow ThreaDeath in order to make sure that RAP will properly clean + // up the UI thread + if (e instanceof ThreadDeath) + throw (ThreadDeath) e; + + new ErrorFeedback(getDisplay().getActiveShell(), message, e).open(); + } + + public static void show(String message) { + new ErrorFeedback(getDisplay().getActiveShell(), message, null).open(); + } + + /** Tries to find a display */ + private static Display getDisplay() { + try { + Display display = PlatformUI.getWorkbench().getDisplay(); + if (display != null) + return display; + else + return Display.getDefault(); + } catch (Exception e) { + return Display.getCurrent(); + } + } + + public ErrorFeedback(Shell parentShell, String message, Throwable e) { + super(parentShell); + this.message = message; + this.exception = e; + log.error(message, e); + } + + protected Point getInitialSize() { + if (exception != null) + return new Point(800, 600); + else + return new Point(400, 300); + } + + @Override + protected Control createDialogArea(Composite parent) { + Composite dialogarea = (Composite) super.createDialogArea(parent); + dialogarea.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + Composite composite = new Composite(dialogarea, SWT.NONE); + composite.setLayout(new GridLayout(2, false)); + composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + setMessage(message != null ? message + + (exception != null ? ": " + exception.getMessage() : "") + : exception != null ? exception.getMessage() : "Unkown Error", + IMessageProvider.ERROR); + + if (exception != null) { + Text stack = new Text(composite, SWT.MULTI | SWT.LEAD | SWT.BORDER + | SWT.V_SCROLL | SWT.H_SCROLL); + stack.setEditable(false); + stack.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + StringWriter sw = new StringWriter(); + exception.printStackTrace(new PrintWriter(sw)); + stack.setText(sw.toString()); + } + + parent.pack(); + return composite; + } + + protected void configureShell(Shell shell) { + super.configureShell(shell); + shell.setText("Error"); + } + +} diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java index 75a4318b7..52a351f83 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java +++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/Error.java @@ -5,9 +5,9 @@ import org.eclipse.swt.widgets.Shell; /** * Generic error dialog to be used in try/catch blocks * - * @deprecated use {@link org.argeo.eclipse.ui.Error} instead. + * @deprecated use {@link org.argeo.eclipse.ui.ErrorFeedback} instead. */ -public class Error extends org.argeo.eclipse.ui.Error { +public class Error extends org.argeo.eclipse.ui.ErrorFeedback { public Error(Shell parentShell, String message, Throwable e) { super(parentShell, message, e); } diff --git a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java index c15a76736..4b5068ca2 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java +++ b/eclipse/runtime/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/ui/dialogs/SingleValue.java @@ -72,6 +72,7 @@ public class SingleValue extends TitleAreaDialog { valueT = createLT(composite, label); setMessage(message, IMessageProvider.NONE); + parent.pack(); return composite; } diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java index 9544698d5..943a00e30 100644 --- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java +++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/dialogs/ChangePasswordDialog.java @@ -1,7 +1,7 @@ package org.argeo.security.ui.dialogs; import org.argeo.ArgeoException; -import org.argeo.eclipse.ui.Error; +import org.argeo.eclipse.ui.ErrorFeedback; import org.eclipse.jface.dialogs.IMessageProvider; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.swt.SWT; @@ -54,7 +54,7 @@ public class ChangePasswordDialog extends TitleAreaDialog { newPassword1.getText()); close(); } catch (Exception e) { - Error.show("Cannot change password", e); + ErrorFeedback.show("Cannot change password", e); } } diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF index 869e0a2aa..e67562c11 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF +++ b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Import-Package: javax.jcr, org.argeo, org.argeo.eclipse.spring, org.argeo.eclipse.ui, + org.argeo.eclipse.ui.dialogs, org.argeo.eclipse.ui.jcr, org.argeo.eclipse.ui.jcr.commands, org.argeo.eclipse.ui.jcr.editors, diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml index 16f4adfa6..0a6e9b68d 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/commands.xml @@ -16,6 +16,12 @@ scope="prototype"> + + + + + diff --git a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml index 0d0e37ec0..0aa6ff3a3 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/META-INF/spring/osgi.xml @@ -8,8 +8,12 @@ http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" osgi:default-timeout="30000"> - + + + + \ No newline at end of file diff --git a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml index 933aad083..8521924ae 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml +++ b/server/plugins/org.argeo.jcr.ui.explorer/plugin.xml @@ -56,6 +56,15 @@ name="Node path"> + + + + + + + + params = new Hashtable(); + params.put(ArgeoJcrConstants.JCR_REPOSITORY_URI, uri); + // by default we use the URI as alias + params.put(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS, uri); + Repository repository = repositoryFactory.getRepository(params); + bundleContext.registerService(Repository.class.getName(), + repository, params); + } catch (Exception e) { + ErrorFeedback.show("Cannot add remote repository " + uri, e); + } + return null; + } + + public void setRepositoryFactory(RepositoryFactory repositoryFactory) { + this.repositoryFactory = repositoryFactory; + } + + public void setBundleContext(BundleContext bundleContext) { + this.bundleContext = bundleContext; + } + +} diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java index 16bb1b36d..2f82dc2b4 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java +++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/EditNode.java @@ -6,7 +6,7 @@ import java.util.Map; import javax.jcr.Property; import javax.jcr.nodetype.NodeType; -import org.argeo.eclipse.ui.dialogs.Error; +import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.jcr.editors.NodeEditorInput; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; @@ -40,7 +40,7 @@ public class EditNode extends AbstractHandler { HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() .openEditor(nei, editorId); } catch (PartInitException e) { - Error.show("Cannot open " + editorId + " with " + path + ErrorFeedback.show("Cannot open " + editorId + " with " + path + " of type " + type, e); } // TODO Auto-generated method stub diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java index 12880bad0..e52694a1c 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java +++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/ImportFileSystem.java @@ -2,9 +2,7 @@ package org.argeo.jcr.ui.explorer.commands; import javax.jcr.Node; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.argeo.eclipse.ui.dialogs.Error; +import org.argeo.eclipse.ui.ErrorFeedback; import org.argeo.eclipse.ui.jcr.views.AbstractJcrBrowser; import org.argeo.jcr.ui.explorer.wizards.ImportFileSystemWizard; import org.eclipse.core.commands.AbstractHandler; @@ -15,9 +13,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.ui.handlers.HandlerUtil; +/** Import a local file system directory tree. */ public class ImportFileSystem extends AbstractHandler { - private static Log log = LogFactory.getLog(ImportFileSystem.class); - public Object execute(ExecutionEvent event) throws ExecutionException { ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event) .getActivePage().getSelection(); @@ -30,11 +27,6 @@ public class ImportFileSystem extends AbstractHandler { try { if (obj instanceof Node) { Node folder = (Node) obj; - // if (!folder.getPrimaryNodeType().getName() - // .equals(NodeType.NT_FOLDER)) { - // Error.show("Can only import to a folder node"); - // return null; - // } ImportFileSystemWizard wizard = new ImportFileSystemWizard( folder); WizardDialog dialog = new WizardDialog( @@ -42,10 +34,10 @@ public class ImportFileSystem extends AbstractHandler { dialog.open(); view.refresh(folder); } else { - Error.show("Can only import to a node"); + ErrorFeedback.show("Can only import to a node"); } } catch (Exception e) { - Error.show("Cannot import files to " + obj, e); + ErrorFeedback.show("Cannot import files to " + obj, e); } } return null; diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java index 63d53fa3f..076e207c6 100644 --- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java +++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/commands/OpenGenericNodeEditor.java @@ -1,23 +1,20 @@ package org.argeo.jcr.ui.explorer.commands; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.jcr.editors.NodeEditorInput; +import org.argeo.jcr.ui.explorer.JcrExplorerConstants; import org.argeo.jcr.ui.explorer.editors.GenericNodeEditor; import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.handlers.HandlerUtil; +/** Opens the generic node editor. */ public class OpenGenericNodeEditor extends AbstractHandler { - private final static Log log = LogFactory - .getLog(OpenGenericNodeEditor.class); public final static String ID = "org.argeo.jcr.ui.explorer.openGenericNodeEditor"; - public final static String PARAM_PATH = "org.argeo.jcr.ui.explorer.nodePath"; public Object execute(ExecutionEvent event) throws ExecutionException { - String path = event.getParameter(PARAM_PATH); + String path = event.getParameter(JcrExplorerConstants.PARAM_PATH); try { NodeEditorInput nei = new NodeEditorInput(path); HandlerUtil.getActiveWorkbenchWindow(event).getActivePage() diff --git a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java index 9f2926cb3..bcf02a3c1 100644 --- a/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java +++ b/server/runtime/org.argeo.server.jackrabbit/src/main/java/org/argeo/jackrabbit/JackrabbitRepositoryFactory.java @@ -26,21 +26,23 @@ public class JackrabbitRepositoryFactory extends DefaultRepositoryFactory if (repository != null) return repository; - if (parameters.containsKey(JCR_REPOSITORY_URI)) { - String uri = parameters.get(JCR_REPOSITORY_URI).toString(); - Map params = new HashMap(); - - params.put(JcrUtils.REPOSITORY_URI, uri); - repository = new Jcr2davRepositoryFactory().getRepository(params); - if (repository == null) - throw new ArgeoException("Remote Davex repository " + uri - + " not found"); - log.info("Initialized remote Jackrabbit repository " + repository - + " from uri " + uri); - - } + String uri; + if (parameters.containsKey(JCR_REPOSITORY_URI)) + uri = parameters.get(JCR_REPOSITORY_URI).toString(); + else if (parameters.containsKey(JcrUtils.REPOSITORY_URI)) + uri = parameters.get(JcrUtils.REPOSITORY_URI).toString(); + else + return null; + + Map params = new HashMap(); + params.put(JcrUtils.REPOSITORY_URI, uri); + repository = new Jcr2davRepositoryFactory().getRepository(params); + if (repository == null) + throw new ArgeoException("Remote Davex repository " + uri + + " not found"); + log.info("Initialized remote Jackrabbit repository " + repository + + " from uri " + uri); return repository; } - } diff --git a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java index a39ab8751..bbe0f93cc 100644 --- a/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java +++ b/server/runtime/org.argeo.server.jcr/src/main/java/org/argeo/jcr/DefaultRepositoryRegister.java @@ -12,7 +12,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; public class DefaultRepositoryRegister extends Observable implements - RepositoryRegister { + RepositoryRegister, ArgeoJcrConstants { private final static Log log = LogFactory .getLog(DefaultRepositoryRegister.class); @@ -23,10 +23,10 @@ public class DefaultRepositoryRegister extends Observable implements @SuppressWarnings("rawtypes") public synchronized Repository getRepository(Map parameters) throws RepositoryException { - if (!parameters.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) - throw new RepositoryException("Parameter " + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS + if (!parameters.containsKey(JCR_REPOSITORY_ALIAS)) + throw new RepositoryException("Parameter " + JCR_REPOSITORY_ALIAS + " has to be defined."); - String alias = parameters.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString(); + String alias = parameters.get(JCR_REPOSITORY_ALIAS).toString(); if (!repositories.containsKey(alias)) throw new RepositoryException( "No repository registered with alias " + alias); @@ -43,13 +43,13 @@ public class DefaultRepositoryRegister extends Observable implements @SuppressWarnings("rawtypes") public synchronized void register(Repository repository, Map properties) { // TODO: also check bean name? - if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) { - log.warn("Cannot register a repository without property " - + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + String alias; + if (properties == null || !properties.containsKey(JCR_REPOSITORY_ALIAS)) { + log.warn("Cannot register a repository if no " + + JCR_REPOSITORY_ALIAS + " property is speecified."); return; } - - String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString(); + alias = properties.get(JCR_REPOSITORY_ALIAS).toString(); Map map = new TreeMap( repositories); map.put(alias, repository); @@ -62,13 +62,13 @@ public class DefaultRepositoryRegister extends Observable implements @SuppressWarnings("rawtypes") public synchronized void unregister(Repository repository, Map properties) { // TODO: also check bean name? - if (properties == null || !properties.containsKey(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS)) { + if (properties == null || !properties.containsKey(JCR_REPOSITORY_ALIAS)) { log.warn("Cannot unregister a repository without property " - + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS); + + JCR_REPOSITORY_ALIAS); return; } - String alias = properties.get(ArgeoJcrConstants.JCR_REPOSITORY_ALIAS).toString(); + String alias = properties.get(JCR_REPOSITORY_ALIAS).toString(); Map map = new TreeMap( repositories); map.put(alias, repository);