xlawrence 2005/11/02 18:54:33 CET
Modified files:
core/src/java/org/jahia/engines/importexport
ClipboardEngine.java
Log:
added some useful log messages + some code optimizations
Revision Changes Path
1.5 +39 -31
jahia/core/src/java/org/jahia/engines/importexport/ClipboardEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/importexport/ClipboardEngine.java.diff?r1=1.4&r2=1.5&f=h
Index: ClipboardEngine.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/importexport/ClipboardEngine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClipboardEngine.java 2 Nov 2005 15:35:28 -0000 1.4
+++ ClipboardEngine.java 2 Nov 2005 17:54:32 -0000 1.5
@@ -1,44 +1,49 @@
package org.jahia.engines.importexport;
+import org.jahia.content.ContentObject;
+import org.jahia.content.ContentObjectKey;
+import org.jahia.data.JahiaData;
import org.jahia.engines.JahiaEngine;
-import org.jahia.engines.EngineToolBox;
-import org.jahia.engines.workflow.WorkflowEngine;
import org.jahia.engines.validation.EngineValidationHelper;
-import org.jahia.params.ProcessingContext;
import org.jahia.exceptions.JahiaException;
-import org.jahia.data.JahiaData;
-import org.jahia.content.ContentObject;
-import org.jahia.content.ContentObjectKey;
+import org.jahia.params.ProcessingContext;
+import org.jahia.params.SessionState;
import org.jahia.registries.ServicesRegistry;
import org.jahia.services.version.EntryLoadRequest;
+import org.jahia.services.importexport.ImportExportService;
/**
* Created by IntelliJ IDEA.
* User: toto
- * Date: 25 août 2005
+ * Date: 25 aout 2005
* Time: 15:04:17
* To change this template use File | Settings | File Templates.
*/
public class ClipboardEngine implements JahiaEngine {
private static final org.apache.log4j.Logger logger =
- org.apache.log4j.Logger.getLogger (JahiaEngine.class);
+ org.apache.log4j.Logger.getLogger(JahiaEngine.class);
+
+ private static final ImportExportService importExportService =
+ ServicesRegistry.getInstance().getImportExportService();
- /** the unique instance of this class */
+ /**
+ * the unique instance of this class
+ */
private static ClipboardEngine instance = null;
/**
- * Default constructor, creates a new <code>WorkflowEngine</code>
instance.
+ * Default constructor, creates a new <code>ClipboardEngine</code>
instance.
*/
- protected ClipboardEngine () {
- logger.debug ("***** Starting " + ClipboardEngine.class.getName () +
" engine *****");
+ protected ClipboardEngine() {
+ logger.debug("***** Starting " + ClipboardEngine.class.getName() + "
engine *****");
}
/**
* @return The instance of this engine
*/
- public static synchronized ClipboardEngine getInstance () {
+ public static synchronized ClipboardEngine getInstance() {
if (instance == null) {
- instance = new ClipboardEngine ();
+ instance = new ClipboardEngine();
}
return instance;
}
@@ -47,36 +52,39 @@
return true;
}
- public String renderLink(ProcessingContext processingContext, Object
theObj) throws JahiaException {
- return processingContext.composeEngineUrl ("clipboard", "?key="+
((ContentObject)theObj).getObjectKey() );
+ public String renderLink(final ProcessingContext processingContext,
final Object theObj) throws JahiaException {
+ return processingContext.composeEngineUrl("clipboard", "?key=" +
((ContentObject) theObj).getObjectKey());
}
public boolean needsJahiaData(ProcessingContext processingContext) {
return false;
}
- public EngineValidationHelper handleActions(ProcessingContext
processingContext, JahiaData jData) throws JahiaException {
- String op = processingContext.getParameter("cop");
- String key = processingContext.getParameter("key");
- if ("cut".equals(op) || "copy".equals(op) ) {
-
processingContext.getSessionState().setAttribute("clipboard_op",op);
-
processingContext.getSessionState().setAttribute("clipboard_key",key);
+ public EngineValidationHelper handleActions(final ProcessingContext
processingContext, final JahiaData jData) throws JahiaException {
+ final String op = processingContext.getParameter("cop");
+ final String key = processingContext.getParameter("key");
+
+ logger.debug("ClipboardEngine - op: " + op + ", key: " + key);
+
+ final SessionState sessionState =
processingContext.getSessionState();
+ if ("cut".equals(op) || "copy".equals(op)) {
+ sessionState.setAttribute("clipboard_op", op);
+ sessionState.setAttribute("clipboard_key", key);
}
if ("paste".equals(op)) {
try {
- String sOp = (String)
processingContext.getSessionState().getAttribute("clipboard_op");
-
processingContext.getSessionState().removeAttribute("clipboard_op");
+ sessionState.removeAttribute("clipboard_op");
- String skey = (String)
processingContext.getSessionState().getAttribute("clipboard_key");
-
processingContext.getSessionState().removeAttribute("clipboard_key");
- ContentObject source =
ContentObject.getContentObjectInstance(ContentObjectKey.getInstance(skey));
+ final String skey = (String)
processingContext.getSessionState().getAttribute("clipboard_key");
+ sessionState.removeAttribute("clipboard_key");
+ final ContentObject source =
ContentObject.getContentObjectInstance(ContentObjectKey.getInstance(skey));
- String dkey = processingContext.getParameter("key");
- ContentObject dest =
ContentObject.getContentObjectInstance(ContentObjectKey.getInstance(dkey));
+ final String dkey = processingContext.getParameter("key");
+ final ContentObject dest =
ContentObject.getContentObjectInstance(ContentObjectKey.getInstance(dkey));
-
ServicesRegistry.getInstance().getImportExportService().copy(source,dest ,
processingContext, EntryLoadRequest.STAGED, false);
+ importExportService.copy(source, dest, processingContext,
EntryLoadRequest.STAGED, false);
} catch (ClassNotFoundException e) {
- e.printStackTrace(); //To change body of catch statement
use File | Settings | File Templates.
+ logger.error(e.getMessage(), e);
}
}
return null;
