From dc61e15280d5430c637effd689d45322a08cc4d8 Mon Sep 17 00:00:00 2001 From: Bruno Sinou Date: Wed, 8 Jun 2011 14:34:15 +0000 Subject: [PATCH] Clean comments. git-svn-id: https://svn.argeo.org/commons/trunk@4567 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../jcr/editors/AbstractJcrQueryEditor.java | 25 ++++++++++--------- .../eclipse/ui/jcr/utils/JcrFileProvider.java | 2 -- .../ui/jcr/views/GenericJcrBrowser.java | 9 +------ .../eclipse/ui/specific/FileHandler.java | 2 -- .../eclipse/ui/specific/FileProvider.java | 3 --- 5 files changed, 14 insertions(+), 27 deletions(-) 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 e229a0039..d401538fd 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 @@ -49,10 +49,12 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { /** DEPENDENCY INJECTION */ private Session session; + // Widgets private TableViewer viewer; private List tableViewerColumns = new ArrayList(); private GenericTableComparator comparator; + /** Override to layout a form enabling the end user to build his query */ protected abstract void createQueryForm(Composite parent); @Override @@ -101,6 +103,9 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { protected void executeQuery(String statement) { try { + if (log.isDebugEnabled()) + log.debug("Query : " + statement); + QueryResult qr = session.getWorkspace().getQueryManager() .createQuery(statement, initialQueryType).execute(); @@ -117,10 +122,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { i++; } - // We must create a local list because query result can be read only - // once. - // viewer.setInput(qr); - + // Must create a local list: QueryResults can only be read once. try { List rows = new ArrayList(); RowIterator rit = qr.getRows(); @@ -136,8 +138,6 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { ErrorDialog.openError(null, "Error", "Cannot execute JCR query: " + statement, new Status(IStatus.ERROR, "org.argeo.eclipse.ui.jcr", e.getMessage())); - // throw new ArgeoException("Cannot execute JCR query " + statement, - // e); } } @@ -302,10 +302,7 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { } /** - * To be overriden to enable sorting. - * - * @author bsinou - * + * To be overridden to enable sorting. */ protected GenericTableComparator getComparator() { return null; @@ -319,7 +316,6 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { @Override public void doSave(IProgressMonitor monitor) { // TODO save the query in JCR? - } @Override @@ -331,7 +327,12 @@ public abstract class AbstractJcrQueryEditor extends EditorPart { return false; } - // IoC + /** Returns the injected current session */ + protected Session getSession() { + return session; + } + + /** DEPENDENCY INJECTION */ public void setSession(Session session) { this.session = session; } diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java index 16b7b1445..94cb80992 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/utils/JcrFileProvider.java @@ -26,8 +26,6 @@ import org.argeo.jcr.RepositoryRegister; * * Relies on common approach for JCR file handling implementation. * - * @author bsinou - * */ public class JcrFileProvider implements FileProvider { diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java index 136b99fcf..f949be319 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/views/GenericJcrBrowser.java @@ -166,9 +166,7 @@ public class GenericJcrBrowser extends AbstractJcrBrowser { } /** - * To be overidden to adapt size of form and result frames. - * - * @return + * To be overridden to adapt size of form and result frames. */ protected int[] getWeights() { return new int[] { 70, 30 }; @@ -214,11 +212,6 @@ public class GenericJcrBrowser extends AbstractJcrBrowser { final TreeViewer tmpNodeViewer = new TreeViewer(parent, SWT.MULTI); - // | - // SWT.H_SCROLL - // | - // SWT.V_SCROLL); - tmpNodeViewer.getTree().setLayoutData( new GridData(SWT.FILL, SWT.FILL, true, true)); diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java index 9d30e3f40..b9a785198 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java @@ -19,8 +19,6 @@ import org.eclipse.ui.PlatformUI; * Manages the process of forwarding the request to the handler at runtime to * open the dialog box * - * @author bsinou - * */ public class FileHandler { diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java index fa1a73e4f..4efece37b 100644 --- a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java +++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileProvider.java @@ -5,9 +5,6 @@ import java.io.InputStream; /** * Used for file download : subclasses must implement model specific methods to * get a byte array representing a file given is ID. - * - * @author bsinou - * */ public interface FileProvider { -- 2.30.2