This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9e5c968999accc24842310572dd8df346671e83e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 17:43:43 2016 +0100 Nouvelle icône (Fixes #8886) --- .../application/swing/ui/ObserveMainUI.jcss | 2 +- .../ui/actions/menu/help/ShowAboutAction.java | 4 +-- .../src/main/resources/icons/logo OT_rvb.png | Bin 143337 -> 0 bytes .../src/main/resources/icons/logo-OT_web.png | Bin 34309 -> 0 bytes .../src/main/resources/icons/logo-small.png | Bin 0 -> 46914 bytes .../src/main/resources/icons/logo.png | Bin 0 -> 232898 bytes pom.xml | 28 ++++++++++++++++++--- src/site/resources/images/logo-OT_web.png | Bin 34309 -> 0 bytes src/site/resources/images/logo-small.png | Bin 0 -> 46914 bytes src/site/resources/images/logo.png | Bin 0 -> 232898 bytes src/site/rst/index.rst | 8 ++---- src/site/site_fr.xml | 2 +- 12 files changed, 31 insertions(+), 13 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss index a05caa6..452ddb9 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -34,7 +34,7 @@ JSplitPane { #mainFrame { defaultCloseOperation: "do_nothing_on_close"; - iconImage: {UIHelper.createImageIcon("logo-OT_web.png").getImage()}; + iconImage: {SwingUtil.createImageIcon("logo.png").getImage()}; } #menu { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java index 67cddd2..9e3adf3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java @@ -74,7 +74,7 @@ public class ShowAboutAction extends AbstractUIAction { String name = ObserveRunner.getRunner().getRunnerName(); AboutUI about = AboutUIBuilder.builder(ui) - .setIconPath("/icons/logo-OT_web.png") + .setIconPath("/icons/logo.png") .setTitle(t("observe.title.about")) .setBottomText(ui.getConfig().getCopyrightText()) .addAboutTab(t("observe.about.message"), true) @@ -88,7 +88,7 @@ public class ShowAboutAction extends AbstractUIAction { JPanel topPanel = about.getTopPanel(); topPanel.removeAll(); topPanel.setLayout(new BorderLayout()); - topPanel.add(new JLabel(Resource.getIcon("/icons/logo-OT_web.png")), BorderLayout.WEST); + topPanel.add(new JLabel(Resource.getIcon("/icons/logo-small.png")), BorderLayout.WEST); topPanel.add(new JLabel(Resource.getIcon("/icons/logo_ird.png")), BorderLayout.EAST); about.display(); diff --git a/application-swing/src/main/resources/icons/logo OT_rvb.png b/application-swing/src/main/resources/icons/logo OT_rvb.png deleted file mode 100644 index 1c35a25..0000000 Binary files a/application-swing/src/main/resources/icons/logo OT_rvb.png and /dev/null differ diff --git a/application-swing/src/main/resources/icons/logo-OT_web.png b/application-swing/src/main/resources/icons/logo-OT_web.png deleted file mode 100644 index e6b87bd..0000000 Binary files a/application-swing/src/main/resources/icons/logo-OT_web.png and /dev/null differ diff --git a/application-swing/src/main/resources/icons/logo-small.png b/application-swing/src/main/resources/icons/logo-small.png new file mode 100644 index 0000000..a850860 Binary files /dev/null and b/application-swing/src/main/resources/icons/logo-small.png differ diff --git a/application-swing/src/main/resources/icons/logo.png b/application-swing/src/main/resources/icons/logo.png new file mode 100644 index 0000000..4a4c9c8 Binary files /dev/null and b/application-swing/src/main/resources/icons/logo.png differ diff --git a/pom.xml b/pom.xml index b8ed0e6..958e6ce 100644 --- a/pom.xml +++ b/pom.xml @@ -514,6 +514,10 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + </exclusion> </exclusions> </dependency> @@ -566,19 +570,37 @@ <version>${hibernateVersion}</version> </dependency> - <dependency> + <!--dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> + </dependency--> + + <dependency> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP</artifactId> + <version>2.5.1</version> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-hikaricp</artifactId> + <version>${hibernateVersion}</version> + <exclusions> + <exclusion> + <groupId>com.zaxxer</groupId> + <artifactId>HikariCP-java6</artifactId> + </exclusion> + </exclusions> + </dependency> + + <!--dependency> <groupId>com.mchange</groupId> <artifactId>c3p0</artifactId> <version>0.9.5.2</version> <scope>runtime</scope> - </dependency> + </dependency--> <!-- Map --> @@ -1126,7 +1148,7 @@ </profile> <profile> - <id>generate-changelog</id> + <id>changelog-profile</id> <activation> <property> <name>performRelease</name> diff --git a/src/site/resources/images/logo-OT_web.png b/src/site/resources/images/logo-OT_web.png deleted file mode 100644 index e6b87bd..0000000 Binary files a/src/site/resources/images/logo-OT_web.png and /dev/null differ diff --git a/src/site/resources/images/logo-small.png b/src/site/resources/images/logo-small.png new file mode 100644 index 0000000..a850860 Binary files /dev/null and b/src/site/resources/images/logo-small.png differ diff --git a/src/site/resources/images/logo.png b/src/site/resources/images/logo.png new file mode 100644 index 0000000..4a4c9c8 Binary files /dev/null and b/src/site/resources/images/logo.png differ diff --git a/src/site/rst/index.rst b/src/site/rst/index.rst index 3154e79..375072d 100644 --- a/src/site/rst/index.rst +++ b/src/site/rst/index.rst @@ -45,19 +45,15 @@ Les documents - `Architecture logicielle`_ - `Road Map`_ -- `Validation`_ - `Administration obstuna`_ - `Administration web`_ -- `Client lourd`_ -- `Le projet maven`_ +- `Configuration`_ .. _Architecture logicielle: architecture-logicielle.html .. _Administration obstuna: install-serverPG.html .. _Administration web: administration-web.html -.. _Validation: Validation.html .. _Road Map: Avancement.html -.. _Client lourd: Observe-Swing.html -.. _Le projet maven: Observe-maven.html +.. _Configuration: config-report.html diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index b3af8bb..3b8bbe2 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/v/${siteDeployClassifier}/images/logo-OT_web.png</src> + <src>${project.url}/v/${siteDeployClassifier}/images/logo-small.png</src> <href>index.html</href> </bannerLeft> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.