[elvystrac] r1680 - dispatcher posle appletu jmeno uzivatele, ktery ma zamknuty layout

From: elvys@xxxxxxxxxxxxxxxxxxxxxx
To: elvystrac@xxxxxxxxxxxxx
Date: Mon, 8 Feb 2010 09:07:07 +0100
Author: EvaV
Date: 2010-02-08 09:07:07 +0100 (Mon, 08 Feb 2010)
New Revision: 1680

Modified:
   trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/api/LayoutWorker.java
   
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
   
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LoadLayoutByIDServlet.java
Log:
dispatcher posle appletu jmeno uzivatele, ktery ma zamknuty layout

Modified: 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/api/LayoutWorker.java
===================================================================
--- 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/api/LayoutWorker.java    
    2010-02-08 08:05:07 UTC (rev 1679)
+++ 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/api/LayoutWorker.java    
    2010-02-08 08:07:07 UTC (rev 1680)
@@ -27,7 +27,9 @@
        
        public boolean isLayoutLocked(Integer layoutID, Integer userID) throws 
Exception;
        
+       public String whoLockedLayout(Integer layoutID) throws Exception;
        
+       
        /**
         * generates JAXB object of layoutConfig from DB
         * @param hibl hibernate object of layout

Modified: 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
===================================================================
--- 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
   2010-02-08 08:05:07 UTC (rev 1679)
+++ 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
   2010-02-08 08:07:07 UTC (rev 1680)
@@ -227,7 +227,7 @@
                }
                
                if(hibl.isLocked() == false) {
-                       return true;
+                       return false;
                }
                
                if(hibl.getUser().getId().equals(userID)) {
@@ -254,4 +254,17 @@
                }
                
        }
+
+       public String whoLockedLayout(Integer layoutID) throws Exception {
+               // get Hib layout from DB
+               cz.elvys.webServer.HIBgen.Layout hibl = 
(cz.elvys.webServer.HIBgen.Layout) HibUtils.findByID(
+                               cz.elvys.webServer.HIBgen.Layout.class, 
layoutID, "aspectRatio", "layoutPositions", "layoutPositions.contentTypes", 
"user");
+               
+               if (hibl == null) {
+                       // desired layout is not set
+                       return null;
+               }
+               
+               return hibl.getUser().getUsername();
+       }
 }

Modified: 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LoadLayoutByIDServlet.java
===================================================================
--- 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LoadLayoutByIDServlet.java
    2010-02-08 08:05:07 UTC (rev 1679)
+++ 
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LoadLayoutByIDServlet.java
    2010-02-08 08:07:07 UTC (rev 1680)
@@ -76,7 +76,11 @@
                resp.setContentType(responseContentType);
                PrintWriter writer = resp.getWriter();
                if(isLocked) {
-                       writer.write(IS_LOCKED);
+                       try {
+                               writer.write(IS_LOCKED + " " + 
worker.whoLockedLayout(layoutID));
+                       } catch (Exception e) {
+                               e.printStackTrace();
+                       }
                }
                else {
                        writer.write(layout);
[elvystrac] r1680 - dispatcher posle appletu jmeno uzivatele, ktery ma zamknuty layout

Other related posts:
