Revert "Added global zoom level session variable"

This reverts commit 235f6de48c.

ganttzk/src/main/java/org/zkoss/ganttz/Planner.java

@@ -62,7 +62,6 @@ import org.zkoss.zk.mesg.MZk;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.HtmlMacroComponent;
-import org.zkoss.zk.ui.Sessions;
 import org.zkoss.zk.ui.UiException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -278,9 +277,7 @@ public class Planner extends HtmlMacroComponent  {
             return;
         }
         this.fixedZoomByUser = true;
-
         initialZoomLevel = zoomLevel;
-        Sessions.getCurrent().setAttribute("zoomLevel", zoomLevel);
         ganttPanel.setZoomLevel(zoomLevel, scrollLeft);
     }
 
@@ -412,7 +409,8 @@ public class Planner extends HtmlMacroComponent  {
                 if (command.equals("onZoomLevelChange")){
                     zoomindex=  (Integer) retrieveData(request, "zoomindex");
                     scrollLeft = (Integer) retrieveData(request, "scrollLeft");
-                    setZoomLevel((ZoomLevel) ((Listbox) getFellow("listZoomLevels"))
+
+                    setZoomLevel((ZoomLevel)((Listbox)getFellow("listZoomLevels"))
                             .getModel().getElementAt(zoomindex),
                             scrollLeft);
                     return true;

libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java

@@ -110,11 +110,6 @@ public class CompanyPlanningController implements Composer {
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        ZoomLevel sessionZoom = (ZoomLevel) Sessions.getCurrent().getAttribute(
-                "zoomLevel");
-        if (sessionZoom != null) {
-            zoomLevelParameter = sessionZoom.getInternalName();
-        }
         if (zoomLevelParameter != null) {
             planner.setInitialZoomLevel(ZoomLevel
                     .getFromString(zoomLevelParameter));

libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java

@@ -233,11 +233,8 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         addPrintSupport(configuration);
         disableSomeFeatures(configuration);
 
-        ZoomLevel defaultZoomLevel = sessionGetZoomLevel();
+        ZoomLevel defaultZoomLevel = OrderPlanningModel
-        if (defaultZoomLevel == null) {
-            defaultZoomLevel = OrderPlanningModel
                 .calculateDefaultLevel(configuration);
-        }
         OrderPlanningModel.configureInitialZoomLevelFor(planner,
                 defaultZoomLevel);
 
@@ -270,16 +267,6 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         }
     }
 
-    private ZoomLevel sessionGetZoomLevel() {
-        return (ZoomLevel) Sessions.getCurrent().getAttribute("zoomLevel");
-    }
-
-    private void sessionSetZoomLevel(ZoomLevel level) {
-        if (level != null) {
-            Sessions.getCurrent().setAttribute("zoomLevel", level);
-        }
-    }
-
     private BaseCalendar getDefaultCalendar() {
         return configurationDAO.getConfiguration().getDefaultCalendar();
     }
@@ -676,7 +663,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
             @Override
             public void zoomLevelChanged(ZoomLevel detailLevel) {
                 loadChart.setZoomLevel(detailLevel);
-                sessionSetZoomLevel(detailLevel);
+
                 transactionService
                         .runOnReadOnlyTransaction(new IOnTransaction<Void>() {
                     @Override

libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java

@@ -173,12 +173,6 @@ public class OrderPlanningController implements Composer {
                 && !(parameters.isEmpty())) {
             zoomLevelParameter = parameters.get("zoom")[0];
         }
-        ZoomLevel sessionZoom = (ZoomLevel) Sessions.getCurrent().getAttribute(
-                "zoomLevel");
-        if (sessionZoom != null) {
-            zoomLevelParameter = sessionZoom.getInternalName();
-        }
-
         if (zoomLevelParameter != null) {
             planner.setInitialZoomLevel(ZoomLevel
                     .getFromString(zoomLevelParameter));

libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java

@@ -123,7 +123,6 @@ import org.zkoss.ganttz.timetracker.zoom.ZoomLevel;
 import org.zkoss.ganttz.util.Interval;
 import org.zkoss.ganttz.util.ProfilingLogFactory;
 import org.zkoss.zk.ui.Executions;
-import org.zkoss.zk.ui.Sessions;
 import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -1175,7 +1174,6 @@ public class OrderPlanningModel implements IOrderPlanningModel {
             @Override
             public void zoomLevelChanged(ZoomLevel detailLevel) {
                 loadChart.setZoomLevel(detailLevel);
-                sessionStoreZoomLevel(detailLevel);
 
                 transactionService
                         .runOnReadOnlyTransaction(new IOnTransaction<Void>() {
@@ -1191,10 +1189,6 @@ public class OrderPlanningModel implements IOrderPlanningModel {
                             }
                         });
             }
-
-            private void sessionStoreZoomLevel(ZoomLevel detailLevel) {
-                Sessions.getCurrent().setAttribute("zoomLevel", detailLevel);
-            }
         };
 
         keepAliveZoomListeners.add(zoomListener);