Move the workbench specific OpenFile command to the appropriate bundle
authorBruno Sinou <bsinou@argeo.org>
Sat, 17 Oct 2015 15:20:32 +0000 (15:20 +0000)
committerBruno Sinou <bsinou@argeo.org>
Sat, 17 Oct 2015 15:20:32 +0000 (15:20 +0000)
git-svn-id: https://svn.argeo.org/commons/trunk@8503 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/DumpNode.java
org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java [new file with mode: 0644]
org.argeo.security.ui.rap/META-INF/spring/commands.xml
org.argeo.security.ui.rap/bnd.bnd
org.argeo.security.ui.rap/plugin.xml

index 409b96dedca031f97b5de91b4c54e8a654a1d24d..46de2c9182e706f8fda7be59bb6783ebf2bad1be 100644 (file)
@@ -17,59 +17,52 @@ package org.argeo.eclipse.ui.specific;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.UrlLauncher;
 
 /**
- * RWT specific command handler to open a file retrieved from the server. It
- * forwards the request to the correct service after encoding file name and path
- * in the request URI.
+ * RWT specific object to open a file retrieved from the server. It forwards the
+ * request to the correct service after encoding file name and path in the
+ * request URI.
  * 
  * <p>
  * The parameter "URI" is used to determine the correct file service, the path
- * and the file name. An optional file name can be precized to present a
- * different file name as the one used to retrieve it to the end user.
+ * and the file name. An optional file name can be added to present the end user
+ * with a different file name as the one used to retrieve it.
  * </p>
  * 
- * <p>
- * Various instances of this handler with different command ID might coexist in
- * order to provide context specific download service.
- * </p>
  * 
  * <p>
  * The instance specific service is called by its ID and must have been
  * externally created
  * </p>
  */
