From 39026e2d6bce864f43aeb58bd48a1d8a3a9124f2 Mon Sep 17 00:00:00 2001
From: Simon Gregor Ebner <simon.ebner@psi.ch>
Date: Mon, 28 Jul 2014 16:28:20 +0200
Subject: [PATCH] Updated configuration deserialization

---
 ch.psi.fda.xscan/pom.xml                                      | 2 +-
 .../src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ch.psi.fda.xscan/pom.xml b/ch.psi.fda.xscan/pom.xml
index b3004b0..efd6a79 100644
--- a/ch.psi.fda.xscan/pom.xml
+++ b/ch.psi.fda.xscan/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>ch.psi.fda</groupId>
 	<artifactId>ch.psi.fda.xscan</artifactId>
-	<version>2.3.1</version>
+	<version>2.3.2</version>
 
 	<dependencies>
 
diff --git a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
index 6995038..1a3188c 100644
--- a/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
+++ b/ch.psi.fda.xscan/src/main/java/ch/psi/fda/aq/XScanDescriptorProvider.java
@@ -87,7 +87,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
 	 * @param vl
 	 * @return
 	 */
-	public VDescriptor mapVisualizations(List<Visualization> vl){
+	public static VDescriptor mapVisualizations(List<Visualization> vl){
 		VDescriptor vd = new VDescriptor();
 		
 		
@@ -295,7 +295,7 @@ public class XScanDescriptorProvider implements DescriptorProvider {
 	 * @param object
 	 * @return	Id string of object
 	 */
-	private String getId(Object object){
+	private static String getId(Object object){
 		String id;
 		if(object instanceof Positioner){
 			id = ((Positioner)object).getId();