branch develop updated (7386836 -> fe6c684)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 7386836 on vérifie qu'il y a une demande ouverte avant de la mettre devant (fixes #8275) new 422381f ajout d'un index sur les compagnies des clients (fixes #8281) new fe6c684 upgrade versions 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 fe6c68424c593364d05d5edb3a9283641679da51 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 10:24:30 2016 +0200 upgrade versions commit 422381f2f6f17c718233c1b4d7fe101de2c58733 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 10:24:24 2016 +0200 ajout d'un index sur les compagnies des clients (fixes #8281) Summary of changes: faxtomail-persistence/pom.xml | 4 +- .../faxtomail/FaxToMailConfiguration.java | 2 +- .../faxtomail/persistence/ProgressionModel.java | 48 ---------------------- .../V2_1_3_160425__add_index_on_company_name.sql | 3 ++ .../V2_1_3_160425__add_index_on_company_name.sql | 3 ++ .../ui/swing/actions/AbstractFaxToMailAction.java | 10 ++--- pom.xml | 19 ++++----- 7 files changed, 23 insertions(+), 66 deletions(-) delete mode 100644 faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java create mode 100644 faxtomail-service/src/main/resources/db/migration/h2/V2_1_3_160425__add_index_on_company_name.sql create mode 100644 faxtomail-service/src/main/resources/db/migration/sqlserver/V2_1_3_160425__add_index_on_company_name.sql -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 422381f2f6f17c718233c1b4d7fe101de2c58733 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 10:24:24 2016 +0200 ajout d'un index sur les compagnies des clients (fixes #8281) --- .../db/migration/h2/V2_1_3_160425__add_index_on_company_name.sql | 3 +++ .../migration/sqlserver/V2_1_3_160425__add_index_on_company_name.sql | 3 +++ 2 files changed, 6 insertions(+) diff --git a/faxtomail-service/src/main/resources/db/migration/h2/V2_1_3_160425__add_index_on_company_name.sql b/faxtomail-service/src/main/resources/db/migration/h2/V2_1_3_160425__add_index_on_company_name.sql new file mode 100644 index 0000000..3bc94bd --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/h2/V2_1_3_160425__add_index_on_company_name.sql @@ -0,0 +1,3 @@ +alter table client alter column company varchar(255); +GO +CREATE INDEX client_company_idx ON client(company); \ No newline at end of file diff --git a/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_1_3_160425__add_index_on_company_name.sql b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_1_3_160425__add_index_on_company_name.sql new file mode 100644 index 0000000..3bc94bd --- /dev/null +++ b/faxtomail-service/src/main/resources/db/migration/sqlserver/V2_1_3_160425__add_index_on_company_name.sql @@ -0,0 +1,3 @@ +alter table client alter column company varchar(255); +GO +CREATE INDEX client_company_idx ON client(company); \ No newline at end of file -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit fe6c68424c593364d05d5edb3a9283641679da51 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 26 10:24:30 2016 +0200 upgrade versions --- faxtomail-persistence/pom.xml | 4 +- .../faxtomail/FaxToMailConfiguration.java | 2 +- .../faxtomail/persistence/ProgressionModel.java | 48 ---------------------- .../ui/swing/actions/AbstractFaxToMailAction.java | 10 ++--- pom.xml | 19 ++++----- 5 files changed, 17 insertions(+), 66 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 3d216fd..be13f19 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -65,12 +65,12 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>nuiton-version</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> + <artifactId>nuiton-config</artifactId> </dependency> <dependency> diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java index 2ce2e93..0b573e4 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/FaxToMailConfiguration.java @@ -37,7 +37,7 @@ import org.nuiton.config.ArgumentsParserException; import org.nuiton.jaxx.application.ApplicationConfiguration; import org.nuiton.jaxx.application.ApplicationIOUtil; import org.nuiton.jaxx.application.ApplicationTechnicalException; -import org.nuiton.util.version.Version; +import org.nuiton.version.Version; import javax.swing.*; import java.awt.*; diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java deleted file mode 100644 index cbad7af..0000000 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/ProgressionModel.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.franciaflex.faxtomail.persistence; - -/* - * #%L - * FaxToMail :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2014 Mac-Groupe, Code Lutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.nuiton.jaxx.application.type.ApplicationProgressionModel; -import org.nuiton.updater.DownloadMonitor; - -/** - * Simple model for a progression long task. - * - * @author Kevin Morin - morin@codelutin.com - */ -public class ProgressionModel extends ApplicationProgressionModel implements DownloadMonitor { - - private static final long serialVersionUID = 1L; - - @Override - public void setSize(long size) { - setTotal((int) size); - } - - @Override - public void setCurrent(long current) { - setCurrent((int) current); - } -} diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java index 0752623..53396e0 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/actions/AbstractFaxToMailAction.java @@ -23,12 +23,12 @@ package com.franciaflex.faxtomail.ui.swing.actions; */ import com.franciaflex.faxtomail.FaxToMailConfiguration; -import com.franciaflex.faxtomail.persistence.ProgressionModel; import com.franciaflex.faxtomail.ui.swing.FaxToMailUIContext; import com.franciaflex.faxtomail.ui.swing.util.AbstractFaxToMailUIHandler; import com.franciaflex.faxtomail.ui.swing.util.FaxToMailUI; import org.jdesktop.beans.AbstractBean; import org.nuiton.jaxx.application.swing.action.AbstractApplicationAction; +import org.nuiton.jaxx.application.type.ApplicationProgressionModel; import javax.swing.JFrame; @@ -52,8 +52,8 @@ public abstract class AbstractFaxToMailAction <M extends AbstractBean, UI extend } @Override - protected ProgressionModel getProgressionModel() { - return (ProgressionModel) getContext().getActionUI().getModel().getProgressionModel(); + protected ApplicationProgressionModel getProgressionModel() { + return getContext().getActionUI().getModel().getProgressionModel(); } @Override @@ -68,9 +68,9 @@ public abstract class AbstractFaxToMailAction <M extends AbstractBean, UI extend @Override protected void createProgressionModelIfRequired(int total) { - ProgressionModel progressionModel = getProgressionModel(); + ApplicationProgressionModel progressionModel = getProgressionModel(); if (progressionModel == null) { - progressionModel = new ProgressionModel(); + progressionModel = new ApplicationProgressionModel(); progressionModel.setTotal(total); progressionModel.setMessage(""); progressionModel.setCurrent(0); diff --git a/pom.xml b/pom.xml index 3f6ecba..b38eee6 100644 --- a/pom.xml +++ b/pom.xml @@ -96,11 +96,10 @@ <!-- libraries version --> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> - <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> + <nuitonConfigVersion>3.0-rc-3</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-4</nuitonCsvVersion> - <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> - <nuitonUpdaterVersion>3.0-rc-1</nuitonUpdaterVersion> - <nuitonUtilsVersion>3.0-rc-8</nuitonUtilsVersion> + <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> + <nuitonUtilsVersion>3.0-rc-11</nuitonUtilsVersion> <nuitonValidatorVersion>3.0-rc-2</nuitonValidatorVersion> <nuitonWebVersion>1.17</nuitonWebVersion> @@ -110,7 +109,7 @@ <h2Version>1.3.176</h2Version> <guavaVersion>18.0</guavaVersion> - <jaxxVersion>2.26</jaxxVersion> + <jaxxVersion>2.28.2</jaxxVersion> <!-- do not upgrade to 1.6.5-1 --> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.16.3</xworkVersion> @@ -289,14 +288,14 @@ <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-config</artifactId> - <version>${nuitonConfigVersion}</version> + <artifactId>nuiton-version</artifactId> + <version>1.0-rc-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> - <artifactId>nuiton-updater</artifactId> - <version>${nuitonUpdaterVersion}</version> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> </dependency> <dependency> @@ -705,7 +704,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>2.0.0-RC1</version> + <version>2.0.1</version> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm