From 92dce14b18dee24c5bfea25f894247fe1cd0184e Mon Sep 17 00:00:00 2001
From: Nicolas Dumoulin <nicolas.dumoulin@irstea.fr>
Date: Mon, 30 Jun 2014 09:36:48 +0000
Subject: [PATCH] [maven-release-plugin] copy for tag observation-0.1.6
---
pom.xml | 10 +++++-----
.../observation/kernel/ObservableManager.java | 2 +-
.../observers/jfreechart/ChartPanelAdds.java | 14 ++++----------
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index e8d00de..2c0e418 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>fr.cemagref</groupId>
<artifactId>observation</artifactId>
- <version>0.1.5-SNAPSHOT</version>
+ <version>0.1.6</version>
<dependencies>
<dependency>
@@ -67,16 +67,16 @@
<packaging>jar</packaging>
<scm>
- <connection>scm:svn:http://trac.clermont.cemagref.fr/svn/LISC/Observation/branches/observation-0.1.1</connection>
- <url>http://trac.clermont.cemagref.fr/projets/LISC/browser/Observation/branches/observation-0.1.1</url>
+ <connection>scm:svn:http://trac.clermont.cemagref.fr/svn/LISC/Observation/tags/observation-0.1.6</connection>
+ <url>http://trac.clermont.cemagref.fr/projets/LISC/browser/Observation/tags/observation-0.1.6</url>
</scm>
<build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
diff --git a/src/main/java/fr/cemagref/observation/kernel/ObservableManager.java b/src/main/java/fr/cemagref/observation/kernel/ObservableManager.java
index 8b57054..5cb0209 100644
--- a/src/main/java/fr/cemagref/observation/kernel/ObservableManager.java
+++ b/src/main/java/fr/cemagref/observation/kernel/ObservableManager.java
@@ -118,7 +118,7 @@ public class ObservableManager implements ListModel {
}
public void setObservers(Reader observablesReader, XStream xstream) {
- Map<Class, ObservablesHandler> orderedMap = new LinkedHashMap<>((Map<Class, ObservablesHandler>)xstream.fromXML(observablesReader));
+ Map<Class, ObservablesHandler> orderedMap = new LinkedHashMap<Class, ObservablesHandler>((Map<Class, ObservablesHandler>)xstream.fromXML(observablesReader));
for (Map.Entry<Class, ObservablesHandler> entry : orderedMap.entrySet()) {
// add to the list of observers those readed from the file
ObservablesHandler clObservable = addObservable(entry.getKey());
diff --git a/src/main/java/fr/cemagref/observation/observers/jfreechart/ChartPanelAdds.java b/src/main/java/fr/cemagref/observation/observers/jfreechart/ChartPanelAdds.java
index d7ba49c..e9b1bdc 100644
--- a/src/main/java/fr/cemagref/observation/observers/jfreechart/ChartPanelAdds.java
+++ b/src/main/java/fr/cemagref/observation/observers/jfreechart/ChartPanelAdds.java
@@ -57,24 +57,18 @@ public class ChartPanelAdds extends ChartPanel {
if (!filename.endsWith(extension)) {
filename = filename + extension;
}
- switch (extension) {
- case ".png":
+ if (extension.equals(".png")) {
ChartUtilities.saveChartAsPNG(new File(filename), this.getChart(),
getWidth(), getHeight());
- break;
- case ".jpg":
+ } else if (extension.equals(".jpg")) {
ChartUtilities.saveChartAsJPEG(new File(filename), this.getChart(),
getWidth(), getHeight());
- break;
- case ".pdf":
+ } else if (extension.equals(".pdf")) {
writeChartAsPDF(new File(filename), this.getChart(),
getWidth(), getHeight(),new DefaultFontMapper());
-
- break;
- default:
+ } else {
ChartUtilities.saveChartAsPNG(new File(filename), this.getChart(),
getWidth(), getHeight());
- break;
}
}
--
GitLab