[elvystrac] r1673 - refactored unused...
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Fri, 5 Feb 2010 01:55:55 +0100
Author: DavidK
Date: 2010-02-05 01:55:55 +0100 (Fri, 05 Feb 2010)
New Revision: 1673
Removed:
trunk/server/webServer2/SpringSource/cz/elvys/webServer/bl/test/layoutrel/ListOfLayoutsCTRLtest.java
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysSettingBean.java
Log:
refactored unused...
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysSettingBean.java
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysSettingBean.java
2010-02-05 00:54:50 UTC (rev 1672)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/beans/elvysrel/ElvysSettingBean.java
2010-02-05 00:55:55 UTC (rev 1673)
@@ -1,7 +1,6 @@
package cz.elvys.webServer.beans.elvysrel;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -11,50 +10,57 @@
import cz.elvys.commons.def.Constants;
import cz.elvys.commons.utils.CommonUtils;
-import cz.elvys.commons.utils.HibUtils;
import cz.elvys.webServer.HIBgen.Elvys;
-import cz.elvys.webServer.HIBgen.ElvysSetting;
import cz.elvys.webServer.HIBgen.Layout;
import cz.elvys.webServer.bl.api.Factory;
import cz.elvys.webServer.bl.api.elvysrel.ElvysSettingBL;
-import cz.elvys.webServer.toSpring.exception.ExecuteException;
import cz.elvys.webServer.utils.faces.BeanManager;
import cz.elvys.webServer.utils.faces.MessageUtils;
import cz.elvys.webServer.utils.type.ValidationMessageHolder;
-import elvys.server.bl.layoutrel.LayoutBL;
+import elvys.server.bl.Fact;
+import elvys.server.bl.elvysrel.ElvysBL;
+// TODO ma jeste tahle trida duvod existovat?
public class ElvysSettingBean implements Serializable {
+ // static fields
+ private static final long serialVersionUID = 5241649728544347436L;
private static Logger log = null;
+
// fields
private Integer elvysId = null;
private String listeners = null;
- private Layout dayPresentLayout = null;
- private Boolean dayPresentLayoutExistence = null;
- private Layout nightPresentLayout = null;
- private Boolean nightPresentLayoutExistence = null;
private String nightModeStart = null;
private String nightModeEnd = null;
private Boolean nightModeEnabled = null;
// maybe fields (TODO probrat)
- private List<Layout> presentLayoutInList = null;
private boolean updated = false;
private Layout selectedLayout = null;
+ // technical fields
+ private ElvysBL elvysBL;
+
// messages
private static final String ERROR_CHANGE_NIGHTMODE_SETTING = "Error
when saving new nightmode data: ";
- private static final String COULDNT_SET_LAYOUT = "Couldn't set layout:
";
private static final String INAPPROPRIATE_VALIDATION = "Inappropriate
validation";
- private static final String ERROR_LOAD_PRESENT_LAYOUT = "Error when
loading presentLayout";
private static final String CANNOT_CALL = "Cannot call one or more
registered listeners";
private static final String CANNOT_INITIALIZE_NIGHT_SETTING = "Cannot
load night-mode setting.";
+
+ // static initialization
static {
// init log
log = Logger.getLogger(ElvysSettingBean.class);
}
+ // initialization
+ {
+ elvysBL = Fact.getElvysBL();
+ }
+
+
+
public Layout getSelectedLayout() {
return selectedLayout;
}
@@ -112,91 +118,6 @@
this.listeners = listeners;
}
- /**
- * Method used only for prevent multiple call of getDayPresentLayout
- * This method can be called xy-times, nobody cares..
- * @return
- */
- public Boolean getDayPresentLayoutExistence() {
- if (dayPresentLayoutExistence == null) {
- // resolve whether exists..
- Layout layout = getDayPresentLayout();
- if (layout == null) {
- dayPresentLayoutExistence = Boolean.FALSE;
- } else {
- dayPresentLayoutExistence = Boolean.TRUE;
- }
- }
- return dayPresentLayoutExistence;
- }
-
- public void setDayPresentLayoutExistence(Boolean
dayPresentLayoutExistence) {
- this.dayPresentLayoutExistence = dayPresentLayoutExistence;
- }
-
- /**
- * Method used only for prevent multiple call of getNightPresentLayout.
- * This method can be called xy-times, nobody cares..
- * @return
- */
- public Boolean getNightPresentLayoutExistence() {
- if (nightPresentLayoutExistence == null) {
- // resolve whether exists..
- Layout layout = getNightPresentLayout();
- if (layout == null) {
- nightPresentLayoutExistence = Boolean.FALSE;
- } else {
- nightPresentLayoutExistence = Boolean.TRUE;
- }
- }
- return nightPresentLayoutExistence;
- }
-
- public void setNightPresentLayoutExistence(Boolean
nightPresentLayoutExistence) {
- this.nightPresentLayoutExistence = nightPresentLayoutExistence;
- }
-
- public Layout getDayPresentLayout() {
- if (dayPresentLayout == null) {
- LayoutBL bl = Factory.getLayoutBL();
- try {
- dayPresentLayout = bl.getPresentLayout(elvysId,
true);
- } catch (ExecuteException e) {
- String message =
CommonUtils.prepareErrorMessage(ERROR_LOAD_PRESENT_LAYOUT
- , "elvysID", elvysId,
"nightMode", "day");
- log.error(message,e);
- throw new RuntimeException(message,e);
- }
- }
- return dayPresentLayout;
- }
-
- public void setDayPresentLayout(Layout dayPresentLayout) {
- this.dayPresentLayout = dayPresentLayout;
- dayPresentLayoutExistence = null;
- }
-
- public Layout getNightPresentLayout() {
- if (nightPresentLayout == null) {
- LayoutBL bl = Factory.getLayoutBL();
- try {
- nightPresentLayout =
bl.getPresentLayout(elvysId, false);
- } catch (ExecuteException e) {
- String message =
CommonUtils.prepareErrorMessage(ERROR_LOAD_PRESENT_LAYOUT
- , "elvysID", elvysId,
"nightMode", "night");
- log.error(message,e);
- throw new RuntimeException(message,e);
- }
-
- }
- return nightPresentLayout;
- }
-
- public void setNightPresentLayout(Layout nightPresentLayout) {
- this.nightPresentLayout = nightPresentLayout;
- this.nightPresentLayoutExistence = null;
- }
-
public boolean isUpdated() {
return updated;
}
@@ -206,48 +127,6 @@
}
/**
- * Sets new day layout of particular elvys.
- * @param aev
- */
- public void updateDayLayout(ActionEvent aev) {
- // update value of day layout
- try {
- ElvysSettingBL worker = Factory.getElvysSettingBL();
- worker.setNewLayout(elvysId, dayPresentLayout, true);
- updated= true;
- } catch (Exception e) {
- String message =
CommonUtils.prepareErrorMessage(COULDNT_SET_LAYOUT,
- "layoutId", dayPresentLayout.getId(),
"elvysId", elvysId);
- throw new Error(message,e);
- }
-
- // delete old timelines
- // unused now
-
//SchedulingCleaner.cleanTimelinesAfterSelectingNewLayout(updatedElvys,
oldLayout);
- }
-
- /**
- * Sets new night layout of particular elvys.
- * @param aev
- */
- public void updateNightLayout(ActionEvent aev) {
- // update value of night layout
- try {
- ElvysSettingBL worker = Factory.getElvysSettingBL();
- worker.setNewLayout(elvysId, nightPresentLayout, false);
- updated= true;
- } catch (Exception e) {
- String message =
CommonUtils.prepareErrorMessage(COULDNT_SET_LAYOUT,
- "layoutId", nightPresentLayout.getId(),
"elvysId", elvysId);
- throw new Error(message,e);
- }
-
- // delete old timelines
- // unused now
-
//SchedulingCleaner.cleanTimelinesAfterSelectingNewLayout(updatedElvys,
oldLayout);
- }
-
- /**
* on click on checkbox with night mode enabling
* @param aev
*/
@@ -310,10 +189,6 @@
public void doActionsOnClose(ActionEvent aev) {
// invalidate layoutId
elvysId = null;
- dayPresentLayout = null;
- dayPresentLayoutExistence = null;
- nightPresentLayout = null;
- nightPresentLayoutExistence = null;
nightModeEnabled = null;
nightModeStart = null;
nightModeEnd = null;
@@ -345,16 +220,17 @@
/**
- * loads night-mode setting to form
+ * loads night-mode setting into the form fields
*/
private void loadNightModeSetting() {
try {
- Elvys elvys = (Elvys) HibUtils.findByID(Elvys.class,
elvysId, "elvysSetting");
+ Elvys elvys = elvysBL.getElvysByIdMakeSession(elvysId);
this.nightModeStart =
elvys.getElvysSetting().getNightStart();
this.nightModeEnd =
elvys.getElvysSetting().getNightEnd();
this.nightModeEnabled =
elvys.getElvysSetting().isNightMode();
} catch (Exception e) {
- String message =
CommonUtils.prepareErrorMessage(CANNOT_INITIALIZE_NIGHT_SETTING, "elvysId",
elvysId);
+ String message = CommonUtils.prepareErrorMessage(
+ CANNOT_INITIALIZE_NIGHT_SETTING, "elvysId",
elvysId);
log.error(message,e);
throw new RuntimeException(message,e);
}
Deleted:
trunk/server/webServer2/SpringSource/cz/elvys/webServer/bl/test/layoutrel/ListOfLayoutsCTRLtest.java
===================================================================
---
trunk/server/webServer2/SpringSource/cz/elvys/webServer/bl/test/layoutrel/ListOfLayoutsCTRLtest.java
2010-02-05 00:54:50 UTC (rev 1672)
+++
trunk/server/webServer2/SpringSource/cz/elvys/webServer/bl/test/layoutrel/ListOfLayoutsCTRLtest.java
2010-02-05 00:55:55 UTC (rev 1673)
@@ -1,42 +0,0 @@
-package cz.elvys.webServer.bl.test.layoutrel;
-
-import java.util.List;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import cz.elvys.webServer.HIBgen.Layout;
-import cz.elvys.webServer.bl.api.Factory;
-import elvys.server.bl.layoutrel.LayoutBL;
-
-public class ListOfLayoutsCTRLtest {
- private static final int elvysID = 1;
- private static final int companyID = 2;
-// private static final
- private static LayoutBL bl = Factory.getLayoutBL();
-
- @Test
- public void getPresentLayoutDayTest() throws Exception {
- Layout layout = bl.getPresentLayout(elvysID, true);
- assertNotNull(layout);
- }
-
- @Test
- public void getPresentLayoutNightTest() throws Exception {
- Layout layout = bl.getPresentLayout(elvysID, false);
- assertNull(layout);
- }
-
- @Test
- public void getLayoutsOfCompanyTest() throws Exception {
- List<Layout> layouts = bl.getLayoutsOfCompany(companyID);
- assertNotNull(layouts);
- assertTrue(layouts.size() != 0);
- assertTrue(layouts.get(0) != null);
- int nextStepForbiddenId = layouts.get(0).getId();
- List<Layout> layoutsNext = bl.getLayoutsOfCompany(companyID,
nextStepForbiddenId);
- assertNotNull(layoutsNext);
- assertTrue(layoutsNext.size() == layouts.size() -1);
- }
-
-}
Other related posts:
- » [elvystrac] r1673 - refactored unused... - elvys
