|
From: Michael K. <ko...@us...> - 2006-01-23 16:06:42
|
Update of /cvsroot/cobricks/cobricks2/src/org/cobricks/context In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28010 Modified Files: ContextManager.java ContextManagerImpl.java ContextServlet.java Log Message: added component events for context actions Index: ContextServlet.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ContextServlet.java 26 Feb 2004 08:12:54 -0000 1.2 +++ ContextServlet.java 23 Jan 2006 16:06:33 -0000 1.3 @@ -145,6 +145,8 @@ */ public String performDelete(PortalRequest prequest, PrintWriter out) { + PortalUser portalUser = prequest.getPortalUser(); + String[] sarr = prequest.getRequestParameterValues("cid"); if (sarr == null) return "success"; @@ -152,7 +154,8 @@ for (int i=0; i<sarr.length; i++) { try { int cid = Integer.parseInt(sarr[i]); - contextManager.deleteContext(cid); + contextManager. + deleteContext(cid, portalUser.getUser().getId()); } catch (Exception e) { logger.error(LogUtil.exception("", e)); } Index: ContextManager.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ContextManager.java 10 Aug 2005 13:35:33 -0000 1.2 +++ ContextManager.java 23 Jan 2006 16:06:33 -0000 1.3 @@ -43,7 +43,7 @@ throws Exception; public void setContextDestinationIds(int cid, Set destinationids) throws Exception; - public void deleteContext(int cid) + public void deleteContext(int cid, int userid) throws Exception; // external resources Index: ContextManagerImpl.java =================================================================== RCS file: /cvsroot/cobricks/cobricks2/src/org/cobricks/context/ContextManagerImpl.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ContextManagerImpl.java 29 Nov 2005 07:18:38 -0000 1.4 +++ ContextManagerImpl.java 23 Jan 2006 16:06:33 -0000 1.5 @@ -20,6 +20,8 @@ import org.cobricks.core.ComponentManagerAdaptor; import org.cobricks.core.ComponentManagerInterface; import org.cobricks.core.ComponentDirectory; +import org.cobricks.core.ComponentEvent; +import org.cobricks.core.ComponentEventImpl; import org.cobricks.core.CoreManager; import org.cobricks.core.Ontology; import org.cobricks.core.OntologyClass; @@ -237,7 +239,8 @@ */ public int createContext(String classname, int sourceid, Map cattrs, User creator) - throws Exception { + throws Exception + { OntologyClass oc = ontology.getClass(classname); if (oc == null) return 0; // tbd: exception? @@ -295,6 +298,16 @@ } setContextObjectInCache(context); + + // and finally send a component event + ComponentEvent event = + new ComponentEventImpl("org.cobricks.context", + "context", "create"); + event.setObjectId(cid); + if (creator != null) + event.setUserId(creator.getId()); + this.publishEvent(event); + return cid; } @@ -324,7 +337,18 @@ * */ public void deleteContext(int cid) - throws Exception { + throws Exception + { + deleteContext(cid, -1); + } + + + /** + * + */ + public void deleteContext(int cid, int userid) + throws Exception + { // first delete the destination ids Map attrs = new HashMap(); attrs.put("cid", new Integer(cid)); @@ -333,6 +357,14 @@ dbAccess.sqlDelete("context_attr", attrs); // and finally delete the main data dbAccess.sqlDelete("context", cid); + + // and finally send a component event + ComponentEvent event = + new ComponentEventImpl("org.cobricks.context", + "context", "delete"); + event.setObjectId(cid); + event.setUserId(userid); + this.publishEvent(event); } |