Merge branch 'development'

Repast · Apr 21, 2022 · fd7abca · fd7abca
2 parents b9baedb + dcc7ced
commit fd7abca
Show file tree

Hide file tree

Showing 147 changed files with 941 additions and 495 deletions.
diff --git a/libs.bsf/META-INF/MANIFEST.MF b/libs.bsf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs bsf
 Bundle-SymbolicName: libs.bsf
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: lib/bsf.jar,
  lib/bsh-2.0b4.jar
 Export-Package: bsh,

diff --git a/libs.bsf/plugin_jpf.xml b/libs.bsf/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.bsf" version="">
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<runtime>

diff --git a/libs.ext/META-INF/MANIFEST.MF b/libs.ext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs ext
 Bundle-SymbolicName: libs.ext
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: lib/clibwrapper_jiio.jar,
  lib/gluegen-rt.jar,
  lib/jai_codec.jar,
@@ -245,110 +245,6 @@ Export-Package: com.jogamp.common,
  jogamp.opengl.windows.wgl,
  jogamp.opengl.windows.wgl.awt,
  jogamp.opengl.x11.glx,
- org.apache.batik,
- org.apache.batik.anim,
- org.apache.batik.anim.dom,
- org.apache.batik.anim.timing,
- org.apache.batik.anim.values,
- org.apache.batik.bridge,
- org.apache.batik.bridge.svg12,
- org.apache.batik.css.dom,
- org.apache.batik.css.engine,
- org.apache.batik.css.engine.sac,
- org.apache.batik.css.engine.value,
- org.apache.batik.css.engine.value.css2,
- org.apache.batik.css.engine.value.svg,
- org.apache.batik.css.engine.value.svg12,
- org.apache.batik.css.parser,
- org.apache.batik.dom,
- org.apache.batik.dom.events,
- org.apache.batik.dom.svg,
- org.apache.batik.dom.svg12,
- org.apache.batik.dom.traversal,
- org.apache.batik.dom.util,
- org.apache.batik.dom.xbl,
- org.apache.batik.ext.awt,
- org.apache.batik.ext.awt.color,
- org.apache.batik.ext.awt.font,
- org.apache.batik.ext.awt.g2d,
- org.apache.batik.ext.awt.geom,
- org.apache.batik.ext.awt.image,
- org.apache.batik.ext.awt.image.codec.png,
- org.apache.batik.ext.awt.image.codec.tiff,
- org.apache.batik.ext.awt.image.codec.util,
- org.apache.batik.ext.awt.image.renderable,
- org.apache.batik.ext.awt.image.rendered,
- org.apache.batik.ext.awt.image.spi,
- org.apache.batik.ext.swing,
- org.apache.batik.extension,
- org.apache.batik.extension.svg,
- org.apache.batik.gvt,
- org.apache.batik.gvt.event,
- org.apache.batik.gvt.filter,
- org.apache.batik.gvt.flow,
- org.apache.batik.gvt.font,
- org.apache.batik.gvt.renderer,
- org.apache.batik.gvt.text,
- org.apache.batik.i18n,
- org.apache.batik.parser,
- org.apache.batik.script,
- org.apache.batik.script.rhino,
- org.apache.batik.svggen,
- org.apache.batik.svggen.font,
- org.apache.batik.svggen.font.table,
- org.apache.batik.swing,
- org.apache.batik.swing.gvt,
- org.apache.batik.swing.svg,
- org.apache.batik.transcoder,
- org.apache.batik.transcoder.image,
- org.apache.batik.transcoder.image.resources,
- org.apache.batik.transcoder.keys,
- org.apache.batik.transcoder.print,
- org.apache.batik.transcoder.svg2svg,
- org.apache.batik.transcoder.wmf,
- org.apache.batik.transcoder.wmf.tosvg,
- org.apache.batik.util,
- org.apache.batik.util.gui,
- org.apache.batik.util.gui.resource,
- org.apache.batik.util.gui.xmleditor,
- org.apache.batik.util.io,
- org.apache.batik.util.resources,
- org.apache.batik.xml,
- org.apache.xmlcommons,
- org.apache.xmlgraphics.fonts,
- org.apache.xmlgraphics.image,
- org.apache.xmlgraphics.image.codec.png,
- org.apache.xmlgraphics.image.codec.tiff,
- org.apache.xmlgraphics.image.codec.util,
- org.apache.xmlgraphics.image.loader,
- org.apache.xmlgraphics.image.loader.cache,
- org.apache.xmlgraphics.image.loader.impl,
- org.apache.xmlgraphics.image.loader.impl.imageio,
- org.apache.xmlgraphics.image.loader.pipeline,
- org.apache.xmlgraphics.image.loader.spi,
- org.apache.xmlgraphics.image.loader.util,
- org.apache.xmlgraphics.image.rendered,
- org.apache.xmlgraphics.image.writer,
- org.apache.xmlgraphics.image.writer.imageio,
- org.apache.xmlgraphics.image.writer.internal,
- org.apache.xmlgraphics.io,
- org.apache.xmlgraphics.java2d,
- org.apache.xmlgraphics.java2d.color,
- org.apache.xmlgraphics.java2d.color.profile,
- org.apache.xmlgraphics.java2d.ps,
- org.apache.xmlgraphics.ps,
- org.apache.xmlgraphics.ps.dsc,
- org.apache.xmlgraphics.ps.dsc.events,
- org.apache.xmlgraphics.ps.dsc.tools,
- org.apache.xmlgraphics.util,
- org.apache.xmlgraphics.util.dijkstra,
- org.apache.xmlgraphics.util.i18n,
- org.apache.xmlgraphics.util.io,
- org.apache.xmlgraphics.util.uri,
- org.apache.xmlgraphics.xmp,
- org.apache.xmlgraphics.xmp.merge,
- org.apache.xmlgraphics.xmp.schemas,
- org.apache.xmlgraphics.xmp.schemas.pdf,
  org.jogamp.java3d,
  org.jogamp.java3d.audioengines,
  org.jogamp.java3d.audioengines.javasound,