-public class OpenFile extends AbstractHandler {
+public class OpenFile {
        private final static Log log = LogFactory.getLog(OpenFile.class);
 
-       /* DEPENDENCY INJECTION */
-       private String openFileServiceId;
-
-       public final static String PARAM_FILE_NAME = OpenFileService.PARAM_FILE_NAME;
-       public final static String PARAM_FILE_URI = OpenFileService.PARAM_FILE_URI; // "param.fileURI";
+       // /* DEPENDENCY INJECTION */
+       // private String openFileServiceId;
+       //
+       // public final static String PARAM_FILE_NAME =
+       // OpenFileService.PARAM_FILE_NAME;
+       // public final static String PARAM_FILE_URI =
+       // OpenFileService.PARAM_FILE_URI; // "param.fileURI";
 
-       public Object execute(ExecutionEvent event) throws ExecutionException {
-               String fileName = event.getParameter(PARAM_FILE_NAME);
-               String fileUri = event.getParameter(PARAM_FILE_URI);
-
-               // Sanity check
-               if (fileUri == null || "".equals(fileUri.trim())
-                               || openFileServiceId == null
-                               || "".equals(openFileServiceId.trim()))
-                       return null;
+       public Object execute(String openFileServiceId, String fileUri,
+                       String fileName) {
+               // // Sanity check
+               // if (fileUri == null || "".equals(fileUri.trim())
+               // || openFileServiceId == null
+               // || "".equals(openFileServiceId.trim()))
+               // return null;
 
                StringBuilder url = new StringBuilder();
                url.append(RWT.getServiceManager().getServiceHandlerUrl(
                                openFileServiceId));
 
-               url.append("&").append(PARAM_FILE_NAME).append("=");
+               url.append("&").append(OpenFileService.PARAM_FILE_NAME).append("=");
                url.append(fileName);
-               url.append("&").append(PARAM_FILE_URI).append("=");
+               url.append("&").append(OpenFileService.PARAM_FILE_URI).append("=");
                url.append(fileUri);
 
                String downloadUrl = url.toString();
@@ -81,8 +74,8 @@ public class OpenFile extends AbstractHandler {
                return null;
        }
 
-       /* DEPENDENCY INJECTION */
-       public void setOpenFileServiceId(String openFileServiceId) {
-               this.openFileServiceId = openFileServiceId;
-       }
+       // /* DEPENDENCY INJECTION */
+       // public void setOpenFileServiceId(String openFileServiceId) {
+       // this.openFileServiceId = openFileServiceId;
+       // }
 }
\ No newline at end of file
index 9712e727eda525f973963dbfbc42984ee64cc2b6..4943ccbf35140d6a6b310cebd2f70aa898f96a79 100644 (file)
@@ -30,7 +30,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.specific.OpenFile;
 import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
 import org.argeo.eclipse.ui.workbench.jcr.internal.model.SingleJcrNodeElem;
@@ -105,7 +104,6 @@ public class DumpNode extends AbstractHandler {
                Map<String, String> params = new HashMap<String, String>();
                params.put(OpenFile.PARAM_FILE_NAME, fileName);
                params.put(OpenFile.PARAM_FILE_URI, "file://" + path);
-               CommandUtils.callCommand("org.argeo.security.ui.specific.openFile",
-                               params);
+               CommandUtils.callCommand(OpenFile.ID, params);
        }
 }
diff --git a/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java b/org.argeo.eclipse.ui.workbench/src/org/argeo/eclipse/ui/workbench/commands/OpenFile.java
new file mode 100644 (file)
index 0000000..6d74571
--- /dev/null
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.argeo.eclipse.ui.workbench.commands;
+
+import org.argeo.eclipse.ui.specific.OpenFileService;
+import org.argeo.eclipse.ui.workbench.WorkbenchUiPlugin;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+
+/**
+ * RWT specific command handler to open a file retrieved from the server. It
+ * forwards the request to the correct service after encoding file name and path
+ * in the request URI.
+ * 
+ * <p>
+ * The parameter "URI" is used to determine the correct file service, the path
+ * and the file name. An optional file name can be precized to present a
+ * different file name as the one used to retrieve it to the end user.
+ * </p>
+ * 
+ * <p>
+ * Various instances of this handler with different command ID might coexist in
+ * order to provide context specific download service.
+ * </p>
+ * 
+ * <p>
+ * The instance specific service is called by its ID and must have been
+ * externally created
+ * </p>
+ */
+public class OpenFile extends AbstractHandler {
+       // private final static Log log = LogFactory.getLog(OpenFile.class);
+
+       /* DEPENDENCY INJECTION */
+       private String openFileServiceId;
+
+       public final static String ID = WorkbenchUiPlugin.ID + ".dumpNode";
+       public final static String PARAM_FILE_NAME = OpenFileService.PARAM_FILE_NAME;
+       public final static String PARAM_FILE_URI = OpenFileService.PARAM_FILE_URI; // "param.fileURI";
+
+       public Object execute(ExecutionEvent event) throws ExecutionException {
+
+               String fileName = event.getParameter(PARAM_FILE_NAME);
+               String fileUri = event.getParameter(PARAM_FILE_URI);
+               // Sanity check
+               if (fileUri == null || "".equals(fileUri.trim())
+                               || openFileServiceId == null
+                               || "".equals(openFileServiceId.trim()))
+                       return null;
+
+               org.argeo.eclipse.ui.specific.OpenFile openFileClient = new org.argeo.eclipse.ui.specific.OpenFile();
+               openFileClient.execute(openFileServiceId, fileUri, fileName);
+
+               return null;
+       }
+
+       /* DEPENDENCY INJECTION */
+       public void setOpenFileServiceId(String openFileServiceId) {
+               this.openFileServiceId = openFileServiceId;
+       }
+}
\ No newline at end of file
index 0dc74d0f49b5a6b6deff30ae9ceeedc32452c758..802d31de6414e1a4d70c4f4ca76c82cc6827983b 100644 (file)
@@ -12,8 +12,8 @@
 
 
        <!-- RAP Specific command and corresponding service to enable open file -->
-       <bean id="org.argeo.security.ui.specific.openFile" class="org.argeo.eclipse.ui.specific.OpenFile"
-               scope="prototype">
+       <bean id="org.argeo.eclipse.ui.workbench.openFile" class="org.argeo.eclipse.ui.workbench.commands.OpenFile"
+       scope="prototype">
                <property name="openFileServiceId"
                        value="org.argeo.security.ui.specific.openFileService" />
        </bean>
index dffe8ff61eeb644625ffa4674f1994e134ec9807..87c4eca4cf7f9108631fbf7d9b4cdb7247f62049 100644 (file)
@@ -4,7 +4,7 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
 
 Import-Package: org.argeo.eclipse.spring,\
-org.argeo.eclipse.ui.specific,\
+org.argeo.eclipse.ui.workbench.commands,\
 org.argeo.cms,\
 org.argeo.cms.auth,\
 org.argeo.security.ui,\
index 693a4ddf0cdf003a7f49d67f40a71da9c463bee3..5f99d7f57fa968a67cfe74066e0020a31221b521 100644 (file)
@@ -38,7 +38,7 @@
                <!-- Enable an "open file" action in a single sourced application  -->  
                <command
                        defaultHandler="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       id="org.argeo.security.ui.specific.openFile"
+                       id="org.argeo.eclipse.ui.workbench.openFile"
                        name="OpenFile">
                        <commandParameter
                        id="param.fileName"