branch develop updated (f448e741 -> 2970d8fd)
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 f448e741 Remove sonar-binaries from gitlab-ci conf new 91769ba7 Remove Cloneable/clone from FTM. Seems that it was not used, everything compiles, quick test shows no hickup ! new 33dffa6d Improve tests / debug utilities new ae3a2af3 Rename logger new 2970d8fd Rename fields The 4 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 2970d8fdb173f0ccc1ce2102e0f97b0042f3b87a Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:37:37 2019 +0200 Rename fields commit ae3a2af30ae007d5f822314b780f469a808dec17 Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:35:31 2019 +0200 Rename logger commit 33dffa6deb65de85ab2a5c1c9cbb6f157e53ba81 Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:35:11 2019 +0200 Improve tests / debug utilities commit 91769ba7ae238382dde079943a70a7e45b61871a Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:30:20 2019 +0200 Remove Cloneable/clone from FTM. Seems that it was not used, everything compiles, quick test shows no hickup ! Summary of changes: .../faxtomail/services/DecoratorServiceImpl.java | 7 +------ .../faxtomail/services/FaxToMailDecorator.java | 16 ++-------------- .../{ImageUtilTest.java => ImageDebugUtility.java} | 5 ++--- .../services/service/MailFolderServiceTest.java | 1 + .../franciaflex/faxtomail/services/service/MiscTest.java | 4 ++-- .../demande/demandgroup/DemandGroupHighlightDialog.java | 12 ++++++------ .../swing/{OpenPDFTest.java => OpenPDFDebugUtility.java} | 2 +- .../faxtomail/web/FaxToMailActionSupport.java | 4 ++-- 8 files changed, 17 insertions(+), 34 deletions(-) rename faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/{ImageUtilTest.java => ImageDebugUtility.java} (90%) rename faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/{OpenPDFTest.java => OpenPDFDebugUtility.java} (98%) -- 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 91769ba7ae238382dde079943a70a7e45b61871a Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:30:20 2019 +0200 Remove Cloneable/clone from FTM. Seems that it was not used, everything compiles, quick test shows no hickup ! --- .../faxtomail/services/DecoratorServiceImpl.java | 7 +------ .../faxtomail/services/FaxToMailDecorator.java | 16 ++-------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java index b7cc8aa8..f85ae821 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/DecoratorServiceImpl.java @@ -147,7 +147,7 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec }; } - public static class StringMultiJXPathDecorator extends MultiJXPathDecorator<String> implements Cloneable { + public static class StringMultiJXPathDecorator extends MultiJXPathDecorator<String> { public StringMultiJXPathDecorator() throws IllegalArgumentException, NullPointerException { super(String.class, "", "#", null); @@ -157,10 +157,5 @@ public class DecoratorServiceImpl extends FaxToMailServiceSupport implements Dec public String toString(Object bean) { return String.valueOf(bean); } - - @Override - public Object clone() throws CloneNotSupportedException { - return new StringMultiJXPathDecorator(); - } } } diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java index 7f065062..dff6e107 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/FaxToMailDecorator.java @@ -50,7 +50,7 @@ import java.util.concurrent.ExecutionException; * * @author kmorin - morin@codelutin.com */ -public class FaxToMailDecorator<O> extends MultiJXPathDecorator<O> implements Cloneable { +public class FaxToMailDecorator<O> extends MultiJXPathDecorator<O> { private static final long serialVersionUID = 1L; @@ -231,12 +231,7 @@ public class FaxToMailDecorator<O> extends MultiJXPathDecorator<O> implements Cl return null; } - @Override - public Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - public static class FaxToMailDecoratorComparator<O> extends JXPathComparator<O> implements Serializable, Cloneable { + public static class FaxToMailDecoratorComparator<O> extends JXPathComparator<O> implements Serializable { private static final long serialVersionUID = 1L; @@ -271,13 +266,6 @@ public class FaxToMailDecorator<O> extends MultiJXPathDecorator<O> implements Cl } } - @Override - public FaxToMailDecoratorComparator<O> clone() { - FaxToMailDecoratorComparator<O> result = - new FaxToMailDecoratorComparator<O>(expression); - return result; - } - public String getExpression() { return expression; } -- 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 33dffa6deb65de85ab2a5c1c9cbb6f157e53ba81 Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:35:11 2019 +0200 Improve tests / debug utilities --- .../services/service/{ImageUtilTest.java => ImageDebugUtility.java} | 5 ++--- .../faxtomail/services/service/MailFolderServiceTest.java | 1 + .../java/com/franciaflex/faxtomail/services/service/MiscTest.java | 4 ++-- .../ui/swing/{OpenPDFTest.java => OpenPDFDebugUtility.java} | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageDebugUtility.java similarity index 90% rename from faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java rename to faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageDebugUtility.java index 329110a6..a6161664 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageDebugUtility.java @@ -28,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory; -import org.junit.Test; import javax.imageio.ImageIO; import java.awt.image.BufferedImage; @@ -36,9 +35,9 @@ import java.io.File; import java.io.IOException; //class used as utility to test/debug image related problems -public class ImageUtilTest extends AbstractFaxToMailServiceTest { +public class ImageDebugUtility extends AbstractFaxToMailServiceTest { - private static final Log log = LogFactory.getLog(ImageUtilTest.class); + private static final Log log = LogFactory.getLog(ImageDebugUtility.class); //@Test public void testReadImage() throws IOException { diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java index 3ea83034..10131afd 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MailFolderServiceTest.java @@ -97,6 +97,7 @@ public class MailFolderServiceTest extends AbstractFaxToMailServiceTest { public void testRootFolders() { FaxToMailUser cyril = userService.getUserByLogin("cbaillet"); List<MailFolder> mailFolders = service.getRootMailFoldersWithReadingRights(cyril); + Assert.assertEquals(2, mailFolders.size()); log.info(mailFolders.size() + " readable folders "); for (MailFolder folder : mailFolders) { printTree(folder, " "); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java index 4203e8db..07f2b44b 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/MiscTest.java @@ -42,9 +42,9 @@ public class MiscTest extends AbstractFaxToMailServiceTest { @Override protected Map<String, String> getDatabaseConfiguration(String dataBase) { - Map<String, String> hibernateH2Config = new HashMap<String, String>(); + Map<String, String> hibernateH2Config = new HashMap<>(); - // sqlserver config + // h2 config hibernateH2Config.put(Environment.DIALECT, "org.hibernate.dialect.H2Dialect"); hibernateH2Config.put(Environment.DRIVER, "org.h2.Driver"); hibernateH2Config.put(Environment.USER, "sa"); diff --git a/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java b/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFDebugUtility.java similarity index 98% rename from faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java rename to faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFDebugUtility.java index 9c54a0ff..834dd239 100644 --- a/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java +++ b/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFDebugUtility.java @@ -34,7 +34,7 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; import java.awt.image.BufferedImage; -public class OpenPDFTest { +public class OpenPDFDebugUtility { /*@Test public void test9623(){ -- 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 ae3a2af30ae007d5f822314b780f469a808dec17 Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:35:31 2019 +0200 Rename logger --- .../java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java index 364d9385..30f67b50 100644 --- a/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java +++ b/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/FaxToMailActionSupport.java @@ -53,7 +53,7 @@ import java.util.Map; }) public class FaxToMailActionSupport extends ActionSupport { - private static final Log log = LogFactory.getLog(FaxToMailActionSupport.class); + private static final Log logger = LogFactory.getLog(FaxToMailActionSupport.class); public static final String SAVE = "save"; @@ -121,7 +121,7 @@ public class FaxToMailActionSupport extends ActionSupport { try { result = getGson().toJson(element); } catch (Exception e) { - log.warn("Can't convert object to json", e); + logger.warn("Can't convert object to json", e); } return result; } -- 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 2970d8fdb173f0ccc1ce2102e0f97b0042f3b87a Author: jcouteau <couteau@codelutin.com> Date: Tue Sep 24 17:37:37 2019 +0200 Rename fields --- .../demande/demandgroup/DemandGroupHighlightDialog.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java index d642b9dd..667b6c8e 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/demandgroup/DemandGroupHighlightDialog.java @@ -139,8 +139,8 @@ public class DemandGroupHighlightDialog extends JDialog { } private class ArrowPanel extends JPanel { - private final int width = 5; - private final int height = 10; + private final int pannelWidth = 5; + private final int pannelHeight = 10; private final Color arrowColor; ArrowPanel(Color color) { @@ -149,7 +149,7 @@ public class DemandGroupHighlightDialog extends JDialog { @Override public Dimension getPreferredSize() { - return new Dimension(width, height); + return new Dimension(pannelWidth, pannelHeight); } @Override @@ -159,9 +159,9 @@ public class DemandGroupHighlightDialog extends JDialog { @Override public void paint(Graphics g) { - Point point1 = new Point(0, (getHeight() + height) / 2 ); - Point point2 = new Point(point1.x, point1.y - height); - Point point3 = new Point(point1.x + width, point1.y - height / 2); + Point point1 = new Point(0, (getHeight() + pannelHeight) / 2 ); + Point point2 = new Point(point1.x, point1.y - pannelHeight); + Point point3 = new Point(point1.x + pannelWidth, point1.y - pannelHeight / 2); g.setColor(arrowColor); g.drawLine(point1.x, point1.y, point2.x, point2.y); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm