Release 6.0.13

.classpath

@@ -11,12 +11,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -26,6 +25,7 @@
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

.settings/org.eclipse.core.resources.prefs

 eclipse.preferences.version=1
-encoding//src/main/java=windows-1252
-encoding//src/main/resources=windows-1252
-encoding/<project>=windows-1252
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

-#Thu Oct 13 13:23:52 CEST 2011
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.7

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>fr.soleil.gui</groupId>
 	<artifactId>capoeira</artifactId>
-	<version>6.0.9</version>
+	<version>6.0.13</version>
 	<name>Capoeira</name>
 	<description>Application to control a diffractometer</description>
 	<developers>
@@ -29,7 +29,7 @@
 			<id>viguier</id>
 			<name>Grégory Viguier</name>
 			<email>gregory.viguier@synchrotron-soleil.fr</email>
-			<organization>Synchrotron Soleil</organization>
+			<organization>Synchrotron SOLEIL</organization>
 			<organizationUrl>http://www.synchrotron-soleil.fr</organizationUrl>
 			<roles>
 				<role>manager</role>

src/main/java/fr/soleil/gui/capoeira/Capoeira.java

@@ -310,7 +310,7 @@ public class Capoeira extends Application {
 
     @Override
     protected ImageIcon getSplashImage() {
-        final ImageIcon result = new ImageIcon(Capoeira.class.getResource("/diffracto/appli_start.jpg"));
+        final ImageIcon result = new ImageIcon(Capoeira.class.getResource("/diffracto/splash-11986-2.png"));
         return result;
     }
 

src/main/java/fr/soleil/gui/capoeira/ControlBean.java

@@ -293,7 +293,7 @@ public class ControlBean extends AbstractTangoBox {
      */
     private UserMotorBean getOmegaMotorBean() {
         if (this.omegaMotorBean == null) {
-            this.omegaMotorBean = new UserMotorBean();
+            this.omegaMotorBean = new UserMotorBean(true);
             this.omegaMotorBean.setExecutedBatchFile("atkpanel");
         }
         return this.omegaMotorBean;