Merge branch 'development'

Conflicts: repast.simphony.deployment/installer_scripts/RepastInstallerScript.nsi
Repast · Sep 30, 2019 · 502c342 · 502c342
2 parents 1b0c413 + 19fb9fc
commit 502c342
Show file tree

Hide file tree

Showing 269 changed files with 63,258 additions and 2,407 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.6.0
+Bundle-Version: 2.7.0
 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 Bundle-ClassPath: lib/clibwrapper_jiio.jar,
  lib/gluegen-rt.jar,
  lib/j3dcore.jar,

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.6.0"/>
+		<attribute id="simphony" value="2.7.0"/>
 	</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.6.0
+Bundle-Version: 2.7.0
 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.batch/src/repast/simphony/batch/BatchScenarioLoader.java b/repast.simphony.batch/src/repast/simphony/batch/BatchScenarioLoader.java
@@ -84,11 +84,6 @@ protected void addParentActions(ContextData contextData, ControllerRegistry regi
 
   }
 
-  @Override
-  public BatchScenario getScenario() {
-    return (BatchScenario) scenario;
-  }
-
   @Override
   protected ControllerActionIOExtensions getIOExts() {
     return ioExt;

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.6.0
+Bundle-Version: 2.7.0
 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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </attributes>
 
 	<requires>

diff --git a/repast.simphony.chart/src/repast/simphony/chart2/LineChartCreator.java b/repast.simphony.chart/src/repast/simphony/chart2/LineChartCreator.java
@@ -7,7 +7,6 @@
 import java.util.Map;
 
 import javax.swing.BorderFactory;
-import javax.swing.JComponent;
 
 import org.jfree.chart.ChartFactory;
 import org.jfree.chart.ChartPanel;
@@ -50,11 +49,10 @@ public LineChartCreator(XYSeriesCollection xydata) {
     this.xydata = xydata;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see projz.chart.ChartCreator#reset()
-   */
+  public void setAntiAliasing(boolean antiAliasing) {
+  	panel.getChart().setAntiAlias(antiAliasing);
+  }
+
   @Override
   public void reset() {
     JFreeChart chart = panel.getChart();
@@ -63,13 +61,9 @@ public void reset() {
     panel.setChart(null);
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see projz.chart.ChartCreator#createChartComponents()
-   */
+
   @Override
-  public JComponent createChartComponent(TimeSeriesChartDescriptor descriptor) {
+  public ChartPanel createChartComponent(TimeSeriesChartDescriptor descriptor) {
 
     JFreeChart chart = ChartFactory.createXYLineChart(descriptor.getChartTitle(), 
         descriptor.getXAxisLabel(), descriptor.getYAxisLabel(), xydata,

diff --git a/...simphony.chart/src/repast/simphony/chart2/engine/TimeSeriesComponentControllerAction.java b/...simphony.chart/src/repast/simphony/chart2/engine/TimeSeriesComponentControllerAction.java
@@ -120,8 +120,10 @@ public void runCleanup(RunState runState, Object contextId) {
    */
   @Override
   public void stopped() {
-    if (chartData != null)
+    if (chartData != null) {
       chartData.setRunning(false);
+      chartCreator.setAntiAliasing(true);
+    }
   }
 
   /*
@@ -131,8 +133,10 @@ public void stopped() {
    */
   @Override
   public void paused() {
-    if (chartData != null)
+    if (chartData != null) {
       chartData.setRunning(false);
+      chartCreator.setAntiAliasing(true);
+    }
   }
 
   /*
@@ -142,8 +146,10 @@ public void paused() {
    */
   @Override
   public void started() {
-    if (chartData != null)
+    if (chartData != null) {
       chartData.setRunning(true);
+      chartCreator.setAntiAliasing(false);
+    }
   }
 
   /*
@@ -153,7 +159,9 @@ public void started() {
    */
   @Override
   public void restarted() {
-    if (chartData != null)
+    if (chartData != null) {
       chartData.setRunning(true);
+      chartCreator.setAntiAliasing(false);
+    }
   }
 }
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.6.0
+Bundle-Version: 2.7.0
 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) 2017 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+		<attribute id="simphony" value="2.7.0"/>
 	</attributes>
 
 	<requires>

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.6.0
+Bundle-Version: 2.7.0
 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.6.0"
+ repast.simphony.eclipse;bundle-version="2.7.0"
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </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.6.0
+Bundle-Version: 2.7.0
 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) 2018 Argonne National Laboratory
+   Copyright (c) 2019 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.6.0"/>
+         <attribute id="simphony" value="2.7.0"/>
      </attributes>
 
   <requires>