Author: DavidK Date: 2010-02-14 17:04:01 +0100 (Sun, 14 Feb 2010) New Revision: 1721 Added: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileFrameContent.java Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/AspectRatio.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Category.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryDefinition.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryPlanning.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CompSetting.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Company.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ContentType.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DbInfo.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Document.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DocumentContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DynamicContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Elvys.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysGroup.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysSetting.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/File.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileType.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FrameContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Label.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Layout.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPosition.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPositionId.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Panel.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/PanelId.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Resolution.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Role.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Statistics.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TextContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Timeline.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TypePlug.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/UrlContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/User.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Video.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/VideoContent.java trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/File.hbm.xml trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/FrameContent.hbm.xml trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Layout.hbm.xml trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Timeline.hbm.xml trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/TypePlug.hbm.xml trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/User.hbm.xml trunk/server/elvysCommons/src/elvys/server/bl/Fact.java trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBL.java trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLTest.java trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBL.java trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLImpl.java trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLTest.java trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBL.java trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBLImpl.java Log: DB changed - version 25 (part.2): - 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/elvysCommons/src/cz/elvys/webServer/HIBgen/AspectRatio.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/AspectRatio.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/AspectRatio.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Category.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Category.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Category.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryDefinition.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryDefinition.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryDefinition.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryPlanning.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryPlanning.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CategoryPlanning.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CompSetting.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CompSetting.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/CompSetting.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Company.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Company.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Company.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ContentType.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ContentType.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ContentType.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DbInfo.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DbInfo.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DbInfo.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Document.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Document.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Document.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,9 +1,8 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; -import java.util.HashSet; import java.util.Set; /** @@ -13,7 +12,6 @@ private int pageCount; - private Set<DocumentContent> documentContents = new HashSet<DocumentContent>(0); public Document() { } @@ -23,10 +21,9 @@ super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled); this.pageCount = pageCount; } - public Document(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<Label> labels, int pageCount, Set<DocumentContent> documentContents) { - super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled, statisticses, labels); + public Document(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<FileFrameContent> fileFrameContents, Set<Label> labels, int pageCount) { + super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled, statisticses, fileFrameContents, labels); this.pageCount = pageCount; - this.documentContents = documentContents; } public int getPageCount() { @@ -36,13 +33,6 @@ public void setPageCount(int pageCount) { this.pageCount = pageCount; } - public Set<DocumentContent> getDocumentContents() { - return this.documentContents; - } - - public void setDocumentContents(Set<DocumentContent> documentContents) { - this.documentContents = documentContents; - } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DocumentContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DocumentContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DocumentContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Set; @@ -7,10 +7,9 @@ /** * DocumentContent generated by hbm2java */ -public class DocumentContent extends cz.elvys.webServer.HIBgen.FrameContent implements java.lang.Cloneable,java.io.Serializable { +public class DocumentContent extends cz.elvys.webServer.HIBgen.FileFrameContent implements java.lang.Cloneable,java.io.Serializable { - private Document document; private String pageList; private String numPreviewPage; @@ -18,26 +17,17 @@ } - public DocumentContent(ContentType contentType, Document document, String pageList, String numPreviewPage) { - super(contentType); - this.document = document; + public DocumentContent(ContentType contentType, File file, String pageList, String numPreviewPage) { + super(contentType, file); this.pageList = pageList; this.numPreviewPage = numPreviewPage; } - public DocumentContent(ContentType contentType, Set<Timeline> timelines, Document document, String pageList, String numPreviewPage) { - super(contentType, timelines); - this.document = document; + public DocumentContent(ContentType contentType, Set<Timeline> timelines, File file, String pageList, String numPreviewPage) { + super(contentType, timelines, file); this.pageList = pageList; this.numPreviewPage = numPreviewPage; } - public Document getDocument() { - return this.document; - } - - public void setDocument(Document document) { - this.document = document; - } public String getPageList() { return this.pageList; } @@ -57,22 +47,21 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - DocumentContent doccon = (DocumentContent)super.clone(); - // not defensive copy, i will change neither Document nor pageList, i promise :) - doccon.setDocument(document); - doccon.setPageList(pageList); - doccon.setNumPreviewPage(numPreviewPage); - return doccon; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + DocumentContent doccon = (DocumentContent)super.clone(); + // not defensive copy, i will change neither Document nor pageList, i promise :) + doccon.setPageList(pageList); + doccon.setNumPreviewPage(numPreviewPage); + return doccon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DynamicContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DynamicContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/DynamicContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Set; @@ -82,23 +82,23 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - DynamicContent dynacon = (DynamicContent) super.clone(); - dynacon.setTOrder(TOrder); - dynacon.setBgColor(bgColor); - dynacon.setColor(color); - dynacon.setFont(font); - dynacon.setSize(size != null? new Integer(size) : null); - dynacon.setText(text); - return dynacon; - } - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + DynamicContent dynacon = (DynamicContent) super.clone(); + dynacon.setTOrder(TOrder); + dynacon.setBgColor(bgColor); + dynacon.setColor(color); + dynacon.setFont(font); + dynacon.setSize(size != null? new Integer(size) : null); + dynacon.setText(text); + return dynacon; + } + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Elvys.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Elvys.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Elvys.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysGroup.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysGroup.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysGroup.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysSetting.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysSetting.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/ElvysSetting.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/File.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/File.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/File.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; @@ -24,6 +24,7 @@ private int size; private boolean disabled; private Set<Statistics> statisticses = new HashSet<Statistics>(0); + private Set<FileFrameContent> fileFrameContents = new HashSet<FileFrameContent>(0); private Set<Label> labels = new HashSet<Label>(0); public File() { @@ -42,7 +43,7 @@ this.size = size; this.disabled = disabled; } - public File(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<Label> labels) { + public File(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<FileFrameContent> fileFrameContents, Set<Label> labels) { this.user = user; this.fileType = fileType; this.origName = origName; @@ -54,6 +55,7 @@ this.size = size; this.disabled = disabled; this.statisticses = statisticses; + this.fileFrameContents = fileFrameContents; this.labels = labels; } @@ -141,6 +143,13 @@ public void setStatisticses(Set<Statistics> statisticses) { this.statisticses = statisticses; } + public Set<FileFrameContent> getFileFrameContents() { + return this.fileFrameContents; + } + + public void setFileFrameContents(Set<FileFrameContent> fileFrameContents) { + this.fileFrameContents = fileFrameContents; + } public Set<Label> getLabels() { return this.labels; } Added: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileFrameContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileFrameContent.java (rev 0) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileFrameContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -0,0 +1,58 @@ +package cz.elvys.webServer.HIBgen; +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA + + +import java.util.Set; + +/** + * FileFrameContent generated by hbm2java + */ +public class FileFrameContent extends cz.elvys.webServer.HIBgen.FrameContent implements java.lang.Cloneable,java.io.Serializable { + + + private File file; + + public FileFrameContent() { + } + + + public FileFrameContent(ContentType contentType, File file) { + super(contentType); + this.file = file; + } + public FileFrameContent(ContentType contentType, Set<Timeline> timelines, File file) { + super(contentType, timelines); + this.file = file; + } + + public File getFile() { + return this.file; + } + + public void setFile(File file) { + this.file = file; + } + + + + // The following is extra code specified in the hbm.xml files + + @Override + public Object clone() throws CloneNotSupportedException { + FileFrameContent ffcon = (FileFrameContent)super.clone(); + // not defensive copy, i will change neither Document nor pageList, i promise :) + ffcon.setFile(file); + return ffcon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + + // end of extra code specified in the hbm.xml files + +} + + Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileType.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileType.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FileType.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FrameContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FrameContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/FrameContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; @@ -53,22 +53,22 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - FrameContent frc = (FrameContent)super.clone(); - frc.setId(new Integer(id.intValue())); - // not defensive copy, i will change neither ContentType nor Timelines , i promise :) - frc.setContentType(contentType); - frc.setTimelines(timelines); - return frc; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + FrameContent frc = (FrameContent)super.clone(); + frc.setId(new Integer(id.intValue())); + // not defensive copy, i will change neither ContentType nor Timelines , i promise :) + frc.setContentType(contentType); + frc.setTimelines(timelines); + return frc; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Label.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Label.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Label.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Layout.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Layout.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Layout.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; @@ -14,14 +14,17 @@ private Integer id; private AspectRatio aspectRatio; + private User userByModifiedBy; private Company company; - private User user; + private User userByLastLockUser; private int sectCount; private String name; private boolean disabled; private int revision; private Date lastLockTime; private boolean locked; + private Date created; + private Date modified; private Set<Statistics> statisticses = new HashSet<Statistics>(0); private Set<Timeline> timelines = new HashSet<Timeline>(0); private Set<CategoryDefinition> categoryDefinitions = new HashSet<CategoryDefinition>(0); @@ -31,25 +34,31 @@ } - public Layout(AspectRatio aspectRatio, Company company, int sectCount, String name, boolean disabled, int revision, boolean locked) { + public Layout(AspectRatio aspectRatio, User userByModifiedBy, Company company, int sectCount, String name, boolean disabled, int revision, boolean locked, Date created, Date modified) { this.aspectRatio = aspectRatio; + this.userByModifiedBy = userByModifiedBy; this.company = company; this.sectCount = sectCount; this.name = name; this.disabled = disabled; this.revision = revision; this.locked = locked; + this.created = created; + this.modified = modified; } - public Layout(AspectRatio aspectRatio, Company company, User user, int sectCount, String name, boolean disabled, int revision, Date lastLockTime, boolean locked, Set<Statistics> statisticses, Set<Timeline> timelines, Set<CategoryDefinition> categoryDefinitions, Set<LayoutPosition> layoutPositions) { + public Layout(AspectRatio aspectRatio, User userByModifiedBy, Company company, User userByLastLockUser, int sectCount, String name, boolean disabled, int revision, Date lastLockTime, boolean locked, Date created, Date modified, Set<Statistics> statisticses, Set<Timeline> timelines, Set<CategoryDefinition> categoryDefinitions, Set<LayoutPosition> layoutPositions) { this.aspectRatio = aspectRatio; + this.userByModifiedBy = userByModifiedBy; this.company = company; - this.user = user; + this.userByLastLockUser = userByLastLockUser; this.sectCount = sectCount; this.name = name; this.disabled = disabled; this.revision = revision; this.lastLockTime = lastLockTime; this.locked = locked; + this.created = created; + this.modified = modified; this.statisticses = statisticses; this.timelines = timelines; this.categoryDefinitions = categoryDefinitions; @@ -70,6 +79,13 @@ public void setAspectRatio(AspectRatio aspectRatio) { this.aspectRatio = aspectRatio; } + public User getUserByModifiedBy() { + return this.userByModifiedBy; + } + + public void setUserByModifiedBy(User userByModifiedBy) { + this.userByModifiedBy = userByModifiedBy; + } public Company getCompany() { return this.company; } @@ -77,12 +93,12 @@ public void setCompany(Company company) { this.company = company; } - public User getUser() { - return this.user; + public User getUserByLastLockUser() { + return this.userByLastLockUser; } - public void setUser(User user) { - this.user = user; + public void setUserByLastLockUser(User userByLastLockUser) { + this.userByLastLockUser = userByLastLockUser; } public int getSectCount() { return this.sectCount; @@ -126,6 +142,20 @@ public void setLocked(boolean locked) { this.locked = locked; } + public Date getCreated() { + return this.created; + } + + public void setCreated(Date created) { + this.created = created; + } + public Date getModified() { + return this.modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } public Set<Statistics> getStatisticses() { return this.statisticses; } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPosition.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPosition.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPosition.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPositionId.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPositionId.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/LayoutPositionId.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Panel.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Panel.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Panel.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/PanelId.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/PanelId.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/PanelId.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Resolution.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Resolution.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Resolution.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Role.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Role.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Role.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Statistics.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Statistics.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Statistics.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TextContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TextContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TextContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Set; @@ -73,24 +73,24 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - TextContent textcon = (TextContent)super.clone(); - textcon.setBgColor(bgColor); - textcon.setColor(color); - textcon.setFont(font); - textcon.setSize(size); - textcon.setText(text); - return textcon; - } - - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + TextContent textcon = (TextContent)super.clone(); + textcon.setBgColor(bgColor); + textcon.setColor(color); + textcon.setFont(font); + textcon.setSize(size); + textcon.setText(text); + return textcon; + } + + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Timeline.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Timeline.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Timeline.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; @@ -12,22 +12,26 @@ private int id; private Panel panel; + private User user; private Layout layout; private FrameContent frameContent; private Date showStart; private Date showEnd; private byte layoutPos; + private Date modified; public Timeline() { } - public Timeline(Panel panel, Layout layout, FrameContent frameContent, Date showStart, Date showEnd, byte layoutPos) { + public Timeline(Panel panel, User user, Layout layout, FrameContent frameContent, Date showStart, Date showEnd, byte layoutPos, Date modified) { this.panel = panel; + this.user = user; this.layout = layout; this.frameContent = frameContent; this.showStart = showStart; this.showEnd = showEnd; this.layoutPos = layoutPos; + this.modified = modified; } public int getId() { @@ -44,6 +48,13 @@ public void setPanel(Panel panel) { this.panel = panel; } + public User getUser() { + return this.user; + } + + public void setUser(User user) { + this.user = user; + } public Layout getLayout() { return this.layout; } @@ -79,6 +90,13 @@ public void setLayoutPos(byte layoutPos) { this.layoutPos = layoutPos; } + public Date getModified() { + return this.modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TypePlug.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TypePlug.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/TypePlug.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; @@ -11,23 +11,28 @@ public class TypePlug implements java.io.Serializable { - private Integer id; + private int id; private String componentClass; private Set<ContentType> contentTypes = new HashSet<ContentType>(0); public TypePlug() { } - public TypePlug(String componentClass, Set<ContentType> contentTypes) { + + public TypePlug(int id) { + this.id = id; + } + public TypePlug(int id, String componentClass, Set<ContentType> contentTypes) { + this.id = id; this.componentClass = componentClass; this.contentTypes = contentTypes; } - public Integer getId() { + public int getId() { return this.id; } - public void setId(Integer id) { + public void setId(int id) { this.id = id; } public String getComponentClass() { Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/UrlContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/UrlContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/UrlContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Set; @@ -47,20 +47,20 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - UrlContent urlcon = (UrlContent)super.clone(); - urlcon.setName(name); - urlcon.setUrl(url); - return urlcon; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + UrlContent urlcon = (UrlContent)super.clone(); + urlcon.setName(name); + urlcon.setUrl(url); + return urlcon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/User.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/User.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/User.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.HashSet; @@ -21,7 +21,9 @@ private String locale; private boolean system; private boolean disabled; - private Set<Layout> layouts = new HashSet<Layout>(0); + private Set<Layout> layoutsForLastLockUser = new HashSet<Layout>(0); + private Set<Layout> layoutsForModifiedBy = new HashSet<Layout>(0); + private Set<Timeline> timelines = new HashSet<Timeline>(0); private Set<File> files = new HashSet<File>(0); public User() { @@ -39,7 +41,7 @@ this.system = system; this.disabled = disabled; } - public User(Role role, Company company, String username, String realname, String surname, String password, String locale, boolean system, boolean disabled, Set<Layout> layouts, Set<File> files) { + public User(Role role, Company company, String username, String realname, String surname, String password, String locale, boolean system, boolean disabled, Set<Layout> layoutsForLastLockUser, Set<Layout> layoutsForModifiedBy, Set<Timeline> timelines, Set<File> files) { this.role = role; this.company = company; this.username = username; @@ -49,7 +51,9 @@ this.locale = locale; this.system = system; this.disabled = disabled; - this.layouts = layouts; + this.layoutsForLastLockUser = layoutsForLastLockUser; + this.layoutsForModifiedBy = layoutsForModifiedBy; + this.timelines = timelines; this.files = files; } @@ -123,13 +127,27 @@ public void setDisabled(boolean disabled) { this.disabled = disabled; } - public Set<Layout> getLayouts() { - return this.layouts; + public Set<Layout> getLayoutsForLastLockUser() { + return this.layoutsForLastLockUser; } - public void setLayouts(Set<Layout> layouts) { - this.layouts = layouts; + public void setLayoutsForLastLockUser(Set<Layout> layoutsForLastLockUser) { + this.layoutsForLastLockUser = layoutsForLastLockUser; } + public Set<Layout> getLayoutsForModifiedBy() { + return this.layoutsForModifiedBy; + } + + public void setLayoutsForModifiedBy(Set<Layout> layoutsForModifiedBy) { + this.layoutsForModifiedBy = layoutsForModifiedBy; + } + public Set<Timeline> getTimelines() { + return this.timelines; + } + + public void setTimelines(Set<Timeline> timelines) { + this.timelines = timelines; + } public Set<File> getFiles() { return this.files; } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Video.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Video.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/Video.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,9 +1,8 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Date; -import java.util.HashSet; import java.util.Set; /** @@ -13,7 +12,6 @@ private int length; - private Set<VideoContent> videoContents = new HashSet<VideoContent>(0); public Video() { } @@ -23,10 +21,9 @@ super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled); this.length = length; } - public Video(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<Label> labels, int length, Set<VideoContent> videoContents) { - super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled, statisticses, labels); + public Video(User user, FileType fileType, String origName, String uniqName, String description, String hashcode, int compIdentifier, Date uploaded, int size, boolean disabled, Set<Statistics> statisticses, Set<FileFrameContent> fileFrameContents, Set<Label> labels, int length) { + super(user, fileType, origName, uniqName, description, hashcode, compIdentifier, uploaded, size, disabled, statisticses, fileFrameContents, labels); this.length = length; - this.videoContents = videoContents; } public int getLength() { @@ -36,13 +33,6 @@ public void setLength(int length) { this.length = length; } - public Set<VideoContent> getVideoContents() { - return this.videoContents; - } - - public void setVideoContents(Set<VideoContent> videoContents) { - this.videoContents = videoContents; - } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/VideoContent.java =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/VideoContent.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/VideoContent.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,5 +1,5 @@ package cz.elvys.webServer.HIBgen; -// Generated 29.1.2010 17:09:06 by Hibernate Tools 3.2.4.GA +// Generated 13.2.2010 22:13:08 by Hibernate Tools 3.2.4.GA import java.util.Set; @@ -7,10 +7,9 @@ /** * VideoContent generated by hbm2java */ -public class VideoContent extends cz.elvys.webServer.HIBgen.FrameContent implements java.lang.Cloneable,java.io.Serializable { +public class VideoContent extends cz.elvys.webServer.HIBgen.FileFrameContent implements java.lang.Cloneable,java.io.Serializable { - private Video video; private int startPosMs; private boolean autostart; private boolean playSound; @@ -20,30 +19,21 @@ } - public VideoContent(ContentType contentType, Video video, int startPosMs, boolean autostart, boolean playSound, int brightness) { - super(contentType); - this.video = video; + public VideoContent(ContentType contentType, File file, int startPosMs, boolean autostart, boolean playSound, int brightness) { + super(contentType, file); this.startPosMs = startPosMs; this.autostart = autostart; this.playSound = playSound; this.brightness = brightness; } - public VideoContent(ContentType contentType, Set<Timeline> timelines, Video video, int startPosMs, boolean autostart, boolean playSound, int brightness) { - super(contentType, timelines); - this.video = video; + public VideoContent(ContentType contentType, Set<Timeline> timelines, File file, int startPosMs, boolean autostart, boolean playSound, int brightness) { + super(contentType, timelines, file); this.startPosMs = startPosMs; this.autostart = autostart; this.playSound = playSound; this.brightness = brightness; } - public Video getVideo() { - return this.video; - } - - public void setVideo(Video video) { - this.video = video; - } public int getStartPosMs() { return this.startPosMs; } @@ -77,24 +67,23 @@ // The following is extra code specified in the hbm.xml files - @Override - public Object clone() throws CloneNotSupportedException { - VideoContent vidcon = (VideoContent)super.clone(); - // not defensive copy - vidcon.setVideo(video); - vidcon.setStartPosMs(startPosMs); - vidcon.setAutostart(autostart); - vidcon.setPlaySound(playSound); - vidcon.setBrightness(brightness); - return vidcon; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - + @Override + public Object clone() throws CloneNotSupportedException { + VideoContent vidcon = (VideoContent)super.clone(); + // not defensive copy + vidcon.setStartPosMs(startPosMs); + vidcon.setAutostart(autostart); + vidcon.setPlaySound(playSound); + vidcon.setBrightness(brightness); + return vidcon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + // end of extra code specified in the hbm.xml files } Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/File.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/File.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/File.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -44,6 +44,12 @@ </key> <one-to-many class="cz.elvys.webServer.HIBgen.Statistics" /> </set> + <set name="fileFrameContents" inverse="true" lazy="true" table="file_frame_content" fetch="select"> + <key> + <column name="file" not-null="true" /> + </key> + <one-to-many class="cz.elvys.webServer.HIBgen.FileFrameContent" /> + </set> <set name="labels" inverse="false" lazy="true" table="label_ref" fetch="select"> <key> <column name="file" not-null="true" /> @@ -57,24 +63,12 @@ <property name="pageCount" type="int"> <column name="page_count" not-null="true" /> </property> - <set name="documentContents" inverse="true" lazy="true" table="document_content" fetch="select"> - <key> - <column name="document" not-null="true" /> - </key> - <one-to-many class="cz.elvys.webServer.HIBgen.DocumentContent" /> - </set> </joined-subclass> <joined-subclass name="cz.elvys.webServer.HIBgen.Video" table="video"> <key column="id"/> <property name="length" type="int"> <column name="length" not-null="true" /> </property> - <set name="videoContents" inverse="true" lazy="true" table="video_content" fetch="select"> - <key> - <column name="video" not-null="true" /> - </key> - <one-to-many class="cz.elvys.webServer.HIBgen.VideoContent" /> - </set> </joined-subclass> </class> Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/FrameContent.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/FrameContent.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/FrameContent.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -4,47 +4,127 @@ <!-- Generated 9.11.2008 2:08:53 by Hibernate Tools 3.2.2.CR1 --> <hibernate-mapping> <class name="cz.elvys.webServer.HIBgen.FrameContent" table="frame_content" > - <meta attribute="implements">java.lang.Cloneable</meta> - <meta attribute="class-code"> - @Override - public Object clone() throws CloneNotSupportedException { - FrameContent frc = (FrameContent)super.clone(); - frc.setId(new Integer(id.intValue())); - // not defensive copy, i will change neither ContentType nor Timelines , i promise :) - frc.setContentType(contentType); - frc.setTimelines(timelines); - return frc; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - </meta> - <id name="id" type="java.lang.Integer"> - <column name="id" /> - <generator class="identity" /> - </id> - <many-to-one name="contentType" class="cz.elvys.webServer.HIBgen.ContentType" fetch="select"> - <column name="type" not-null="true" /> - </many-to-one> - <set name="timelines" inverse="true"> - <key> - <column name="content" not-null="true" /> - </key> - <one-to-many class="cz.elvys.webServer.HIBgen.Timeline" /> - </set> - <joined-subclass name="cz.elvys.webServer.HIBgen.DocumentContent" table="document_content" > - <meta attribute="class-code"> + <meta attribute="implements">java.lang.Cloneable</meta> + <meta attribute="class-code"> + @Override + public Object clone() throws CloneNotSupportedException { + FrameContent frc = (FrameContent)super.clone(); + frc.setId(new Integer(id.intValue())); + // not defensive copy, i will change neither ContentType nor Timelines , i promise :) + frc.setContentType(contentType); + frc.setTimelines(timelines); + return frc; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + </meta> + <id name="id" type="java.lang.Integer"> + <column name="id" /> + <generator class="identity" /> + </id> + <many-to-one name="contentType" class="cz.elvys.webServer.HIBgen.ContentType" fetch="select"> + <column name="type" not-null="true" /> + </many-to-one> + <set name="timelines" inverse="true"> + <key> + <column name="content" not-null="true" /> + </key> + <one-to-many class="cz.elvys.webServer.HIBgen.Timeline" /> + </set> + + <joined-subclass name="cz.elvys.webServer.HIBgen.FileFrameContent" table="file_frame_content"> + <meta attribute="class-code"> + @Override + public Object clone() throws CloneNotSupportedException { + FileFrameContent ffcon = (FileFrameContent)super.clone(); + // not defensive copy, i will change neither Document nor pageList, i promise :) + ffcon.setFile(file); + return ffcon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + </meta> + <key column="id"/> + <many-to-one name="file" class="cz.elvys.webServer.HIBgen.File" fetch="join" lazy="false"> + <column name="file" not-null="true" /> + </many-to-one> + <joined-subclass name="cz.elvys.webServer.HIBgen.DocumentContent" table="document_content" > + <meta attribute="class-code"> + @Override + public Object clone() throws CloneNotSupportedException { + DocumentContent doccon = (DocumentContent)super.clone(); + // not defensive copy, i will change neither Document nor pageList, i promise :) + doccon.setPageList(pageList); + doccon.setNumPreviewPage(numPreviewPage); + return doccon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + </meta> + <key column="id"/> + <property name="pageList" type="string"> + <column name="page_list" not-null="true" /> + </property> + <property name="numPreviewPage" type="string"> + <column name="num_preview_page" not-null="true" /> + </property> + </joined-subclass> + + <joined-subclass name="cz.elvys.webServer.HIBgen.VideoContent" table="video_content"> + <meta attribute="class-code"> + @Override + public Object clone() throws CloneNotSupportedException { + VideoContent vidcon = (VideoContent)super.clone(); + // not defensive copy + vidcon.setStartPosMs(startPosMs); + vidcon.setAutostart(autostart); + vidcon.setPlaySound(playSound); + vidcon.setBrightness(brightness); + return vidcon; + } + + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + </meta> + <key column="id"/> + <property name="startPosMs" type="int"> + <column name="start_pos_ms" not-null="true" /> + </property> + <property name="autostart" type="boolean"> + <column name="autostart" not-null="true" /> + </property> + <property name="playSound" type="boolean"> + <column name="play_sound" not-null="true" /> + </property> + <property name="brightness" type="int"> + <column name="brightness" not-null="true" /> + </property> + </joined-subclass> + </joined-subclass> + + <joined-subclass name="cz.elvys.webServer.HIBgen.UrlContent" table="url_content" > + <meta attribute="class-code"> @Override public Object clone() throws CloneNotSupportedException { - DocumentContent doccon = (DocumentContent)super.clone(); - // not defensive copy, i will change neither Document nor pageList, i promise :) - doccon.setDocument(document); - doccon.setPageList(pageList); - doccon.setNumPreviewPage(numPreviewPage); - return doccon; + UrlContent urlcon = (UrlContent)super.clone(); + urlcon.setName(name); + urlcon.setUrl(url); + return urlcon; } @@ -52,161 +132,95 @@ // ZMENIL JSI TENTO SOUBOR??? // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml // - </meta> - <key column="id"/> - <many-to-one name="document" class="cz.elvys.webServer.HIBgen.Document" fetch="select"> - <column name="document" not-null="true" /> - </many-to-one> - <property name="pageList" type="string"> - <column name="page_list" not-null="true" /> - </property> - <property name="numPreviewPage" type="string"> - <column name="num_preview_page" not-null="true" /> - </property> - </joined-subclass> - - <joined-subclass name="cz.elvys.webServer.HIBgen.VideoContent" table="video_content"> - <meta attribute="class-code"> + </meta> + <key column="id"/> + <property name="name" type="string"> + <column name="name" not-null="true" /> + </property> + <property name="url" type="string"> + <column name="url" length="500" not-null="true" /> + </property> + </joined-subclass> + + + <joined-subclass name="cz.elvys.webServer.HIBgen.TextContent" table="text_content" > + <meta attribute="class-code"> @Override public Object clone() throws CloneNotSupportedException { - VideoContent vidcon = (VideoContent)super.clone(); - // not defensive copy - vidcon.setVideo(video); - vidcon.setStartPosMs(startPosMs); - vidcon.setAutostart(autostart); - vidcon.setPlaySound(playSound); - vidcon.setBrightness(brightness); - return vidcon; + TextContent textcon = (TextContent)super.clone(); + textcon.setBgColor(bgColor); + textcon.setColor(color); + textcon.setFont(font); + textcon.setSize(size); + textcon.setText(text); + return textcon; } + // // ZMENIL JSI TENTO SOUBOR??? // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml // - </meta> - <key column="id"/> - <many-to-one name="video" class="cz.elvys.webServer.HIBgen.Video" fetch="select"> - <column name="video" not-null="true" /> - </many-to-one> - <property name="startPosMs" type="int"> - <column name="start_pos_ms" not-null="true" /> - </property> - <property name="autostart" type="boolean"> - <column name="autostart" not-null="true" /> - </property> - <property name="playSound" type="boolean"> - <column name="play_sound" not-null="true" /> - </property> - <property name="brightness" type="int"> - <column name="brightness" not-null="true" /> - </property> - </joined-subclass> + </meta> + <key column="id"/> + <property name="bgColor" type="string"> + <column name="bg_color" length="50" /> + </property> + <property name="color" type="string"> + <column name="color" length="50" /> + </property> + <property name="font" type="string"> + <column name="font" /> + </property> + <property name="size" type="java.lang.Integer"> + <column name="size" /> + </property> + <property name="text" type="string"> + <column name="text" length="5000" not-null="true" /> + </property> + </joined-subclass> + + + <joined-subclass name="cz.elvys.webServer.HIBgen.DynamicContent" table="dynamic_content" > + <meta attribute="class-code"> + @Override + public Object clone() throws CloneNotSupportedException { + DynamicContent dynacon = (DynamicContent) super.clone(); + dynacon.setTOrder(TOrder); + dynacon.setBgColor(bgColor); + dynacon.setColor(color); + dynacon.setFont(font); + dynacon.setSize(size != null? new Integer(size) : null); + dynacon.setText(text); + return dynacon; + } + + // + // ZMENIL JSI TENTO SOUBOR??? + // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml + // + </meta> + <key column="id"/> + <property name="TOrder" type="string"> + <column name="t_order" length="50" /> + </property> + <property name="bgColor" type="string"> + <column name="bg_color" length="50" /> + </property> + <property name="color" type="string"> + <column name="color" length="50" /> + </property> + <property name="font" type="string"> + <column name="font" /> + </property> + <property name="size" type="java.lang.Integer"> + <column name="size" /> + </property> + <property name="text" type="string"> + <column name="text" length="5000" not-null="true" /> + </property> + </joined-subclass> - <joined-subclass name="cz.elvys.webServer.HIBgen.UrlContent" table="url_content" > - <meta attribute="class-code"> - @Override - public Object clone() throws CloneNotSupportedException { - UrlContent urlcon = (UrlContent)super.clone(); - urlcon.setName(name); - urlcon.setUrl(url); - return urlcon; - } - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - </meta> - <key column="id"/> - <property name="name" type="string"> - <column name="name" not-null="true" /> - </property> - <property name="url" type="string"> - <column name="url" length="500" not-null="true" /> - </property> - </joined-subclass> - - - <joined-subclass name="cz.elvys.webServer.HIBgen.TextContent" table="text_content" > - <meta attribute="class-code"> - @Override - public Object clone() throws CloneNotSupportedException { - TextContent textcon = (TextContent)super.clone(); - textcon.setBgColor(bgColor); - textcon.setColor(color); - textcon.setFont(font); - textcon.setSize(size); - textcon.setText(text); - return textcon; - } - - - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - </meta> - <key column="id"/> - <property name="bgColor" type="string"> - <column name="bg_color" length="50" /> - </property> - <property name="color" type="string"> - <column name="color" length="50" /> - </property> - <property name="font" type="string"> - <column name="font" /> - </property> - <property name="size" type="java.lang.Integer"> - <column name="size" /> - </property> - <property name="text" type="string"> - <column name="text" length="5000" not-null="true" /> - </property> - </joined-subclass> - - - <joined-subclass name="cz.elvys.webServer.HIBgen.DynamicContent" table="dynamic_content" > - <meta attribute="class-code"> - @Override - public Object clone() throws CloneNotSupportedException { - DynamicContent dynacon = (DynamicContent) super.clone(); - dynacon.setTOrder(TOrder); - dynacon.setBgColor(bgColor); - dynacon.setColor(color); - dynacon.setFont(font); - dynacon.setSize(size != null? new Integer(size) : null); - dynacon.setText(text); - return dynacon; - } - - // - // ZMENIL JSI TENTO SOUBOR??? - // NAHREJ ZMENY DO POZOR.TXT A DO PRISLUSNYCH .hbm.xml - // - </meta> - <key column="id"/> - <property name="TOrder" type="string"> - <column name="t_order" length="50" /> - </property> - <property name="bgColor" type="string"> - <column name="bg_color" length="50" /> - </property> - <property name="color" type="string"> - <column name="color" length="50" /> - </property> - <property name="font" type="string"> - <column name="font" /> - </property> - <property name="size" type="java.lang.Integer"> - <column name="size" /> - </property> - <property name="text" type="string"> - <column name="text" length="5000" not-null="true" /> - </property> - </joined-subclass> - </class> </hibernate-mapping> Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Layout.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Layout.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Layout.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<!-- Generated 14.1.2010 16:58:05 by Hibernate Tools 3.2.4.GA --> +<!-- Generated 12.2.2010 21:08:24 by Hibernate Tools 3.2.4.GA --> <hibernate-mapping> <class name="cz.elvys.webServer.HIBgen.Layout" table="layout" > <id name="id" type="java.lang.Integer"> @@ -11,10 +11,13 @@ <many-to-one name="aspectRatio" class="cz.elvys.webServer.HIBgen.AspectRatio" fetch="select"> <column name="aspect_ratio" not-null="true" /> </many-to-one> + <many-to-one name="userByModifiedBy" class="cz.elvys.webServer.HIBgen.User" fetch="select"> + <column name="modified_by" not-null="true" /> + </many-to-one> <many-to-one name="company" class="cz.elvys.webServer.HIBgen.Company" fetch="select"> <column name="company" not-null="true" /> </many-to-one> - <many-to-one name="user" class="cz.elvys.webServer.HIBgen.User" fetch="select"> + <many-to-one name="userByLastLockUser" class="cz.elvys.webServer.HIBgen.User" fetch="select"> <column name="lastLockUser" /> </many-to-one> <property name="sectCount" type="int"> @@ -35,6 +38,12 @@ <property name="locked" type="boolean"> <column name="locked" not-null="true" /> </property> + <property name="created" type="timestamp"> + <column name="created" length="19" not-null="true" /> + </property> + <property name="modified" type="timestamp"> + <column name="modified" length="19" not-null="true" /> + </property> <set name="statisticses" inverse="true" lazy="true" table="statistics" fetch="select"> <key> <column name="layout" /> Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Timeline.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Timeline.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/Timeline.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<!-- Generated 12.12.2009 20:59:53 by Hibernate Tools 3.2.4.GA --> +<!-- Generated 12.2.2010 21:08:24 by Hibernate Tools 3.2.4.GA --> <hibernate-mapping> <class name="cz.elvys.webServer.HIBgen.Timeline" table="timeline" > <meta attribute="class-code"> @@ -49,6 +49,9 @@ <column name="panel_planning" not-null="true" /> <column name="panel_order_num" not-null="true" /> </many-to-one> + <many-to-one name="user" class="cz.elvys.webServer.HIBgen.User" fetch="select"> + <column name="modified_by" not-null="true" /> + </many-to-one> <many-to-one name="layout" class="cz.elvys.webServer.HIBgen.Layout" fetch="select"> <column name="layout" not-null="true" /> </many-to-one> @@ -64,5 +67,8 @@ <property name="layoutPos" type="byte"> <column name="layout_pos" precision="2" scale="0" not-null="true" /> </property> + <property name="modified" type="timestamp"> + <column name="modified" length="19" not-null="true" /> + </property> </class> </hibernate-mapping> Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/TypePlug.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/TypePlug.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/TypePlug.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,12 +1,12 @@ <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<!-- Generated 22.1.2010 15:51:46 by Hibernate Tools 3.2.4.GA --> +<!-- Generated 12.2.2010 21:08:24 by Hibernate Tools 3.2.4.GA --> <hibernate-mapping> <class name="cz.elvys.webServer.HIBgen.TypePlug" table="type_plug"> - <id name="id" type="java.lang.Integer"> + <id name="id" type="int"> <column name="id" /> - <generator class="identity" /> + <generator class="assigned" /> </id> <property name="componentClass" type="string"> <column name="componentClass" length="50" /> Modified: trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/User.hbm.xml =================================================================== --- trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/User.hbm.xml 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/cz/elvys/webServer/HIBgen/mapping/User.hbm.xml 2010-02-14 16:04:01 UTC (rev 1721) @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd";> -<!-- Generated 9.11.2008 2:08:53 by Hibernate Tools 3.2.2.CR1 --> +<!-- Generated 12.2.2010 21:08:24 by Hibernate Tools 3.2.4.GA --> <hibernate-mapping> <class name="cz.elvys.webServer.HIBgen.User" table="user" > <id name="id" type="java.lang.Integer"> @@ -31,16 +31,28 @@ </property> <property name="system" type="boolean"> <column name="system" not-null="true" /> - </property> + </property> <property name="disabled" type="boolean"> <column name="disabled" not-null="true" /> </property> - <set name="layouts" inverse="true" lazy="true" table="layout" fetch="select"> + <set name="layoutsForLastLockUser" inverse="true" lazy="true" table="layout" fetch="select"> <key> <column name="lastLockUser" /> </key> <one-to-many class="cz.elvys.webServer.HIBgen.Layout" /> </set> + <set name="layoutsForModifiedBy" inverse="true" lazy="true" table="layout" fetch="select"> + <key> + <column name="modified_by" not-null="true" /> + </key> + <one-to-many class="cz.elvys.webServer.HIBgen.Layout" /> + </set> + <set name="timelines" inverse="true" lazy="true" table="timeline" fetch="select"> + <key> + <column name="modified_by" not-null="true" /> + </key> + <one-to-many class="cz.elvys.webServer.HIBgen.Timeline" /> + </set> <set name="files" inverse="true" lazy="true" table="file" fetch="select"> <key> <column name="user" not-null="true" /> Modified: trunk/server/elvysCommons/src/elvys/server/bl/Fact.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/Fact.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/Fact.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -6,7 +6,6 @@ import elvys.server.bl.elvysrel.ElvysBLImpl; import elvys.server.bl.file.FileManagerBL; import elvys.server.bl.file.FileManagerBLImpl; -import elvys.server.bl.file.FileStorageManager; import elvys.server.bl.layoutrel.LayoutBL; import elvys.server.bl.layoutrel.LayoutBLImpl; import elvys.server.bl.layoutrel.LayoutPreviewBL; Modified: trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBL.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBL.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBL.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -5,7 +5,6 @@ import org.hibernate.Session; -import cz.elvys.webServer.HIBgen.Document; import cz.elvys.webServer.HIBgen.FileType; import cz.elvys.webServer.toSpring.exception.ExecuteException; @@ -98,9 +97,9 @@ /** * Deletes all planning of given file and mark file as "deleted". * Not really deletes the file. - * @param doc file to "delete" + * @param file file to "delete" */ - public void deleteFile(Document doc) throws ExecuteException; + public void deleteFile(cz.elvys.webServer.HIBgen.File file) throws ExecuteException; /** Modified: trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLImpl.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -25,8 +25,7 @@ import cz.elvys.commons.utils.CommonUtils; import cz.elvys.commons.utils.HibUtils; import cz.elvys.webServer.HIBgen.ContentType; -import cz.elvys.webServer.HIBgen.Document; -import cz.elvys.webServer.HIBgen.DocumentContent; +import cz.elvys.webServer.HIBgen.FileFrameContent; import cz.elvys.webServer.HIBgen.FileType; import cz.elvys.webServer.HIBgen.Timeline; import cz.elvys.webServer.HIBgen.User; @@ -219,7 +218,6 @@ Session sess = InitSessionFactory.getInstance().getCurrentSession(); // create filelist request by types - String typeRestriction = null; Integer[] fileTypeIds = new Integer[types.size()]; for (int i=0; i<types.size(); i++) { FileType type = types.get(i); @@ -382,7 +380,8 @@ } @Override - public void deleteFile(Document doc) throws ExecuteException { + public void deleteFile(cz.elvys.webServer.HIBgen.File file) throws ExecuteException { + if (file == null) throw new ExecuteException(new NullPointerException("file null")); // TODO prozkoumat, jestli funguje // mark selected document in DB as disabled @@ -390,12 +389,12 @@ Transaction tx = HibUtils.startTx(sess); try { // set document as disabled - doc.setDisabled(true); - sess.update(doc); + file.setDisabled(true); + sess.update(file); // delete all plannings to this document - Set<DocumentContent> contents = (Set<DocumentContent>) doc.getDocumentContents(); - for (DocumentContent contentToDelete: contents) { + Set<FileFrameContent> contents = (Set<FileFrameContent>) file.getFileFrameContents(); + for (FileFrameContent contentToDelete: contents) { Set<Timeline> timelines = (Set<Timeline>) contentToDelete.getTimelines(); // get Timeline for current FrameContent - 1:1 cardinality @@ -409,7 +408,7 @@ tx.commit(); } catch (Exception e) { tx.rollback(); - String message = CommonUtils.prepareErrorMessage(ERROR_FILE_DELETING, "fileName", doc.getOrigName()); + String message = CommonUtils.prepareErrorMessage(ERROR_FILE_DELETING, "fileId", file.getId(), "fileName", file.getOrigName()); throw new ExecuteException(message,e); } Modified: trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLTest.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLTest.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/file/FileManagerBLTest.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -2,12 +2,20 @@ import java.util.List; +import org.hibernate.Query; +import org.hibernate.Transaction; +import org.hibernate.classic.Session; import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; +import cz.elvys.commons.utils.HibUtils; import cz.elvys.webServer.HIBgen.File; +import cz.elvys.webServer.HIBgen.FileFrameContent; import cz.elvys.webServer.HIBgen.FileType; +import cz.elvys.webServer.HIBgen.FrameContent; +import cz.elvys.webServer.HIBgen.User; +import cz.elvys.webServer.db.InitSessionFactory; import elvys.server.bl.Fact; @@ -113,6 +121,37 @@ + + @Test + public void fileAutoloadOnFrameContent() throws Exception { + // count of autoloaded files + int found = 0; + + + Session sess = InitSessionFactory.getInstance().getCurrentSession(); + Transaction tx = HibUtils.startTx(sess); + + List<FrameContent> ffcs; + try { + Query q = sess.createQuery("from FrameContent"); + ffcs = q.list(); + + + tx.commit(); + }catch (Exception e){ + tx.rollback(); + throw new RuntimeException(e); + } + for (FrameContent c: ffcs) { + if (c instanceof FileFrameContent) { + assertTrue(((FileFrameContent)c).getFile().getOrigName()!=null); + found++; + } + } + + + assertTrue(found >0); + } @@ -131,7 +170,6 @@ - // check list of FileType private void assertFileTypeList(List<FileType> list) { assertTrue(list != null && list.size() > 0); @@ -170,7 +208,4 @@ assertTrue(ft.getFileType().getType() != null); } - - - } Modified: trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBL.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBL.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBL.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -8,30 +8,10 @@ import cz.elvys.webServer.toSpring.exception.ExecuteException; public interface LayoutBL { - - /** - * Gets active layout of given elvys. - * @param elvysID id of elvys - * @param isDay true- day layout, false- night layot - * @throws ExecuteException - */ - public Layout getPresentLayout(Integer elvysID, boolean isDay) throws ExecuteException; /** - * Gets list of layouts belonging to certain company <br/> - * Fetches: company - * Orders by: date of create (ID) TODO zmenit to na date of create - * @param companyId id of company - * @param excludedLayoutsIds ids of layouts which will be excluded - * @throws ExecuteException - * @return - */ - public List<Layout> listLayoutsOfCompany(Integer companyId, Integer... excludedLayoutsIds) throws ExecuteException; - - - /** * Returns layout specified by Id. Layout must be active. - * Fetches: Company only, not User + * Fetches: Company only, User(modif.) * @param layoutId id of the layout to return * @return layout object */ @@ -48,7 +28,7 @@ /** * Gets layout according to id of category planning object.. <br/> - * Fetches: Company, User + * Fetches: Company, User(modif.) * @param catPlanningId * @return */ @@ -59,7 +39,20 @@ */ public Layout getLayoutByCategoryPlanningId(Integer catPlanningId, Session sess) throws ExecuteException; + /** + * Gets list of layouts belonging to certain company <br/> + * Fetches: Company, User(modif.) + * Orders by: modification date + * @param companyId id of company + * @param excludedLayoutsIds ids of layouts which will be excluded + * @throws ExecuteException + * @return + */ + public List<Layout> listLayoutsOfCompany(Integer companyId, Integer... excludedLayoutsIds) throws ExecuteException; + + + /** * Marks layout as deleted in DB. * @param layoutId id of the layout. */ Modified: trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLImpl.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLImpl.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLImpl.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -5,8 +5,6 @@ import java.util.List; import java.util.Set; -import org.hibernate.Criteria; -import org.hibernate.FetchMode; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; @@ -15,10 +13,7 @@ import cz.elvys.commons.utils.CommonUtils; import cz.elvys.commons.utils.HibUtils; import cz.elvys.webServer.HIBgen.CategoryDefinition; -import cz.elvys.webServer.HIBgen.Elvys; -import cz.elvys.webServer.HIBgen.FrameContent; import cz.elvys.webServer.HIBgen.Layout; -import cz.elvys.webServer.HIBgen.Timeline; import cz.elvys.webServer.db.InitSessionFactory; import cz.elvys.webServer.toSpring.exception.ExecuteException; import elvys.server.bl.Fact; @@ -27,43 +22,12 @@ public class LayoutBLImpl implements LayoutBL { // messages - private static final String ELVYS_NOT_FOUND = "Elvys not found. Id= "; private static final String UNABLE_LOAD_LAYOUTS = "Unable to load company layouts. CompanyId: "; private static final String UNABLE_LOAD_LAYOUT = "Couldn't load layout"; private static final String UNABLE_TO_MARK_LAYOUT_DELETED = "Unable to mark layout as \"deleted\""; @Override - public Layout getPresentLayout(Integer elvysID, boolean isDay) throws ExecuteException { - try { - Elvys elvys = null; - if (isDay) { - elvys = (Elvys) HibUtils.findByID(Elvys.class, elvysID, "elvysSetting", "elvysSetting.layoutByDayLayout"); - } else { - elvys = (Elvys) HibUtils.findByID(Elvys.class, elvysID, "elvysSetting", "elvysSetting.layoutByNightLayout"); - } - if (elvys == null) { - String message = ELVYS_NOT_FOUND + elvysID; - throw new Exception(message); - } - if (isDay) { -// TODO taby -// return elvys.getElvysSetting().getLayoutByDayLayout(); - return null; - } else { -// TODO taby -// return elvys.getElvysSetting().getLayoutByNightLayout(); - return null; - } - } catch (Exception e) { - String message = "ElvysId="+elvysID+"; isDay="+isDay; - //log.error(message,e); - throw new ExecuteException(message,e); - } - } - - - @Override public Layout getActiveLayoutByIdMakeSess(Integer layoutId) throws ExecuteException { Session sess = InitSessionFactory.getInstance().getCurrentSession(); Transaction tx = HibUtils.startTx(sess); @@ -74,9 +38,7 @@ tx.commit(); } catch(Exception e) { tx.rollback(); - String message = CommonUtils.prepareErrorMessage( - UNABLE_LOAD_LAYOUT, "layoutId", layoutId); - throw new ExecuteException(message,e); + throw new ExecuteException(e); } return layout; } @@ -85,12 +47,27 @@ @Override public Layout getActiveLayoutById(Session sess, Integer layoutId) throws ExecuteException { - Criteria c = sess.createCriteria(Layout.class) - .add(Restrictions.idEq(layoutId)) - .add(Restrictions.eq("disabled", false)) - .setFetchMode("company", FetchMode.SELECT); - - Layout res = (Layout) (c.list().size() > 0 ? c.list().get(0) : null); + Layout res = null; + try { + Query query = sess.createQuery("select layout from Layout layout " + + "inner join fetch layout.company comp " + + "inner join fetch layout.userByModifiedBy user " + + "where layout.disabled = false " + + " and comp.disabled = false " + + " and layout.id=:layoutId "); + query.setInteger("layoutId", layoutId); + List<Layout> layouts = query.list(); + if (layouts.size() > 0){ + res = layouts.get(0); + } else { + res = null; + } + } catch (Exception e) { + String message = CommonUtils.prepareErrorMessage( + UNABLE_LOAD_LAYOUT, "layoutId", layoutId); + throw new ExecuteException(message,e); + } + return res; } @@ -107,9 +84,7 @@ tx.commit(); } catch(Exception e) { tx.rollback(); - String message = CommonUtils.prepareErrorMessage( - UNABLE_LOAD_LAYOUT, "catPlanningId", catPlanningId); - throw new ExecuteException(message,e); + throw new ExecuteException(e); } return layout; } @@ -125,7 +100,7 @@ Query q = sess.createQuery( "select layout From Layout layout" + " inner join fetch layout.company " + - " left outer join fetch layout.user, " + + " inner join fetch layout.userByModifiedBy, " + " CategoryDefinition def, " + " CategoryPlanning plan " + "where plan.id = :catPlanningId " + @@ -140,7 +115,7 @@ } } catch (Exception e) { String message = CommonUtils.prepareErrorMessage( - UNABLE_LOAD_LAYOUTS, "catPlanningId", catPlanningId); + UNABLE_LOAD_LAYOUT, "catPlanningId", catPlanningId); throw new ExecuteException(message, e); } return result; @@ -160,10 +135,11 @@ try { Query query = sess.createQuery("select layout from Layout layout " + "inner join fetch layout.company comp " + + "inner join fetch layout.userByModifiedBy user " + "where layout.disabled = false " + " and comp.disabled = false " + " and comp.id=:companyId " + - "order by layout.id"); + "order by layout.modified desc"); query.setInteger("companyId", companyId); layouts = query.list(); tx.commit(); Modified: trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLTest.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLTest.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/layoutrel/LayoutBLTest.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -3,6 +3,7 @@ import java.util.List; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.*; @@ -30,38 +31,26 @@ cbl = Fact.getCategoryBL(); } - @Test - public void testGetPresentLayout() throws Exception { - // TODO - throw new RuntimeException("not prepared yet.."); - } - - @Test - public void testListLayoutsOfCompany() throws Exception { + public void testGetActiveLayoutById() throws Exception { + // number of reloaded layouts + int found = 0; // get list of all List<Layout> layouts = lbl.listLayoutsOfCompany(companyId); assertLayouts(layouts); - // reduce list by id - assertTrue(layouts.size() >= 3); - Integer notWantedId = layouts.get(0).getId(); - Integer notWantedId2 = layouts.get(1).getId(); - List<Layout> layoutsFiltered = lbl.listLayoutsOfCompany( - companyId, new Integer[] {notWantedId, notWantedId2}); - assertLayouts(layoutsFiltered); - assertTrue(layouts.size() == 2+ layoutsFiltered.size()); + //reload each layout + for (Layout layout: layouts) { + lbl.getActiveLayoutByIdMakeSess(layout.getId()); + assertLayout(layout); + found++; + } + + assertTrue(found > 0); } - @Test - public void testGetActiveLayoutById() throws Exception { - // TODO - throw new RuntimeException("not prepared yet.."); - } - - @Test public void testGetLayoutByCategoryPlanningId() throws Exception { // count of found layouts int found = 0; @@ -73,15 +62,11 @@ // category plannings List<CategoryPlanning> plannings = cbl.listCatPlanningsForCatDefinitionMakeSession(def.getId()); for(CategoryPlanning pl : plannings) { + + // layout for each planning Layout layout = lbl.getLayoutByCategoryPlanningIdMakeSession(pl.getId()); - if (layout != null) { - assertTrue(layout.getName() != null); - assertTrue(layout.getCompany().getName() != null); - if (layout.getUser() != null){ - assertTrue(layout.getUser().getUsername() != null); - } - found++; - } + assertLayout(layout); + found++; } } assertTrue(found > 0); @@ -89,6 +74,23 @@ } @Test + public void testListLayoutsOfCompany() throws Exception { + + // get list of all + List<Layout> layouts = lbl.listLayoutsOfCompany(companyId); + assertLayouts(layouts); + + // reduce list by id + assertTrue(layouts.size() >= 3); + Integer notWantedId = layouts.get(0).getId(); + Integer notWantedId2 = layouts.get(1).getId(); + List<Layout> layoutsFiltered = lbl.listLayoutsOfCompany( + companyId, new Integer[] {notWantedId, notWantedId2}); + assertLayouts(layoutsFiltered); + assertTrue(layouts.size() == 2+ layoutsFiltered.size()); + } + + @Ignore @Test public void testMarkLayoutAsDeleted() throws Exception { // TODO throw new RuntimeException("not prepared yet.."); @@ -127,6 +129,15 @@ assertTrue(layout.getId() != null); assertTrue(layout.getName() != null); assertTrue(layout.getSectCount() >0 ); + // test layout's company + assertTrue(layout.getCompany() != null); + assertTrue(layout.getCompany().getId() != null); + assertTrue(layout.getCompany().getName() != null); + assertFalse(layout.getCompany().isDisabled()); + // test layout's modified user + assertTrue(layout.getUserByModifiedBy() != null); + assertTrue(layout.getUserByModifiedBy().getId() != null); + assertTrue(layout.getUserByModifiedBy().getUsername() != null); } } Modified: trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBL.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBL.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBL.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -60,7 +60,8 @@ public Timeline replicateTimeline(Timeline tlToRep, Integer newPanelPlanningId, Integer newPanelOrdNum, Session sess) throws ExecuteException; /** - * Returns planning of one position on one specific panel during specified time period + * Returns planning of one position on one specific panel during specified time period<br/> + * Fetches: type-specific frame_content, file, user(modif.). * @param scheduleFrom start of the time period we are interested in * @param scheduleTo end of the time period we are interested in * @param panelPlanning panel identification 1) @@ -78,7 +79,7 @@ /** * Returns actual planning for selected panel. <br/> - * Fetches type-specific frame_content, Document or Video if needed + * Fetches type-specific frame_content, file, user(modif.) * @param panelPlanningId identification of panel 1) * @param panelOrd identification of panel 2) * @return List of timelines, for each position one @@ -94,7 +95,7 @@ /** * Return list (bundle) of future timelines (ending in the future) for the specified panel. - * Fetches type-specific frame_content, Document or Video if needed + * Fetches type-specific frame_content, file, user(modif.) * @param planningId id of the categoryPlanning * @param panelOrd id of the panel order * @return list of timelines @@ -109,7 +110,7 @@ /** * Return list (bundle) of future timelines (i.e. ending in the future) for the specified category planning - * Fetches type-specific frame_content, Document or Video if needed + * Fetches type-specific frame_content, file, user(modif.) * @param planningId id of the planning * @return list of timelines * @throws ExecuteException exception @@ -124,7 +125,7 @@ /** * Returns actual planning for the selected categoryPlanning. <br/> - * Fetches type-specific frame_content, Document or Video if needed. + * Fetches type-specific frame_content, file, user(modif.). * @param catPlanningId id of the CategoryPlanning object. * @return list of layoutPosition-grouped-plannings (size of list== count of layout position). Map contains mapping: panel_order -> Timeline. * @throws ExecuteException exception @@ -141,7 +142,7 @@ /** * Returns plannings for chosen category that cross(or are inside) * time boundaries <br/> - * Fetches type-specific frame_content + * Fetches type-specific frame_content, file, user(modif.) * @param from the beginning of the time period * @param to the end of the time period * @param catPlanningId id of category planning Modified: trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBLImpl.java =================================================================== --- trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBLImpl.java 2010-02-14 16:03:14 UTC (rev 1720) +++ trunk/server/elvysCommons/src/elvys/server/bl/planning/PlanningBLImpl.java 2010-02-14 16:04:01 UTC (rev 1721) @@ -7,7 +7,6 @@ import java.util.Map; import org.apache.log4j.Logger; -import org.hibernate.Hibernate; import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.Transaction; @@ -15,13 +14,11 @@ import cz.elvys.commons.utils.CommonUtils; import cz.elvys.commons.utils.HibUtils; import cz.elvys.webServer.HIBgen.ContentType; -import cz.elvys.webServer.HIBgen.DocumentContent; import cz.elvys.webServer.HIBgen.FrameContent; import cz.elvys.webServer.HIBgen.Layout; import cz.elvys.webServer.HIBgen.Panel; import cz.elvys.webServer.HIBgen.PanelId; 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; @@ -535,6 +532,7 @@ "from Timeline timeline " + "inner join fetch timeline.frameContent frc " + "inner join fetch timeline.frameContent.contentType ctype " + + "inner join fetch timeline.user user " + "where timeline.panel.id.planning=:panelPlanning " + ( scheduleFrom != null ? " and :start < timeline.showEnd " : "") + @@ -558,16 +556,7 @@ if (scheduleTo != null) { q.setTimestamp("end", scheduleTo); } - timelines = q.list(); - for (Timeline tl : timelines){ - // TODO optimalizovat, zbytecne selecty navic (kterych se ale zatim neumim zbavit) - if ("document".equalsIgnoreCase(tl.getFrameContent().getContentType().getType())) { - Hibernate.initialize(((DocumentContent)tl.getFrameContent()).getDocument()); - } else if ("video".equalsIgnoreCase(tl.getFrameContent().getContentType().getType())) { - Hibernate.initialize(((VideoContent)tl.getFrameContent()).getVideo()); - } - } } catch (Exception e) { String message = CommonUtils.prepareErrorMessage(CANT_LOAD_PLANNING_LIST, "start", scheduleFrom, "end", scheduleTo,