Skip to content
GitLab
Commit aa9b54ec authored by Dumoulin Nicolas's avatar Dumoulin Nicolas
Browse files

conversion to maven and project fixes

parent 0b4bfd18
master
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 1581 deletions
+19 -1581
build.xml deleted 100644 → 0
+ 0
− 74
View file @ 0b4bfd18
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="ObservationDemo" default="default" basedir=".">
<description>Builds, tests, and runs the project ObservationDemo.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar-with-manifest: JAR building (if you are using a manifest)
-do-jar-without-manifest: JAR building (if you are not using a manifest)
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="ObservationDemo-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
manifest.mf deleted 100644 → 0
+ 0
− 3
View file @ 0b4bfd18
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
nbproject/build-impl.xml deleted 100644 → 0
+ 0
− 1394
View file @ 0b4bfd18
This diff is collapsed.
nbproject/project.properties deleted 100644 → 0
+ 0
− 83
View file @ 0b4bfd18
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.run.all.processors=true
application.title=ObservationDemo
application.vendor=dumoulin
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
debug.classpath=\
${run.classpath}
debug.test.classpath=\
${run.test.classpath}
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/ObservationDemo.jar
dist.javadoc.dir=${dist.dir}/javadoc
endorsed.classpath=
excludes=
file.reference.jcommon-1.0.15.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/jcommon-1.0.15.jar
file.reference.jfreechart-1.0.13.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/jfreechart-1.0.13.jar
file.reference.lisc-commons-0.1.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/lisc-commons-0.1.jar
file.reference.observation-0.1.1.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/observation-0.1.1.jar
file.reference.Observation_Demo-src=src
file.reference.ohoui-0.1.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/ohoui-0.1.jar
file.reference.xpp3_min-1.1.4c.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/xpp3_min-1.1.4c.jar
file.reference.xstream-1.3.1.jar=/home/dumoulin/Documents/Dev/Observation/trunk/target/dependency/xstream-1.3.1.jar
includes=**
jar.compress=false
javac.classpath=\
${file.reference.observation-0.1.1.jar}:\
${file.reference.jcommon-1.0.15.jar}:\
${file.reference.jfreechart-1.0.13.jar}:\
${file.reference.lisc-commons-0.1.jar}:\
${file.reference.ohoui-0.1.jar}:\
${file.reference.xpp3_min-1.1.4c.jar}:\
${file.reference.xstream-1.3.1.jar}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.processorpath=\
${javac.classpath}
javac.source=1.5
javac.target=1.5
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}:\
${libs.junit.classpath}:\
${libs.junit_4.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
main.class=fr.cemagref.observation.examples.race.Pilot
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project
# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
# or test-sys-prop.name=value to set system properties for unit tests):
run.jvmargs=
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
src.src.dir=src
nbproject/project.xml deleted 100644 → 0
+ 0
− 15
View file @ 0b4bfd18
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>ObservationDemo</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<source-roots>
<root id="src.src.dir"/>
</source-roots>
<test-roots/>
</data>
<references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
</configuration>
</project>
src/main/java/fr/cemagref/observation/examples/race/Pilot.java
+ 12
− 9
View file @ aa9b54ec
......@@ -21,13 +21,16 @@ import javax.swing.JFrame;
import javax.swing.JPanel;
public class Pilot extends JFrame implements ObserversManagerHandler {
private final ObservableManager observableManager;
public Pilot() {
super("Observation demo");
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
// JFreeChart mode
ObservablesHandler clObservable = ObservableManager.addObservable(Individual.class);
observableManager = new ObservableManager();
ObservablesHandler clObservable = observableManager.addObservable(Individual.class);
TemporalChart chart1 = new TemporalMeanChart(clObservable.getObservableFetcher("remaining distance"));
clObservable.addObserverListener(chart1);
TemporalChart chart2 = new TemporalSerieChart(clObservable.getObservableFetcher("remaining distance"));
......@@ -42,13 +45,13 @@ public class Pilot extends JFrame implements ObserversManagerHandler {
new Thread() {
public void run() {
runRace();
runRace(observableManager);
}
}.start();
}
});
panel.add(button, BorderLayout.PAGE_START);
panel.add(new ObserversManagerPanel(this), BorderLayout.CENTER);
panel.add(new ObserversManagerPanel(observableManager, this), BorderLayout.CENTER);
setContentPane(panel);
pack();
setVisible(true);
......@@ -67,27 +70,27 @@ public class Pilot extends JFrame implements ObserversManagerHandler {
batch = true;
}
}
// observers init
if (batch) {
// batch mode
ObservableManager observableManager = new ObservableManager();
//ObservableManager.addObservable(Individual.class).addObserverListener(new ConsoleObserver());
ObservableManager.addObservable(Race.class).addObserverListener((ObserverListener) new XStream(new DomDriver()).fromXML(
observableManager.addObservable(Race.class).addObserverListener((ObserverListener) new XStream(new DomDriver()).fromXML(
"<fr.cemagref.observation.observers.XMLObserver>"
+ "<sysout>false</sysout>"
+ "<outputFile>/dev/null</outputFile>"
+ "</fr.cemagref.observation.observers.XMLObserver>"));
runRace();
runRace(observableManager);
} else {
new Pilot();
}
}
public static void runRace() {
ObservableManager.initObservers();
public static void runRace(ObservableManager observableManager) {
observableManager.initObservers();
// Model execution
Race course = new Race(5, 20);
Race course = new Race(observableManager, 5, 20);
while (!course.step()) {
;
}
......
src/main/java/fr/cemagref/observation/examples/race/Race.java
+ 7
− 3
View file @ aa9b54ec
......@@ -22,14 +22,18 @@ public class Race {
private int length;
// constant handler
private final ObservablesHandler individualClassObservable = ObservableManager.getObservable(Individual.class);
private final ObservablesHandler raceClassObservable = ObservableManager.getObservable(this.getClass());
private final ObservableManager observableManager;
private final ObservablesHandler individualClassObservable;
private final ObservablesHandler raceClassObservable;
/**
* @param nbIndividuals number of individuals
* @param length la length de la course en centim�tres ;-)
*/
public Race(int nbIndividuals, int length) {
public Race(ObservableManager observableManager, int nbIndividuals, int length) {
this.observableManager = observableManager;
individualClassObservable = observableManager.getObservable(Individual.class);
raceClassObservable = observableManager.getObservable(this.getClass());
individuals = new ArrayList<Individual>(nbIndividuals);
remainingDistance = new double[nbIndividuals];
this.length = length;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment