diff --git a/src/main/java/de/tvo/workplace/WorkpageStarter.java b/src/main/java/de/tvo/workplace/DefaultWorkpageStarter.java similarity index 90% rename from src/main/java/de/tvo/workplace/WorkpageStarter.java rename to src/main/java/de/tvo/workplace/DefaultWorkpageStarter.java index 0b5a305..92c9daf 100644 --- a/src/main/java/de/tvo/workplace/WorkpageStarter.java +++ b/src/main/java/de/tvo/workplace/DefaultWorkpageStarter.java @@ -1,8 +1,9 @@ package de.tvo.workplace; +import org.eclnt.jsfserver.defaultscreens.OKPopup; import org.eclnt.workplace.WorkpageDefaultStarter; -public class WorkpageStarter extends WorkpageDefaultStarter { +public class DefaultWorkpageStarter extends WorkpageDefaultStarter { private static final long serialVersionUID = 1L; @@ -148,21 +149,21 @@ public class WorkpageStarter extends WorkpageDefaultStarter { * this method in order to output the error information in some different * way. */ -// @Override -// protected void reactOnProblemDuringWorkpageStart(Throwable t) { -// while (true) { -// if (t.getCause() == null) { -// break; -// } else { -// t = t.getCause(); -// } -// } -// if (t instanceof NullPointerException && t.getMessage().equals("null")) { -// //Hier läuft das Portal rein, wenn eine Anwendung sich beim Programmstart automatisch schließt -// //z. B. bei Locks bei Semikron oder deaktivierten VDA-Lieferanten in der Erfassung -// } else { -// OKPopup.createInstance("", t.getMessage()); -// } -// -// } + @Override + protected void reactOnProblemDuringWorkpageStart(Throwable t) { + while (true) { + if (t.getCause() == null) { + break; + } else { + t = t.getCause(); + } + } + if (t instanceof NullPointerException && t.getMessage().equals("null")) { + //Hier läuft das Portal rein, wenn eine Anwendung sich beim Programmstart automatisch schließt + //z. B. bei Locks bei Semikron oder deaktivierten VDA-Lieferanten in der Erfassung + } else { + OKPopup.createInstance("", t.getMessage()); + } + + } } diff --git a/src/main/java/de/tvo/workplace/WorkpageDefaultStarterInfo.java b/src/main/java/de/tvo/workplace/DefaultWorkpageStarterInfo.java similarity index 65% rename from src/main/java/de/tvo/workplace/WorkpageDefaultStarterInfo.java rename to src/main/java/de/tvo/workplace/DefaultWorkpageStarterInfo.java index feaece8..aebde2e 100644 --- a/src/main/java/de/tvo/workplace/WorkpageDefaultStarterInfo.java +++ b/src/main/java/de/tvo/workplace/DefaultWorkpageStarterInfo.java @@ -2,6 +2,10 @@ package de.tvo.workplace; import org.eclnt.workplace.WorkpageStartInfo; +import com.google.gson.GsonBuilder; + +import jakarta.xml.bind.annotation.XmlTransient; + /** * DE: * @@ -18,15 +22,15 @@ import org.eclnt.workplace.WorkpageStartInfo; * @version 1.0 * */ -public class WorkpageDefaultStarterInfo extends WorkpageStartInfo { +public class DefaultWorkpageStarterInfo extends WorkpageStartInfo { private static final long serialVersionUID = 1L; -// @XmlTransient -// private SessionVars m_sessionVars; -// @XmlTransient -// public SessionVars getSessionVars() { return m_sessionVars; } -// public void setSessionVars(SessionVars sessionVars) { m_sessionVars = sessionVars; } + @XmlTransient + private SessionVars m_sessionVars; + @XmlTransient + public SessionVars getSessionVars() { return m_sessionVars; } + public void setSessionVars(SessionVars sessionVars) { m_sessionVars = sessionVars; } // // @XmlTransient // private Rights m_rights; @@ -35,17 +39,17 @@ public class WorkpageDefaultStarterInfo extends WorkpageStartInfo { // public void setRights(Rights rights) { m_rights = rights; } // // //Merker Variable fuer das Menu -// @XmlTransient -// private String m_startPageBeanName; -// @XmlTransient -// public String getStartPageBeanName() {return m_startPageBeanName;} -// public void setStartPageBeanName(String startPageBeanName) {m_startPageBeanName = startPageBeanName;} + @XmlTransient + private String m_startPageBeanName; + @XmlTransient + public String getStartPageBeanName() {return m_startPageBeanName;} + public void setStartPageBeanName(String startPageBeanName) {m_startPageBeanName = startPageBeanName;} - public WorkpageDefaultStarterInfo() { + public DefaultWorkpageStarterInfo() { super(); } - public WorkpageDefaultStarterInfo(WorkpageStartInfo wpsi) { + public DefaultWorkpageStarterInfo(WorkpageStartInfo wpsi) { this.setCloseSupported(wpsi.getCloseSupported()); this.setComment(wpsi.getComment()); this.setDecorated(wpsi.isDecorated()); @@ -64,8 +68,8 @@ public class WorkpageDefaultStarterInfo extends WorkpageStartInfo { this.setWindowTitle(wpsi.getWindowTitle()); this.setParamMap(wpsi.getParamMap()); // this.m_rights = new GsonBuilder().create().fromJson(this.getParam("RIGHTS"), Rights.class); -// this.m_sessionVars = new GsonBuilder().create().fromJson(this.getParam("SESSIONVARS"), SessionVars.class); - //this.m_startPageBeanName = this.getParam("PAGEBEAN"); + this.m_sessionVars = new GsonBuilder().create().fromJson(this.getParam("SESSIONVARS"), SessionVars.class); + this.m_startPageBeanName = this.getParam("PAGEBEAN"); } } diff --git a/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java b/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java index 35bf3b0..c31f809 100644 --- a/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java +++ b/src/main/java/de/tvo/workplace/DefaultWorkplaceBean.java @@ -1,11 +1,14 @@ package de.tvo.workplace; import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; import org.eclnt.editor.annotations.CCGenClass; import org.eclnt.jsfserver.util.HttpSessionAccess; import org.eclnt.workplace.IWorkpageDispatcher; import org.eclnt.workplace.WorkpageDispatchedPageBean; +import org.eclnt.workplace.WorkpageStarterFactory; import de.geis.portal.workplace.layout.DefaultLayout; import jakarta.servlet.http.HttpSession; @@ -68,10 +71,58 @@ public class DefaultWorkplaceBean { super(workpageDispatcher); m_layout = defaultLayout; - + init(); } - public String getPageName() { return "/workplace/defaultWorkplace.xml"; } + private void init() { + HttpSession hs = HttpSessionAccess.getCurrentHttpSession(); + hs.setAttribute(DefaultWorkplaceBean.class.getName(),this); + +// m_menuBean = m_functionsBean; +// +// loadTree(true); +// +// showNavigation(); +// +// m_searchBean = new FunctionSearchUI(); + +// if (getTest()) { +// setRenderTest(true); +// } + + //System.out.println(this.getClass().getSimpleName() + " init: " + m_favorits); + + //MK: Deaktivieren von Drag n Drop im Workplace selbst + getWorkpageContainer().setWithWorkpageDragDrop(false); + + //MK: Hinzufuegen der Home Seite die nicht geschlossen werden kann + DefaultWorkpageStarterInfo wpsi = new DefaultWorkpageStarterInfo(); + //wpsi.setSessionVars(this.sessionVars); + wpsi.setCloseSupported(false); + wpsi.setComment("Home"); + wpsi.setDecorated(false); + wpsi.setId("HOME"); + //MK: Auskommenteirt weil er sonst die JSP callen möchte, er soll jedoch ueber Klasse callen +// wpsi.setJspPage("/portal/workplace/favorits.jsp"); + wpsi.setOpenAsPopupByDefault(false); + wpsi.setOpenMultipleInstances(false); + wpsi.setPageBeanName("HomeBean"); + wpsi.setPopupSupported(false); + wpsi.setSelectorTitle("Home"); + wpsi.setText("Home"); + wpsi.setWindowTitle("Home"); + Map param = new HashMap<>(); +// param.put(StarterInfoParm.MANDANTID.name(), "0"); +// param.put(StarterInfoParm.NODEKNID.name(), "0"); +// wpsi.setParamMap(param); + + WorkpageStarterFactory.getWorkpageStarter().startWorkpage(getOwningDispatcher(), getWorkpageContainer(), wpsi); + + } + + @Override + public String getPageName() { return "/workplace/defaultWorkplace.xml"; } + @Override public String getRootExpressionUsedInPage() { return "#{d.DefaultWorkplaceBean}"; } // ------------------------------------------------------------------------ diff --git a/src/main/java/de/tvo/workplace/SessionVars.java b/src/main/java/de/tvo/workplace/SessionVars.java new file mode 100644 index 0000000..b6e2076 --- /dev/null +++ b/src/main/java/de/tvo/workplace/SessionVars.java @@ -0,0 +1,9 @@ +package de.tvo.workplace; + +public class SessionVars { + + public SessionVars() { + // TODO Auto-generated constructor stub + } + +}