Fixed time zone support in local time display

develancer · develancer · commit f7b481d7fb35 · 2016-11-02T16:37:12.000+01:00
diff --git a/doc/ExamplePlugin/README.txt b/doc/ExamplePlugin/README.txt
@@ -3,4 +3,4 @@ svarog\target\svarog-{version}.jar
 target\svarog-{version}-full.dir\svarog-{version}\lib\log4j.jar
 target\svarog-{version}-full.dir\svarog-{version}\lib\spring-context.jar
 
-If the version of Svarog changes from 1.1.5 to something else you will also have to modify the configuration of the project.
+If the version of Svarog changes from 1.1.6 to something else you will also have to modify the configuration of the project.
diff --git a/doc/ExamplePlugin/src/org/signalml/plugin/exampleplugin/package-info.java b/doc/ExamplePlugin/src/org/signalml/plugin/exampleplugin/package-info.java
@@ -23,15 +23,15 @@
  * <p>
  * To create such plug-in it is necessary to include some libraries:
  * <ul>
- * <li>{@code svarog-1.1.5.jar} - to use Svarog classes, for example
+ * <li>{@code svarog-1.1.6.jar} - to use Svarog classes, for example
  * the plug-in interface ;) (can be found in {@code svarog\target}),</li>
  * <li>{@code log4j.jar} - to use logging interface consistent with that used
  * in Svarog
- * ({@code svarog\target\svarog-1.1.5-full\svarog-1.1.5\lib}),
+ * ({@code svarog\target\svarog-1.1.6-full\svarog-1.1.6\lib}),
  * </li>
  * <li>{@code spring-context.jar} - to use classes such as {@code Tag}
  * and {@code TagStyle}
- * ({@code svarog\target\svarog-1.1.5-full\svarog-1.1.5\lib}),
+ * ({@code svarog\target\svarog-1.1.6-full\svarog-1.1.6\lib}),
  * </li>
  * </ul>
  * <p>
diff --git a/izpack/pom.xml b/izpack/pom.xml
@@ -4,13 +4,13 @@
 
 	<groupId>org.signalml</groupId>
 	<artifactId>svarog-installer</artifactId>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 
 	<name>svarog-installer</name>
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/plugins/Artifact/pom.xml b/plugins/Artifact/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/plugins/BookReporter/pom.xml b/plugins/BookReporter/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -123,7 +123,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/plugins/FFTSignalTool/pom.xml b/plugins/FFTSignalTool/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/plugins/PluginToolCommon/pom.xml b/plugins/PluginToolCommon/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -63,7 +63,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/plugins/SFTestPlugin/pom.xml b/plugins/SFTestPlugin/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -86,7 +86,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/plugins/SignalAnalysisPlugin/pom.xml b/plugins/SignalAnalysisPlugin/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -71,7 +71,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/plugins/Stager/pom.xml b/plugins/Stager/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 			<type>jar</type>
 			<scope>provided</scope>
 		</dependency>
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<groupId>org.signalml</groupId>
 	<artifactId>svarog-top</artifactId>
 	<packaging>pom</packaging>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 
 	<name>Svarog-top</name>
 
diff --git a/svarog-standalone/pom.xml b/svarog-standalone/pom.xml
@@ -5,13 +5,13 @@
 	<groupId>org.signalml</groupId>
 	<artifactId>svarog-standalone</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 
 	<name>Svarog</name>
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 	</parent>
 
 	<build>
@@ -84,7 +84,7 @@
 		<dependency>
 			<groupId>org.signalml</groupId>
 			<artifactId>svarog</artifactId>
-			<version>1.1.5</version>
+			<version>1.1.6</version>
 		</dependency>
 	</dependencies>
 
diff --git a/svarog/pom.xml b/svarog/pom.xml
@@ -5,13 +5,13 @@
 	<groupId>org.signalml</groupId>
 	<artifactId>svarog</artifactId>
 	<packaging>jar</packaging>
-	<version>1.1.5</version>
+	<version>1.1.6</version>
 
 	<name>Svarog</name>
 	<parent>
 		<groupId>org.signalml</groupId>
 		<artifactId>svarog-top</artifactId>
