Skip to content
Snippets Groups Projects
Commit 4f672859 authored by Gregory Viguier's avatar Gregory Viguier
Browse files

No commit message

No commit message
parent d1b2046c
No related branches found
No related tags found
No related merge requests found
...@@ -11,12 +11,11 @@ ...@@ -11,12 +11,11 @@
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </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> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes> <attributes>
<attribute name="maven.pomderived" value="true"/> <attribute name="maven.pomderived" value="true"/>
......
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding//src/main/java=windows-1252 encoding//src/main/java=UTF-8
encoding//src/main/resources=windows-1252 encoding//src/main/resources=UTF-8
encoding/<project>=windows-1252 encoding//src/test/java=UTF-8
encoding/<project>=UTF-8
#Thu Oct 13 13:23:52 CEST 2011
eclipse.preferences.version=1 eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.compliance=1.6 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.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.6 org.eclipse.jdt.core.compiler.source=1.7
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</parent> </parent>
<groupId>fr.soleil.gui</groupId> <groupId>fr.soleil.gui</groupId>
<artifactId>capoeira</artifactId> <artifactId>capoeira</artifactId>
<version>6.0.9</version> <version>6.0.12</version>
<name>Capoeira</name> <name>Capoeira</name>
<description>Application to control a diffractometer</description> <description>Application to control a diffractometer</description>
<developers> <developers>
......
...@@ -293,7 +293,7 @@ public class ControlBean extends AbstractTangoBox { ...@@ -293,7 +293,7 @@ public class ControlBean extends AbstractTangoBox {
*/ */
private UserMotorBean getOmegaMotorBean() { private UserMotorBean getOmegaMotorBean() {
if (this.omegaMotorBean == null) { if (this.omegaMotorBean == null) {
this.omegaMotorBean = new UserMotorBean(); this.omegaMotorBean = new UserMotorBean(true);
this.omegaMotorBean.setExecutedBatchFile("atkpanel"); this.omegaMotorBean.setExecutedBatchFile("atkpanel");
} }
return this.omegaMotorBean; return this.omegaMotorBean;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment