branch feature/7424 created (now 62c4ef1)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7424 in repository faxtomail. See http://git.codelutin.com/faxtomail.git at 62c4ef1 modification du modèle (ajout des tampons) (refs #7424) This branch includes the following new commits: new 7603abb fix NPE new 62c4ef1 modification du modèle (ajout des tampons) (refs #7424) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 62c4ef1c6c3602c8fe6b6133d73090d08b35e175 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 18:29:06 2015 +0200 modification du modèle (ajout des tampons) (refs #7424) commit 7603abb10e6ae5877e6c819db74baa17b33abe6c Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 15:45:26 2015 +0200 fix NPE -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7424 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 7603abb10e6ae5877e6c819db74baa17b33abe6c Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 15:45:26 2015 +0200 fix NPE --- .../franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java index bcac8f5..658b300 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/AbstractFaxToMailUIHandler.java @@ -294,7 +294,7 @@ public abstract class AbstractFaxToMailUIHandler<M, UI extends FaxToMailUI<M, ?> result.setResizable(true); getContext().setSecondaryFrame(result); - final JFrame parentContainer = getParentContainer(JFrame.class); + final Frame parentContainer = getParentContainer(Frame.class); parentContainer.setEnabled(false); parentContainer.setFocusableWindowState(false); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7424 in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 62c4ef1c6c3602c8fe6b6133d73090d08b35e175 Author: Kevin Morin <morin@codelutin.com> Date: Tue Aug 11 18:29:06 2015 +0200 modification du modèle (ajout des tampons) (refs #7424) --- .../src/main/xmi/faxtomail.properties | 6 +++- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 31055 -> 31814 bytes .../h2/V1_4_0_150811__add_pdf_editor_stamps.sql | 36 +++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.properties b/faxtomail-persistence/src/main/xmi/faxtomail.properties index f101632..11ab35c 100644 --- a/faxtomail-persistence/src/main/xmi/faxtomail.properties +++ b/faxtomail-persistence/src/main/xmi/faxtomail.properties @@ -131,4 +131,8 @@ com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.tagvalu com.franciaflex.faxtomail.persistence.entities.MailLock.attribute.lockOn.stereotype=unique # BrandsForDomain -com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domainName.tagvalue.notNull=true \ No newline at end of file +com.franciaflex.faxtomail.persistence.entities.BrandsForDomain.attribute.domainName.tagvalue.notNull=true + +#Stamp +com.franciaflex.faxtomail.persistence.entities.Stamp.attribute.image.tagValue.hibernateAttributeType=binary +com.franciaflex.faxtomail.persistence.entities.Stamp.attribute.image.tagvalue.length=9999999 \ No newline at end of file diff --git a/faxtomail-persistence/src/main/xmi/faxtomail.zargo b/faxtomail-persistence/src/main/xmi/faxtomail.zargo index 6a304e1..e216944 100644 Binary files a/faxtomail-persistence/src/main/xmi/faxtomail.zargo and b/faxtomail-persistence/src/main/xmi/faxtomail.zargo differ diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150811__add_pdf_editor_stamps.sql b/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150811__add_pdf_editor_stamps.sql new file mode 100644 index 0000000..991d174 --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V1_4_0_150811__add_pdf_editor_stamps.sql @@ -0,0 +1,36 @@ +-- add pdf editor stamps + +create table STAMP ( + topiaId varchar(255) not null, + topiaVersion bigint not null, + topiaCreateDate timestamp, + name longvarchar, + description longvarchar, + image binary(9999999) not null, + text longvarchar not null, + primary key (topiaId) +); + +-- add association between mail folder and stamp + +create table MAILFOLDER_PDFEDITORSTAMPS ( + MAILFOLDER varchar(255) not null, + PDFEDITORSTAMPS varchar(255) not null +); + +alter table MAILFOLDER_PDFEDITORSTAMPS + add constraint FK_47041IYC9CUBBX7OB6E1B32QD + foreign key (MAILFOLDER) + references MAILFOLDER; + +alter table MAILFOLDER_PDFEDITORSTAMPS + add constraint FK_IL3874S78O4MA6YG1EONJ213D + foreign key (PDFEDITORSTAMPS) + references STAMP; + +CREATE INDEX idx_MAILFOLDER_PDFEDITORSTAMPS ON MAILFOLDER_PDFEDITORSTAMPS(MAILFOLDER); + +-- add useCurrentLevelPdfEditorStamps in mail folder + +alter table mailfolder add useCurrentLevelPdfEditorStamps boolean; +update mailfolder set useCurrentLevelPdfEditorStamps = 'f'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm