diff --git a/pom.xml b/pom.xml
index 326a7973e640415bc596e7a948980f9bcdc752ba..012f2315a04fc659d805135941d82ee43d9c2f9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<groupId>fr.cemagref</groupId>
<artifactId>ohoui</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>0.1.1</version>
<dependencies>
<dependency>
@@ -20,7 +20,7 @@
<dependency>
<groupId>fr.cemagref</groupId>
<artifactId>lisc-commons</artifactId>
- <version>0.1</version>
+ <version>0.1.1</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -57,8 +57,8 @@
<packaging>jar</packaging>
<scm>
- <connection>scm:svn:http://trac.clermont.cemagref.fr/svn/LISC/OhOUI/branches/0.1</connection>
- <url>http://trac.clermont.cemagref.fr/projets/LISC/browser/OhOUI/branches/0.1</url>
+ <connection>scm:svn:http://trac.clermont.cemagref.fr/svn/LISC/OhOUI/tags/ohoui-0.1.1</connection>
+ <url>http://trac.clermont.cemagref.fr/projets/LISC/browser/OhOUI/tags/ohoui-0.1.1</url>
</scm>
<build>
<plugins>
diff --git a/src/main/java/demo/OhOUIDemo.java b/src/main/java/demo/OhOUIDemo.java
index 4c37ff524e9d744fccafd493d83b95ae27f55f43..d3d9cf60d378d0f496977c871a526eadfa2710c8 100644
--- a/src/main/java/demo/OhOUIDemo.java
+++ b/src/main/java/demo/OhOUIDemo.java
@@ -5,7 +5,6 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import fr.cemagref.commons.modulesloader.ModulesLoader;
import fr.cemagref.ohoui.annotations.Anchor;
import fr.cemagref.ohoui.annotations.Description;
import fr.cemagref.ohoui.annotations.Link;
@@ -18,13 +17,6 @@ public class OhOUIDemo {
public static void main(String[] args) throws Exception {
- // Init the engine
- //ModulesLoader.addModulesPackage("demo");
- //ModulesLoader.setLogStream(System.err);
- ModulesLoader.addModulesJAR("rt.jar");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.util");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.lang");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.io");
MyModel maclasse = new MyModel();
// Run the GUI
@@ -33,19 +25,20 @@ public class OhOUIDemo {
dialog.pack();
dialog.setVisible(true);
}
-
+
// launch the method defined by the abstract class Algo
- if (maclasse.algo != null)
- maclasse.algo.process();
+ if (maclasse.algo != null) {
+ maclasse.algo.process();
+ }
- if (maclasse.init != null)
- maclasse.init.doProcess();
+ if (maclasse.init != null) {
+ maclasse.init.doProcess();
+ }
// print the complete state of the object after edition
//System.out.println((new XStream(new DomDriver())).toXML(maclasse));
}
-
public static class MyModel<A extends Algo> {
public MyModel() {
@@ -54,37 +47,27 @@ public class OhOUIDemo {
listAlgo.add(new AlgoFaster());
//listAlgo2 = new ArrayList<AlgoAccurate>();
}
-
Test1 test1;
Test2 test2;
-
@Description(name = "A number", tooltip = "Here, you can add some indications")
private Integer aNumber = 1;
-
@Description(name = "Use color ?", tooltip = "Use the checkbox")
- @Link(action="enable", target="color")
+ @Link(action = "enable", target = "color")
boolean b = true;
-
@Description(name = "The color of the sky ", tooltip = "Please, change this color")
- @Anchor(id="color")
+ @Anchor(id = "color")
Color color = new Color(150, 150, 150);
-
// without metadata
private String aString;
-
InitOpinionIncertitude init;
-
private Algo algo;
-
@Description(name = "List of processes", tooltip = "Used to compute your solution")
@XStreamable(load = true, save = true)
private List<Algo> listAlgo;
/*@XStreamable(load = true, save = true)
private List<? extends Algo> listAlgo2;*/
-
private List<A> listAlgo3;
-
//private List listAlgo4;
/*@Description(name = "Process", tooltip = "Used to compute your solution")
@@ -93,23 +76,23 @@ public class OhOUIDemo {
}
public static abstract class Algo {
+
@Description(name = "Input data", tooltip = "")
File input;
abstract void process();
}
-
+
public static class AlgoFaster extends Algo {
// some params that you may need for your algo
public double param1;
-
public double param2;
@Override
void process() {
// Here your process
- System.out.println("fast "+param1);
+ System.out.println("fast " + param1);
}
}
@@ -117,28 +100,27 @@ public class OhOUIDemo {
public int param;
InitOpinionIncertitude trux;
+
@Override
void process() {
- System.out.println("accurate");
+ System.out.println("accurate");
// Here your process
}
}
-
+
public interface InitOpinionIncertitude {
void doProcess();
-
}
+
public class InitOpinionIncertitudeRandom implements InitOpinionIncertitude {
public InitOpinionIncertitudeRandom() {
System.out.println("*********************PLOP***************");
}
-
+
public void doProcess() {
- System.out.println("Init Random");
+ System.out.println("Init Random");
}
-
}
-
}
diff --git a/src/main/java/demo/Test1.java b/src/main/java/demo/Test1.java
index 597df74acf9e93a7107674b60309ef6e651bfc4d..67374b573f08e9d061b6190ec3530332ae15d69b 100644
--- a/src/main/java/demo/Test1.java
+++ b/src/main/java/demo/Test1.java
@@ -2,29 +2,22 @@ package demo;
import java.util.List;
-import fr.cemagref.commons.modulesloader.ModulesLoader;
import fr.cemagref.ohoui.filters.NoTransientField;
import fr.cemagref.ohoui.swing.OhOUI;
import fr.cemagref.ohoui.swing.OhOUIDialog;
public class Test1 {
- int truc;
- List<Integer> list;
- public static void main(String[] args) throws Exception {
- // Init the engine
- //ModulesLoader.addModulesPackage("demo");
- //ModulesLoader.setLogStream(System.err);
- ModulesLoader.addModulesJAR("rt.jar");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.util");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.lang");
- ModulesLoader.addModulesPackageForJar("rt.jar","java.io");
-
+ int truc;
+ List<Integer> list;
+
+ public static void main(String[] args) throws Exception {
+
// Run the GUI
OhOUIDialog dialog = OhOUI.getDialog(null, new Test1(), new NoTransientField());
if (dialog != null) {
dialog.pack();
dialog.setVisible(true);
}
- }
+ }
}
diff --git a/src/main/java/demo/Test2.java b/src/main/java/demo/Test2.java
index 76c305732f24118dafa0da44544f99892f47fcd6..651e2ffae22ca6042fd667d94e063825de6e6207 100644
--- a/src/main/java/demo/Test2.java
+++ b/src/main/java/demo/Test2.java
@@ -1,5 +1,4 @@
package demo;
public class Test2 {
-
}