[elvystrac] r1722 - DB changed - version 25 (part.3):
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Sun, 14 Feb 2010 17:04:59 +0100
Author: DavidK
Date: 2010-02-14 17:04:59 +0100 (Sun, 14 Feb 2010)
New Revision: 1722
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutStorageWorkerImpl.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/UnlockLayourWorkerImpl.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutLockingServlet.java
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutStorageServlet.java
Log:
DB changed - version 25 (part.3):
- abstraktni predek planovani souboru
- datum zmeny u timeline, uzivatel, ktery zmenu provedl
- datum zalozeni a modifikace layoutu, uzivatel, ktery provedl posl.
modif.
- type_plug identity
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/DocumentConfigWorkerImpl.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -235,19 +235,19 @@
PdfDoc pdf = of.createPdfDoc();
{
// id
- int id = doc.getDocument().getId();
+ int id = doc.getFile().getId();
pdf.setId(id);
}
{
//name
Name name = of.createPdfDocName();
-
name.setContent(doc.getDocument().getUniqName());
+
name.setContent(doc.getFile().getUniqName());
pdf.setName(name);
}
{
//orig-name
OrigName origName =
of.createPdfDocOrigName();
-
origName.setContent(doc.getDocument().getOrigName());
+
origName.setContent(doc.getFile().getOrigName());
pdf.setOrigName(origName);
}
{
@@ -373,18 +373,18 @@
Video vr = of.createVideo();
{
//id
- vr.setId(vc.getVideo().getId());
+ vr.setId(vc.getFile().getId());
}
{
// name
cz.elvys.jaxbgen.document.Video.Name
name = of.createVideoName();
-
name.setContent(vc.getVideo().getUniqName());
+
name.setContent(vc.getFile().getUniqName());
vr.setName(name);
}
{
// orig-name
cz.elvys.jaxbgen.document.Video.OrigName origName = of.createVideoOrigName();
-
origName.setContent(vc.getVideo().getOrigName());
+
origName.setContent(vc.getFile().getOrigName());
vr.setOrigName(origName);
}
{
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/FilecacheConfigWorkerImpl.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -28,11 +28,11 @@
import cz.elvys.dispatcher.api.FilecacheConfigWorker;
import cz.elvys.jaxbgen.filecache.FileCacheConfig;
import cz.elvys.jaxbgen.filecache.ObjectFactory;
-import cz.elvys.webServer.HIBgen.DocumentContent;
import cz.elvys.webServer.HIBgen.Elvys;
import cz.elvys.webServer.HIBgen.File;
+import cz.elvys.webServer.HIBgen.FileFrameContent;
+import cz.elvys.webServer.HIBgen.FileType;
import cz.elvys.webServer.HIBgen.Timeline;
-import cz.elvys.webServer.HIBgen.VideoContent;
import cz.elvys.webServer.db.InitSessionFactory;
import cz.elvys.webServer.toSpring.exception.ExecuteException;
import elvys.server.bl.Fact;
@@ -148,19 +148,13 @@
Collection<List<Timeline>>
panelInstancesOfPosition = posTimelines.values();
for(List<Timeline> timelines:
panelInstancesOfPosition) {
for(Timeline tl: timelines) {
- String type =
tl.getFrameContent().getContentType().getType();
- // TODO tohle oddelat! udelat
spolecneho predka FrameContentWithFile..
-
- if (type.equals("video")) {
- VideoContent vc =
(VideoContent) tl.getFrameContent();
- File file =
vc.getVideo();
+ FileType type =
tl.getFrameContent().getContentType().getFileType();
+ if (type != null) {
+ // timeline contains
FileFrameContent
+ FileFrameContent ffc =
(FileFrameContent) tl.getFrameContent();
+ File file =
ffc.getFile();
files.add(file);
continue;
- } else if
(type.equals("document")) {
- DocumentContent dc =
(DocumentContent) tl.getFrameContent();
- File file =
dc.getDocument();
- files.add(file);
- continue;
}
}
}
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutStorageWorkerImpl.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutStorageWorkerImpl.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutStorageWorkerImpl.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -2,6 +2,7 @@
import java.io.Reader;
import java.io.StringReader;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -162,6 +163,7 @@
*
* @return
*/
+ // TODO - tady nechceme predavat setLocked
private cz.elvys.webServer.HIBgen.Layout transformToHIB(Layout layout,
Integer companyID, Integer userID, boolean setLocked)
throws Exception {
cz.elvys.webServer.HIBgen.Layout hibLayout;
@@ -184,6 +186,7 @@
* id of company
* @return Hibernate layout object
*/
+ // TODO nechceme parametr setLocked
private cz.elvys.webServer.HIBgen.Layout createUpdateHibLayout(
Layout layout, Integer companyID, Integer userID,
boolean setLocked) throws Exception {
// Am I updating or storing new??
@@ -223,6 +226,7 @@
} else {
hibLayout = new cz.elvys.webServer.HIBgen.Layout();
}
+ Date now = new Date();
{
// id
// autogenerated or retained from db
@@ -273,7 +277,7 @@
{
// disabled
if (isUpdating) {
- ; // if it was disablet, leave it disabled
+ ; // if it was disabled, leave it disabled
} else {
hibLayout.setDisabled(false);
}
@@ -312,31 +316,45 @@
}
{
// lastLockTime
+ // TODO v teto metode nechat jenom ukladani do DB,
zamykani jinam
if(setLocked) {
- java.util.Date now = new java.util.Date();
- java.sql.Date sqlNow = new
java.sql.Date(now.getTime());
- hibLayout.setLastLockTime(sqlNow);
+ hibLayout.setLastLockTime(now);
}
else {
hibLayout.setLastLockTime(null);
}
}
+ User user = (User) HibUtils.findByID(User.class, userID);
{
// lastLockUser
+ // TODO v teto metode nechat jenom ukladani do DB,
zamykani jinam
if(setLocked) {
- User user = (User)
HibUtils.findByID(User.class, userID);
- user.setId(userID);
- hibLayout.setUser(user);
+ hibLayout.setUserByLastLockUser(user);
}
else {
- hibLayout.setUser(null);
+ hibLayout.setUserByLastLockUser(null);
}
}
{
// isLocked
+ // TODO nenastavovat tady
hibLayout.setLocked(setLocked);
}
+ {
+ // created
+ if (!isUpdating) {
+ hibLayout.setCreated(now);
+ }
+ }
+ {
+ // modified
+ hibLayout.setModified(now);
+ }
+ {
+ // modifiedBy
+ hibLayout.setUserByModifiedBy(user);
+ }
return hibLayout;
}
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/LayoutWorkerImpl.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -38,9 +38,6 @@
}
- /* (non-Javadoc)
- * @see
cz.elvys.dispatcher.api.LayoutWorker#doesLayoutBelongToCompany(java.lang.Integer,
java.lang.Integer)
- */
@Override
public boolean doesLayoutBelongToCompany(Integer layoutID, Integer
companyID) throws Exception {
if (layoutID == null || companyID == null) {
@@ -66,6 +63,7 @@
}
}
+ @Override
public String getLayoutXML(Integer layoutID) throws Exception {
// get Hib layout from DB
cz.elvys.webServer.HIBgen.Layout hibl =
(cz.elvys.webServer.HIBgen.Layout) HibUtils.findByID(
@@ -87,6 +85,7 @@
return str;
}
+ @Override
public cz.elvys.webServer.HIBgen.Layout getLayout(Integer layoutID)
throws Exception {
// get Hib layout from DB
cz.elvys.webServer.HIBgen.Layout layout =
(cz.elvys.webServer.HIBgen.Layout) HibUtils.findByID(
@@ -98,12 +97,7 @@
- /**
- * generates JAXB object of layoutConfig from DB
- * @param hibl hibernate object of layout
- * @param includeDocType include document-type elements in the output
xml
- * @return jaxb object of layout
- */
+ @Override
public Layout conversionHIBtoJAXB(cz.elvys.webServer.HIBgen.Layout
hibl, boolean includeDocType) {
if (hibl == null) {
// desired layout is not set
@@ -230,7 +224,7 @@
return false;
}
- if(hibl.getUser().getId().equals(userID)) {
+ if(hibl.getUserByLastLockUser().getId().equals(userID)) {
return true;
}
else {
@@ -265,6 +259,6 @@
return null;
}
- return hibl.getUser().getUsername();
+ return hibl.getUserByLastLockUser().getUsername();
}
}
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/UnlockLayourWorkerImpl.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/UnlockLayourWorkerImpl.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/impl/UnlockLayourWorkerImpl.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -10,6 +10,7 @@
LayoutWorker worker =
ServletLogicFactory.getInstance().getLayoutWorker();
String layout = worker.getLayoutXML(layoutID);
+ // TODO - tohle volani nechceme
ServletLogicFactory.getInstance().getLayoutStorageWorker().storeLayout(layout,
companyID, userID, isLocked);
}
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutLockingServlet.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutLockingServlet.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutLockingServlet.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -11,7 +11,6 @@
import org.apache.log4j.Logger;
import cz.elvys.commons.utils.CommonUtils;
-import cz.elvys.dispatcher.api.LayoutStorageWorker;
import cz.elvys.dispatcher.api.LayoutWorker;
import cz.elvys.dispatcher.impl.ServletLogicFactory;
import cz.elvys.dispatcher.servlet.DispatcherServlet;
Modified:
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutStorageServlet.java
===================================================================
---
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutStorageServlet.java
2010-02-14 16:04:01 UTC (rev 1721)
+++
trunk/server/dispatcher/JavaSource/cz/elvys/dispatcher/servlet/applet/LayoutStorageServlet.java
2010-02-14 16:04:59 UTC (rev 1722)
@@ -72,11 +72,6 @@
// get xml data
String xml =
CommonUtils.getStringFromInputStream(req.getInputStream());
- Integer layoutID = 0;
- try {
- layoutID = Integer.parseInt(xml);
- } catch (Exception e) {
- }
// store layout (xml) to db
LayoutStorageWorker worker =
ServletLogicFactory.getInstance().getLayoutStorageWorker();
@@ -88,11 +83,8 @@
layoutIDAfter = null;
responseException = e;
}
+
-
-
-
-
// write to response
resp.setContentType(responseContentType);
PrintWriter writer = resp.getWriter();
Other related posts:
- » [elvystrac] r1722 - DB changed - version 25 (part.3): - elvys