-		<version>1.1.5</version>
+		<version>1.1.6</version>
 	</parent>
 
 	<properties>
diff --git a/svarog/src/main/java/org/signalml/app/view/signal/SignalPlotColumnHeader.java b/svarog/src/main/java/org/signalml/app/view/signal/SignalPlotColumnHeader.java
@@ -439,7 +439,8 @@ protected void paintComponent(Graphics gOrig) {
 				second = (int) Math.round((i * pixelPerColumnUnit) / pixelPerSecond);
 				if (firstSampleTimestamp > 0) {
 					TimeZone timeZone = Calendar.getInstance().getTimeZone();
-					int offset = timeZone.getOffset(1000 * firstSampleTimestamp);
+					// TimeZone API uses timestamp in milliseconds
+					int offset = timeZone.getOffset(1000 * firstSampleTimestamp) / 1000;
 					second = (int) ((firstSampleTimestamp + second + offset) % 86400);
 				}
 				hour = second / 3600;
diff --git a/svarog/src/main/java/org/signalml/plugin/loader/PluginLoaderHi.java b/svarog/src/main/java/org/signalml/plugin/loader/PluginLoaderHi.java
@@ -278,7 +278,7 @@ private void setGlobalPluginDir() {
 				URL jarURL = ((JarURLConnection) connection).getJarFileURL();
 				jarFile = _urlToFile(jarURL);
 			} else {
-				// e.g. file:/usr/share/java/svarog-1.1.5.jar
+				// e.g. file:/usr/share/java/svarog-1.1.6.jar
 				jarFile = new File(srcURL.getPath());
 			}
 
diff --git a/svarog/src/main/resources/org/signalml/help/contents.html b/svarog/src/main/resources/org/signalml/help/contents.html
@@ -2,15 +2,15 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Signalml viewer 1.1.5</title>
+<title>Signalml viewer 1.1.6</title>
 <style type="text/css">
 .red {
 	color: #008;
 }
 </style>
 </head>
 <body><div>
-<h1><span class="red">SVAROG</span> 1.1.5</h1>
+<h1><span class="red">SVAROG</span> 1.1.6</h1>
 <h2><span class="red">S</span>ignal <span class="red">V</span>iewer, <span class="red">A</span>nalyzer and <span class="red">R</span>ecorder <span class="red">O</span>n <span class="red">G</span>PL </h2>
 <h3>Project started at the <A HREF="http://www.uw.edu.pl">University of Warsaw</A>, 
 <a href="http://www.fuw.edu.pl">Faculty of Physics</a>. <br>
diff --git a/svarog/src/site/xdoc/downloads.xml b/svarog/src/site/xdoc/downloads.xml
@@ -47,11 +47,11 @@
     <ul>
       <li>Latest compiled version (latest checkin on any branch):
       <a href="https://escher.fuw.edu.pl/jenkins/job/svarog/lastBuild/">compilation results</a>
-      <a href="https://escher.fuw.edu.pl/jenkins/job/svarog/lastBuild/org.signalml$svarog/artifact/org.signalml/svarog/1.1.5/svarog-1.1.5-onejar.jar">runnable</a> one-jar version.
+      <a href="https://escher.fuw.edu.pl/jenkins/job/svarog/lastBuild/org.signalml$svarog/artifact/org.signalml/svarog/1.1.6/svarog-1.1.6-onejar.jar">runnable</a> one-jar version.
       </li>
       <li>Laster compiled version on the master branch (more stable):
       <a href="https://escher.fuw.edu.pl/jenkins/job/svarog-master/lastBuild/">compilation results</a>
-      <a href="https://escher.fuw.edu.pl/jenkins/job/svarog-master/lastBuild/org.signalml$svarog/artifact/org.signalml/svarog/1.1.5/svarog-1.1.5-onejar.jar">runnable</a> one-jar version.
+      <a href="https://escher.fuw.edu.pl/jenkins/job/svarog-master/lastBuild/org.signalml$svarog/artifact/org.signalml/svarog/1.1.6/svarog-1.1.6-onejar.jar">runnable</a> one-jar version.
       </li>
     </ul>
       </subsection>