diff --git a/libs.ext/plugin_jpf.xml b/libs.ext/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.ext" version="">
 	<attributes>
-		<attribute id="simphony" value="2.9.0"/>
+		<attribute id="simphony" value="2.9.1"/>
 	</attributes>
 
 	<runtime>

diff --git a/libs.piccolo/META-INF/MANIFEST.MF b/libs.piccolo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast libs piccolo
 Bundle-SymbolicName: libs.piccolo
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: lib/piccolo2d-core-3.0.jar,
  lib/piccolo2d-extras-3.0.jar
 Export-Package: org.piccolo2d,

diff --git a/libs.piccolo/plugin_jpf.xml b/libs.piccolo/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="libs.piccolo" version="">
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<runtime>

diff --git a/repast.simphony.R/META-INF/MANIFEST.MF b/repast.simphony.R/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast R
 Bundle-SymbolicName: repast.simphony.R
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Require-Bundle: repast.simphony.gui,
  repast.simphony.data,
  repast.simphony.core,

diff --git a/repast.simphony.R/licenses/repast-license.txt b/repast.simphony.R/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.R/plugin_jpf.xml b/repast.simphony.R/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.R" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.batch/META-INF/MANIFEST.MF b/repast.simphony.batch/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast batch
 Bundle-SymbolicName: repast.simphony.batch;singleton:=true
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Require-Bundle: libs.bsf,
  repast.simphony.dataLoader,
  repast.simphony.data,

diff --git a/repast.simphony.batch/licenses/repast-license.txt b/repast.simphony.batch/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.batch/plugin_jpf.xml b/repast.simphony.batch/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.batch" version="">
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.bin_and_src/META-INF/MANIFEST.MF b/repast.simphony.bin_and_src/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast bin and src
 Bundle-SymbolicName: repast.simphony.bin_and_src
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-Vendor: Argonne National Laboratory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/repast.simphony.bin_and_src/repast.simphony.bin_and_src.jar b/repast.simphony.bin_and_src/repast.simphony.bin_and_src.jar
diff --git a/repast.simphony.chart/META-INF/MANIFEST.MF b/repast.simphony.chart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast chart
 Bundle-SymbolicName: repast.simphony.chart
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: lib/jcommon-1.0.23.jar,
  lib/jfreechart-1.0.19.jar
 Export-Package: com.keypoint,

diff --git a/repast.simphony.chart/licenses/repast-license.txt b/repast.simphony.chart/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.chart/plugin_jpf.xml b/repast.simphony.chart/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.chart" version="">
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.core/META-INF/MANIFEST.MF b/repast.simphony.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast core
 Bundle-SymbolicName: repast.simphony.core
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: lib/jsr108-0.01.jar,
  lib/concurrent-1.3.4.jar,
  lib/collections-generic-4.01.jar,

