X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=swt%2Frcp%2Forg.argeo.cms.swt.rcp%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Frcp%2Fservlet%2FCmsRcpServlet.java;h=8579527c1f5057c5c1cdc7de18ecc6aace2464b5;hb=8c6e16aa43d9523e1ec57a41a06b3ceba7d23fdb;hp=f8aecd39b996a688daec78bfc1af8de00088439b;hpb=79c14508549e1af042485b4f888a3c54f5a68833;p=lgpl%2Fargeo-commons.git diff --git a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java index f8aecd39b..8579527c1 100644 --- a/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java +++ b/swt/rcp/org.argeo.cms.swt.rcp/src/org/argeo/cms/ui/rcp/servlet/CmsRcpServlet.java @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse; import org.argeo.api.cms.CmsApp; import org.argeo.cms.ui.rcp.CmsRcpDisplayFactory; -import org.osgi.service.event.EventAdmin; /** Open the related app when called. */ public class CmsRcpServlet extends HttpServlet { @@ -20,20 +19,17 @@ public class CmsRcpServlet extends HttpServlet { private final static Logger logger = System.getLogger(CmsRcpServlet.class.getName()); private CmsApp cmsApp; - private EventAdmin eventAdmin; - public CmsRcpServlet(EventAdmin eventAdmin, CmsApp cmsApp) { - Objects.requireNonNull(eventAdmin); + public CmsRcpServlet(CmsApp cmsApp) { Objects.requireNonNull(cmsApp); this.cmsApp = cmsApp; - this.eventAdmin = eventAdmin; } @Override protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { String path = req.getPathInfo(); String uiName = path != null ? path.substring(path.lastIndexOf('/') + 1) : ""; - CmsRcpDisplayFactory.openCmsApp(eventAdmin, cmsApp, uiName, null); + CmsRcpDisplayFactory.openCmsApp(cmsApp, uiName, null); logger.log(Level.DEBUG, "Opened RCP UI " + uiName + " of CMS App " + req.getServletPath()); }