diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 4f54d2fa2..b2d58cb01 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/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; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java index ca25b7bb1..d00b0171c 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningController.java +++ b/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)); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java index 9c8f5c5ef..fecc66fde 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java +++ b/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(); - if (defaultZoomLevel == null) { - defaultZoomLevel = OrderPlanningModel + ZoomLevel 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() { @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java index ac75f39b0..7c8644de2 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningController.java +++ b/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)); diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java index 573ba6a98..910b561a8 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/OrderPlanningModel.java +++ b/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() { @@ -1191,10 +1189,6 @@ public class OrderPlanningModel implements IOrderPlanningModel { } }); } - - private void sessionStoreZoomLevel(ZoomLevel detailLevel) { - Sessions.getCurrent().setAttribute("zoomLevel", detailLevel); - } }; keepAliveZoomListeners.add(zoomListener);