diff --git a/repast.simphony.core/licenses/repast-license.txt b/repast.simphony.core/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.core/plugin_jpf.xml b/repast.simphony.core/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.core" version="">
 	<attributes>
-		<attribute id="simphony" value="2.9.0"/>
+		<attribute id="simphony" value="2.9.1"/>
 	</attributes>
 
 	<requires>

diff --git a/repast.simphony.core/src/repast/simphony/engine/controller/DefaultController.java b/repast.simphony.core/src/repast/simphony/engine/controller/DefaultController.java
@@ -33,7 +33,7 @@
 public class DefaultController implements Controller {
   private static final int FIRST_RUN_NUMBER = 1;
 
-  private static final long serialVersionUID = -202102336096207785L;
+  private static final long serialVersionUID = -202202336096207785L;
 
   private static final MessageCenter msgCenter = MessageCenter
       .getMessageCenter(DefaultController.class);

diff --git a/repast.simphony.data.ui/META-INF/MANIFEST.MF b/repast.simphony.data.ui/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast ui
 Bundle-SymbolicName: repast.simphony.data.ui
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Require-Bundle: saf.core.ui,
  repast.simphony.data,
  repast.simphony.gui,
  repast.simphony.plugin.util,
  repast.simphony.core,
  repast.simphony.runtime,
  repast.simphony.scenario,
- repast.simphony.eclipse;bundle-version="2.9.0"
+ repast.simphony.eclipse;bundle-version="2.9.1"
 Export-Package: repast.simphony.data.analysis,
  repast.simphony.data2.gui,
  repast.simphony.data2.wizard

diff --git a/repast.simphony.data.ui/licenses/repast-license.txt b/repast.simphony.data.ui/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.data.ui/plugin_jpf.xml b/repast.simphony.data.ui/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.data.ui" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.data/META-INF/MANIFEST.MF b/repast.simphony.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast data
 Bundle-SymbolicName: repast.simphony.data
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Bundle-ClassPath: bin/
 Export-Package: repast.simphony.data2,
  repast.simphony.data2.builder,

diff --git a/repast.simphony.data/licenses/repast-license.txt b/repast.simphony.data/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.data/plugin_jpf.xml b/repast.simphony.data/plugin_jpf.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE plugin PUBLIC "-//JPF//Java Plug-in Manifest 0.6" "http://jpf.sourceforge.net/plugin_0_6.dtd">
 <plugin id="repast.simphony.data" version="">
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.dataLoader.ui/META-INF/MANIFEST.MF b/repast.simphony.dataLoader.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast dataloader ui
 Bundle-SymbolicName: repast.simphony.dataLoader.ui
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Export-Package: repast.simphony.dataLoader.ui,
  repast.simphony.dataLoader.ui.wizard,
  repast.simphony.dataLoader.ui.wizard.builder

diff --git a/repast.simphony.dataLoader.ui/licenses/repast-license.txt b/repast.simphony.dataLoader.ui/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.dataLoader.ui/plugin_jpf.xml b/repast.simphony.dataLoader.ui/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.dataloader.ui" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
   <requires>

diff --git a/repast.simphony.dataLoader/META-INF/MANIFEST.MF b/repast.simphony.dataLoader/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repast dataloader
 Bundle-SymbolicName: repast.simphony.dataLoader
-Bundle-Version: 2.9.0
+Bundle-Version: 2.9.1
 Require-Bundle: repast.simphony.core,
  repast.simphony.plugin.util,
  repast.simphony.scenario,

diff --git a/repast.simphony.dataLoader/licenses/repast-license.txt b/repast.simphony.dataLoader/licenses/repast-license.txt
@@ -1,6 +1,6 @@
 Repast Simphony
 
-   Copyright (c) 2021 Argonne National Laboratory
+   Copyright (c) 2022 Argonne National Laboratory
    All rights reserved.
 
    Redistribution and use in source and binary forms, with 

diff --git a/repast.simphony.dataLoader/plugin_jpf.xml b/repast.simphony.dataLoader/plugin_jpf.xml
@@ -3,7 +3,7 @@
 <plugin id="repast.simphony.dataloader" version="">
 
 	<attributes>
-         <attribute id="simphony" value="2.9.0"/>
+         <attribute id="simphony" value="2.9.1"/>
      </attributes>
 
   <requires>