cvs commit: jahia/core/src/java/org/jahia/engines/lock LockEngine.java

[Xavier Lawrence]

xlawrence    2005/12/13 18:42:44 CET

  Modified files:
    core/src/java/org/jahia/engines/lock LockEngine.java 
  Log:
  Improve the close mecanism of engine windows
  
  Revision  Changes    Path
  1.14      +8 -4      
jahia/core/src/java/org/jahia/engines/lock/LockEngine.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/lock/LockEngine.java.diff?r1=1.13&r2=1.14&f=h
  
  
  
  Index: LockEngine.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/lock/LockEngine.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LockEngine.java   12 Dec 2005 11:48:18 -0000      1.13
  +++ LockEngine.java   13 Dec 2005 17:42:44 -0000      1.14
  @@ -177,6 +177,7 @@
           if(actionScreen==null) {
               actionScreen = "display";
           }
  +        engineMap.put("screen", actionScreen);
           // screen = display
           if ("display".equals (actionScreen)) {
               String lockKeyStr = jParams.getParameter ("lockKey");
  @@ -221,23 +222,26 @@
                                            
jParams.getSessionState().getMaxInactiveInterval());
                   }
               }
  +
  +            logger.debug("ENGINE_NAME_PARAM: " + 
jParams.getParameter(ENGINE_NAME_PARAM));
  +
               if (!"lock".equals (jParams.getParameter(ENGINE_NAME_PARAM))) {
                   engineMap.put("screen","edit");
                   engineMap.put ("jspSource", "apply");
               } else {
                   engineMap.put ("jspSource", "close");
  +                engineMap.put ("screen", "close");
               }
               engineMap.put (RENDER_TYPE_PARAM, new Integer 
(JahiaEngine.RENDERTYPE_FORWARD));
               toolBox.displayScreen (jParams, engineMap);
  -        }else if (actionScreen.equals ("cancel")) {
  +        }/* else if (actionScreen.equals ("cancel")) {
               engineMap.put ("jspSource", "close");
               engineMap.put (RENDER_TYPE_PARAM, new Integer 
(JahiaEngine.RENDERTYPE_FORWARD));
               toolBox.displayScreen (jParams, engineMap);
  -        }
  +        }*/
       }
   
  -    private void initLockEngine (ProcessingContext jParams, HashMap 
engineMap, LockKey lockKey)
  -            throws JahiaException {
  +    private void initLockEngine (ProcessingContext jParams, HashMap 
engineMap, LockKey lockKey) {
           engineMap.put ("lockKey", lockKey);
           LockPrerequisitesResult lockPrerequisitesResult =
                   LockPrerequisites.getInstance ().getLockPrerequisitesResult 
(lockKey);