diff --git a/assignments/nbproject/build-impl.xml b/assignments/nbproject/build-impl.xml
index f7ddad6c5d41508b506ddccc57fa96f2661f1eb2..06fb1230b15e61ea5ef716d662e433450f217779 100644
--- a/assignments/nbproject/build-impl.xml
+++ b/assignments/nbproject/build-impl.xml
@@ -119,43 +119,7 @@ is divided into following sections:
<property name="module.name" value=""/>
</target>
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-modules-supported" name="-do-init">
- <j2seproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
- <j2seproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
- <j2seproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
- <j2seproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
- <condition property="platform.javac" value="${platform.home}/bin/javac">
- <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
- </condition>
- <property name="platform.javac" value="${platform.javac.tmp}"/>
- <j2seproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
- <condition property="platform.java" value="${platform.home}/bin/java">
- <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
- </condition>
- <property name="platform.java" value="${platform.java.tmp}"/>
- <j2seproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
- <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
- <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
- </condition>
- <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
- <condition property="platform.invalid" value="true">
- <or>
- <contains string="${platform.javac}" substring="$${platforms."/>
- <contains string="${platform.java}" substring="$${platforms."/>
- <contains string="${platform.javadoc}" substring="$${platforms."/>
- </or>
- </condition>
- <fail unless="platform.home">Must set platform.home</fail>
- <fail unless="platform.bootcp">Must set platform.bootcp</fail>
- <fail unless="platform.java">Must set platform.java</fail>
- <fail unless="platform.javac">Must set platform.javac</fail>
- <fail if="platform.invalid">
- The J2SE Platform is not correctly set up.
- Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files.
- Either open the project in the IDE and setup the Platform with the same name or add it manually.
- For example like this:
- ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file)
- or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used)
- </fail>
+ <property name="platform.java" value="${java.home}/bin/java"/>
<available file="${manifest.file}" property="manifest.available"/>
<condition property="splashscreen.available">
<and>
@@ -278,6 +242,20 @@ is divided into following sections:
<condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
<isset property="profile.available"/>
</condition>
+ <condition else="false" property="jdkBug6558476">
+ <and>
+ <matches pattern="1\.[56]" string="${java.specification.version}"/>
+ <not>
+ <os family="unix"/>
+ </not>
+ </and>
+ </condition>
+ <condition else="false" property="javac.fork">
+ <or>
+ <istrue value="${jdkBug6558476}"/>
+ <istrue value="${javac.external.vm}"/>
+ </or>
+ </condition>
<property name="jar.index" value="false"/>
<property name="jar.index.metainf" value="${jar.index}"/>
<property name="copylibs.rebase" value="true"/>
@@ -365,7 +343,7 @@ is divided into following sections:
</path>
</resourcecount>
</condition>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -416,7 +394,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -458,7 +436,7 @@ is divided into following sections:
<sequential>
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -537,7 +515,7 @@ is divided into following sections:
<element name="customizePrototype" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -565,7 +543,7 @@ is divided into following sections:
<element name="customizePrototype" optional="true"/>
<sequential>
<property name="junit.forkmode" value="perTest"/>
- <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}">
+ <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<syspropertyset>
<propertyref prefix="test-sys-prop."/>
<mapper from="test-sys-prop.*" to="*" type="glob"/>
@@ -641,7 +619,7 @@ is divided into following sections:
</fileset>
</union>
<taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
- <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Networked_Graphics_MV3500_assignments" testname="TestNG tests" workingDir="${work.dir}">
+ <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Networked_Graphics_MV3500_assignments" testname="TestNG tests" workingDir="${work.dir}">
<xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
<propertyset>
<propertyref prefix="test-sys-prop."/>
@@ -872,9 +850,6 @@ is divided into following sections:
<classpath>
<path path="@{classpath}"/>
</classpath>
- <bootclasspath>
- <path path="${platform.bootcp}"/>
- </bootclasspath>
</nbjpdastart>
</sequential>
</macrodef>
@@ -924,7 +899,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}" module="@{modulename}">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -958,7 +933,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<classpath>
<path path="@{classpath}"/>
</classpath>
@@ -990,7 +965,7 @@ is divided into following sections:
<attribute default="jvm" name="jvm"/>
<element name="customize" optional="true"/>
<sequential>
- <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
+ <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
<jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
<redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
@@ -1224,7 +1199,7 @@ is divided into following sections:
<j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
<echo level="info">To run this application from the command line without Ant, try:</echo>
<property location="${dist.jar}" name="dist.jar.resolved"/>
- <echo level="info">${platform.java} -jar "${dist.jar.resolved}"</echo>
+ <echo level="info">java -jar "${dist.jar.resolved}"</echo>
</target>
<target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-check-do-mkdist" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
<j2seproject1:jar manifest="${tmp.manifest.file}"/>
@@ -1326,8 +1301,8 @@ is divided into following sections:
<isset property="main.class.available"/>
</and>
</condition>
- <property name="platform.jlink" value="${platform.home}/bin/jlink"/>
- <property name="jlink.systemmodules.internal" value="${platform.home}/jmods"/>
+ <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+ <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
<exec executable="${platform.jlink}">
<arg value="--module-path"/>
<arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.jar}"/>
@@ -1520,19 +1495,16 @@ is divided into following sections:
</not>
</and>
</condition>
- <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
- <arg value="-version"/>
- </exec>
<condition else="" property="bug5101868workaround" value="*.java">
- <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
+ <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
</condition>
<condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
<and>
<isset property="javadoc.html5"/>
- <available file="${platform.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+ <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
</and>
</condition>
- <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+ <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
<classpath>
<path path="${javac.classpath}"/>
</classpath>
diff --git a/assignments/nbproject/genfiles.properties b/assignments/nbproject/genfiles.properties
index 95f310a30bf82b1e6ac46f6a4e27fc3ce263dd38..d6e96cdcc372e8baecf1e3ad20df8861d9609c3a 100644
--- a/assignments/nbproject/genfiles.properties
+++ b/assignments/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=54f6e79f
-nbproject/build-impl.xml.script.CRC32=fe984160
-nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.111.0.48
+nbproject/build-impl.xml.data.CRC32=721908c1
+nbproject/build-impl.xml.script.CRC32=e9be597b
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.112.0.48
diff --git a/assignments/nbproject/project.properties b/assignments/nbproject/project.properties
index 4f75ad917f48a7caea19e7d07c2e3e5d3cb7ed90..f82ff6b50f00d61b5852bdbf48a88d23a20932ef 100644
--- a/assignments/nbproject/project.properties
+++ b/assignments/nbproject/project.properties
@@ -32,7 +32,7 @@ debug.test.modulepath=\
# Files in build.classes.dir which should be excluded from distribution jar
# Avoid compilation or inclusion of student project depending on mutex libraries only available in JDK8
# https://stackoverflow.com/questions/27906896/exclude-package-from-build-but-not-from-view-in-netbeans-8
-excludes=**/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/** **/build/classes/ **/AnalystReports/ **/lib/
+excludes=**/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/** **/build/classes/ **/AnalystReports/ **/lib/ **/*.zip **/viskitProject.xml
dist.archive.excludes=**/MV3500Cohort2019JulySeptember/projects/BrennenstuhlKnobelochMcCann/**
# This directory is removed when the project is cleaned:
diff --git a/assignments/nbproject/project.xml b/assignments/nbproject/project.xml
index d7234beae9aa3ea90d012607e6919204e1a4942a..f4801f76a628f7b3244baa05194231108cd55b96 100644
--- a/assignments/nbproject/project.xml
+++ b/assignments/nbproject/project.xml
@@ -4,7 +4,6 @@
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>Networked Graphics MV3500 assignments</name>
- <explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/viskitProject.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/viskitProject.xml
index bdba2091829657700c9086a896483415f0923184..88e7be8e50f4d7ae5c47d0cd05c838acd3f4836b 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/viskitProject.xml
+++ b/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/viskitProject.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ViskitProject name="BavlsikViskitOpenDis7">
+<ViskitProject>
<AnalystReports name="AnalystReports" />
<AssembliesDirectory name="Assemblies" />
<EventGraphsDirectory name="EventGraphs" />
@@ -10,13 +10,13 @@
<DistDirectory name="dist" />
<LibDirectory name="lib" />
<Project name="BavlsikViskitOpenDis7" />
- <extraClassPaths>
- <path value="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/lib/Networked_Graphics_MV3500_examples.jar" />
- </extraClassPaths>
<Cached>
<EventGraphs xml="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/EventGraphs/dis7/ArrivalProcessOpenDis7.xml" />
<EventGraphs class="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/build/classes/dis7/ArrivalProcessOpenDis7.class" />
<EventGraphs digest="113303b4ce28074ab6ce2e9dc7064d99" />
</Cached>
+ <extraClassPaths>
+ <path value="C:/Users/tbavl/Documents/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Bavlsik/BavlsikViskitOpenDis7/lib/Networked_Graphics_MV3500_examples.jar" />
+ </extraClassPaths>
</ViskitProject>
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject.zip b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject.zip
similarity index 100%
rename from assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject.zip
rename to assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject.zip
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/Assemblies/examples/TestAssembly.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/Assemblies/examples/TestAssembly.xml
similarity index 99%
rename from assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/Assemblies/examples/TestAssembly.xml
rename to assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/Assemblies/examples/TestAssembly.xml
index 670bf5e342254d05e495b69bf1f3157b7649b7e6..eec6a2bf3c20eab9c23d03076efee7c1397b0b7c 100644
--- a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/Assemblies/examples/TestAssembly.xml
+++ b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/Assemblies/examples/TestAssembly.xml
@@ -38,5 +38,5 @@
<Adapter name="adptr" eventHeard="Arrival" eventSent="Arrival" from="arrivalProcess" to="twoTypeServer" description=""/>
<Output entity="arrivalProcess"/>
<Output entity="twoTypeServer"/>
- <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
+ <Schedule stopTime="100.0" verbose="false" saveReplicationData="true"/>
</SimkitAssembly>
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcess.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/ArrivalProcess.xml
similarity index 100%
rename from assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcess.xml
rename to assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/ArrivalProcess.xml
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml
similarity index 100%
rename from assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml
rename to assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/TwoTypeServer.xml
similarity index 100%
rename from assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml
rename to assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/FinalProject/EventGraphs/examples/TwoTypeServer.xml
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/AnalystReports/Viskit.ico b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/AnalystReports/Viskit.ico
deleted file mode 100644
index c9d5908c91e327600695feac75e406ee99fbb30a..0000000000000000000000000000000000000000
Binary files a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/AnalystReports/Viskit.ico and /dev/null differ
diff --git a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/viskitProject.xml b/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/viskitProject.xml
deleted file mode 100644
index 6c7a80c56592bbedd169a0c1b229cebeccf07539..0000000000000000000000000000000000000000
--- a/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/viskitProject.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViskitProject>
- <AnalystReports name="AnalystReports" />
- <AssembliesDirectory name="Assemblies" />
- <EventGraphsDirectory name="EventGraphs" />
- <BuildDirectory name="build">
- <ClassesDirectory name="classes" />
- <SourceDirectory name="src" />
- </BuildDirectory>
- <DistDirectory name="dist" />
- <LibDirectory name="lib" />
- <Project name="FinalProject" />
- <Cached>
- <EventGraphs class="/Users/terry/Downloads/FinalProject/build/classes/examples/TwoTypeServer.class" digest="-512d144abdf3a25c1fd0468cca19fbe6" xml="/Users/terry/Downloads/FinalProject/EventGraphs/examples/TwoTypeServer.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/TwoTypeServer.class" digest="5dde00358e407bfd4311883c8721b5e3" xml="C:/Users/advan/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/ArrivalProcess.class" digest="690320b04ecb012c8a9ca57e07351225" xml="C:/Users/advan/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/ArrivalProcess.class" digest="2c654b4016e3310aea37d46120d91c16" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/ArrivalProcess.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/EntityCreator.class" digest="7020026ff300a02fa0ca78b16afd0a77" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/EntityCreator.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/ServerGeneric.class" digest="256ca2b5c866392a6c42353961b30c1a" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/viskit/MyViskitProjects/DefaultProject/EventGraphs/examples/ServerGeneric.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/ArrivalProcess.class" digest="690320b04ecb012c8a9ca57e07351225" xml="C:/Users/advan/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcess.xml" />
- <EventGraphs class="C:/Users/advan/MyViskitProjects/FinalProject/build/classes/examples/TwoTypeServer.class" digest="5dde00358e407bfd4311883c8721b5e3" xml="C:/Users/advan/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml" />
- <EventGraphs class="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/build/classes/examples/ArrivalProcess.class" digest="690320b04ecb012c8a9ca57e07351225" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcess.xml" />
- <EventGraphs class="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/build/classes/examples/ArrivalProcess.class" digest="690320b04ecb012c8a9ca57e07351225" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/ArrivalProcessTwo.xml" />
- <EventGraphs class="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/build/classes/examples/TwoTypeServer.class" digest="5dde00358e407bfd4311883c8721b5e3" xml="C:/Users/advan/Netbeans/NetworkedGraphicsMV3500/assignments/src/MV3500Cohort2024JulySeptember/projects/Yu/MyViskitProjects/FinalProject/EventGraphs/examples/TwoTypeServer.xml" />
- </Cached>
-</ViskitProject>
-
diff --git a/build.xml b/build.xml
index 5f7b667a1114fcf7cd93f304ab629b76727a8a51..26d76c81f95446bb1dccd02aa31b26587073ab23 100644
--- a/build.xml
+++ b/build.xml
@@ -49,10 +49,6 @@ POSSIBILITY OF SUCH DAMAGE.
<property file="build.properties"/>
<target name="versions" description="show tool versions and environment values">
- <echo>ant -version</echo>
- <exec executable="ant" dir="." vmlauncher="false">
- <arg value="-version"/>
- </exec>
<echo>java -version</echo>
<exec executable="java" dir="." vmlauncher="false">
<arg value="-version"/>
@@ -327,7 +323,6 @@ POSSIBILITY OF SUCH DAMAGE.
<!-- ${c_app.xml} and ${c_gui.xml} are properties in the build.properties definitions -->
<copy todir="${dot.viskit.dir}" file="${c_app.xml}" verbose="true"/>
<copy todir="${dot.viskit.dir}" file="${c_gui.xml}" verbose="true"/>
- <copy todir="examples/src/ViskitOpenDis7Examples" file="${proj.xml}" overwrite="true"/>
<copy todir="viskit/MyViskitProjects/DefaultProject" file="${proj.xml}" overwrite="true"/>
<copy todir="${2024.cohort.assign.viskit.ex.proj.dir}" file="${proj.xml}" overwrite="true"/>
</target>
diff --git a/c_app.ViskitDefaultMV3500.xml b/c_app.ViskitDefaultMV3500.xml
index 787151ea9f26ecfa0731f2bb82e40a82aac71ac2..c08bf0f12f1eb43d947b0efbc1934e5dd1165813 100644
--- a/c_app.ViskitDefaultMV3500.xml
+++ b/c_app.ViskitDefaultMV3500.xml
@@ -22,7 +22,7 @@
<AssemblyRun visible="true" />
<DesignOfExperiments visible="false" />
<ClusterRun visible="false" />
- <AnalystReport visible="false" />
+ <AnalystReport visible="true" />
</tabs>
<debug>false</debug>
</app>
diff --git a/c_app.ViskitDefaultProject.xml b/c_app.ViskitDefaultProject.xml
index 1e8bb99daa8877be272678459d9703cd2976ab89..42872fd2eef226d890e763b951502f1ad7e49dcb 100644
--- a/c_app.ViskitDefaultProject.xml
+++ b/c_app.ViskitDefaultProject.xml
@@ -14,7 +14,7 @@
<!-- These two attributes MUST always be at least zero-length Strings -->
<!-- DefaultProject is included in this template for convenience -->
<!-- TODO keep an eye out for possible rename, e.g. DefaultViskitProject -->
- <path dir="./MyViskitProjects" />
+ <path dir="./MyViskitProjects" />
<name value="DefaultProject" />
</projecthome>
<tabs>
@@ -23,7 +23,7 @@
<AssemblyRun visible="true" />
<DesignOfExperiments visible="false" />
<ClusterRun visible="false" />
- <AnalystReport visible="false" />
+ <AnalystReport visible="true" />
</tabs>
<debug>false</debug>
</app>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
deleted file mode 100644
index 597e3466d1cbf16277106c2a88056fdaf381ce4b..0000000000000000000000000000000000000000
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/ArrivalProcessOpenDis7Assembly.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimkitAssembly name="ArrivalProcessOpenDis7Assembly" version="1.0" package="dis7" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SimEntity name="aPOpenDis7" type="dis7.ArrivalProcessOpenDis7" description="">
- <TerminalParameter name="address" value="" type="java.lang.String"/>
- <TerminalParameter name="port" value="-1" type="int"/>
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Exponential" type="String"/>
- <TerminalParameter name="" value="1.7" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="220.0" y="210.0"/>
- </SimEntity>
- <PropertyChangeListener name="numArrivalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="N" type="java.lang.String"/>
- <Coordinate x="220.0" y="330.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numEntityCreationsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="C" type="java.lang.String"/>
- <Coordinate x="220.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numEntityRemovalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="R" type="java.lang.String"/>
- <Coordinate x="380.0" y="210.0"/>
- </PropertyChangeListener>
- <PropertyChangeListenerConnection property="N" listener="numArrivalsStat" source="aPOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="C" listener="numEntityCreationsStat" source="aPOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="R" listener="numEntityRemovalsStat" source="aPOpenDis7" description=""/>
- <Output entity="aPOpenDis7"/>
- <Schedule stopTime="100.0" verbose="false" saveReplicationData="false"/>
-</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml b/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
deleted file mode 100644
index 5aac321ee51ee75c2eb1c78ec7618b2f475737d6..0000000000000000000000000000000000000000
--- a/examples/src/ViskitOpenDis7Examples/Assemblies/dis7/SimpleServerDis7Assembly.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimkitAssembly name="SimpleServerDis7Assembly" version="1.0" package="dis7" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/assembly.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <SimEntity name="arrivalProcessOpenDis7" type="SimkitOpenDis7Examples.ArrivalProcessOpenDis7" description="">
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Uniform" type="String"/>
- <TerminalParameter name="" value="0.9, 2.2" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="90.0" y="200.0"/>
- </SimEntity>
- <SimEntity name="simpleServer" type="SimkitOpenDis7Examples.SimpleServer" description="">
- <TerminalParameter name="p[0] : " value="1" type="int"/>
- <FactoryParameter factory="simkit.random.RandomVariateFactory" type="simkit.random.RandomVariate">
- <TerminalParameter name="" value="Gamma" type="String"/>
- <TerminalParameter name="" value="1.7, 1.8" type="Object..."/>
- </FactoryParameter>
- <Coordinate x="310.0" y="200.0"/>
- </SimEntity>
- <PropertyChangeListener name="numInQueueStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="true" countStatistics="false" description="">
- <TerminalParameter name="p[0] : " value="numberInQueue" type="java.lang.String"/>
- <Coordinate x="310.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numAvailServersStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="true" countStatistics="false" description="">
- <TerminalParameter name="p[0] : " value="numberAvailableServers" type="java.lang.String"/>
- <Coordinate x="510.0" y="200.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numArrivalsStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="numberArrivals" type="java.lang.String"/>
- <Coordinate x="90.0" y="80.0"/>
- </PropertyChangeListener>
- <PropertyChangeListener name="numServedStat" type="simkit.stat.SimpleStatsTimeVarying" mode="replicationStat" meanStatistics="false" countStatistics="true" description="">
- <TerminalParameter name="p[0] : " value="numberServed" type="java.lang.String"/>
- <Coordinate x="310.0" y="350.0"/>
- </PropertyChangeListener>
- <SimEventListenerConnection listener="simpleServer" source="arrivalProcessOpenDis7"/>
- <PropertyChangeListenerConnection property="numberInQueue" listener="numInQueueStat" source="simpleServer" description=""/>
- <PropertyChangeListenerConnection property="numberAvailableServers" listener="numAvailServersStat" source="simpleServer" description=""/>
- <PropertyChangeListenerConnection property="numberArrivals" listener="numArrivalsStat" source="arrivalProcessOpenDis7" description=""/>
- <PropertyChangeListenerConnection property="numberServed" listener="numServedStat" source="simpleServer" description=""/>
- <Output entity="arrivalProcessOpenDis7"/>
- <Output entity="simpleServer"/>
- <Schedule stopTime="100000.0" verbose="false" saveReplicationData="false"/>
-</SimkitAssembly>
diff --git a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml b/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
deleted file mode 100644
index f1dd2c6371c7520450a510b6427c2eeb0fb4754d..0000000000000000000000000000000000000000
--- a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/ArrivalProcessOpenDis7.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="ArrivalProcessOpenDis7" package="dis7" version="1.0" author="terry" extend="SimkitOpenDis7Examples.run.OpenDisHelper" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Parameter name="address" type="java.lang.String">
- <Comment>An other than default network address</Comment>
- </Parameter>
- <Parameter name="port" type="int">
- <Comment>An other than default network port</Comment>
- </Parameter>
- <Parameter name="tA" type="simkit.random.RandomVariate">
- <Comment>Inter arrival time</Comment>
- </Parameter>
- <StateVariable name="N" type="int">
- <Comment>Number of arrivals</Comment>
- </StateVariable>
- <StateVariable name="C" type="int">
- <Comment>Number of entity creations</Comment>
- </StateVariable>
- <StateVariable name="R" type="int">
- <Comment>Number of entity removals</Comment>
- </StateVariable>
- <Event name="Run" description="This event is fired first to facilitate initialization of all simulation state variables">
- <Comment>Initialize all state variables</Comment>
- <StateTransition state="N">
- <Assignment value="0"/>
- </StateTransition>
- <StateTransition state="C">
- <Assignment value="1"/>
- </StateTransition>
- <StateTransition state="R">
- <Assignment value="0"/>
- </StateTransition>
- <Schedule delay="tA.generate()" event="Arrival" priority="DEFAULT"/>
- <Code></Code>
- <Coordinate x="50.0" y="70.0"/>
- </Event>
- <Event name="Arrival">
- <Comment>Tallys the number of arrivals and schedules future arrival events with time tA</Comment>
- <StateTransition state="N">
- <Assignment value="N + 1"/>
- </StateTransition>
- <Schedule delay="tA.generate()" event="Arrival" priority="DEFAULT"/>
- <Code>int everyTen = 10;
-int oldC = C;
-int oldR = R;
-
-if ((N % everyTen) == 0) {
- disChannel.removeEntity(entityStatePdu_1.getEntityID());
- firePropertyChange("R", oldR, R+1);
-} else {
- disChannel.addEntity(entityStatePdu_1.getEntityID());
- firePropertyChange("C", oldC, C+1);
-}</Code>
- <Coordinate x="260.0" y="70.0"/>
- </Event>
- <Code></Code>
-</SimEntity>
diff --git a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml b/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml
deleted file mode 100644
index 3af224191577a983e0365b2123b938732da52e8e..0000000000000000000000000000000000000000
--- a/examples/src/ViskitOpenDis7Examples/EventGraphs/dis7/SimpleServer.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<SimEntity name="SimpleServer" package="dis7" version="0.1" extend="SimEntityBase" xsi:noNamespaceSchemaLocation="http://diana.nps.edu/Simkit/simkit.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <Parameter name="serviceTime" type="simkit.random.RandomVariate"/>
- <Parameter name="totalNumberServers" type="int"/>
- <StateVariable name="numberInQueue" type="int"/>
- <StateVariable name="numberAvailableServers" type="int"/>
- <Event name="Run">
- <StateTransition state="numberInQueue">
- <Assignment value="0"/>
- </StateTransition>
- <StateTransition state="numberAvailableServers">
- <Assignment value="totalNumberServers"/>
- </StateTransition>
- <Coordinate x="20.0" y="30.0"/>
- </Event>
- <Event name="Arrival">
- <StateTransition state="numberInQueue">
- <Assignment value="numberInQueue + 1"/>
- </StateTransition>
- <Schedule delay="0.0" event="StartService" condition="numberAvailableServers > 0" priority="DEFAULT">
- <Comment></Comment>
- <EdgeParameter value="numberAvailableServers"/>
- </Schedule>
- <Coordinate x="20.0" y="130.0"/>
- </Event>
- <Event name="StartService">
- <Comment></Comment>
- <Argument name="arg_0" type="int"/>
- <StateTransition state="numberInQueue">
- <Assignment value="numberInQueue - 1"/>
- </StateTransition>
- <StateTransition state="numberAvailableServers">
- <Assignment value="numberAvailableServers - 1"/>
- </StateTransition>
- <Schedule delay="serviceTime.generate()" event="EndService" priority="DEFAULT"/>
- <Code>System.out.println("numberAvailableServers"+arg_0);</Code>
- <Coordinate x="160.0" y="130.0"/>
- </Event>
- <Event name="EndService">
- <StateTransition state="numberAvailableServers">
- <Assignment value="numberAvailableServers + 1"/>
- </StateTransition>
- <Schedule delay="0.0" event="StartService" condition="numberInQueue > 0" priority="HIGH"/>
- <Coordinate x="330.0" y="130.0"/>
- </Event>
-</SimEntity>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 98262e5cdb723cbe528386f028872bbc3475439d..05f44c3a2a1f83a24011fb12333c6676fdd424b1 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,65 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <name>Networked Graphics MV3500</name>
- </general-data>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>org.netbeans.modules.ant.freeform</type>
+ <configuration>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+ <name>Networked Graphics MV3500</name>
+ </general-data>
+ <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
<!-- Do not use Project Properties customizer when editing this file manually.
To prevent the customizer from showing, create nbproject/project.properties file and enter
auxiliary.show.customizer=false
property there. Adding
auxiliary.show.customizer.message=<message>
- will show your customized message when someone attempts to open the customizer. -->
- <name>Networked Graphics MV3500</name>
- <properties/>
- <folders>
- <source-folder>
- <label>Networked Graphics MV3500</label>
- <location>.</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- </folders>
- <ide-actions/>
- <view>
- <items>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu/>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/>
- <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
- <word>archivally</word>
- <word>autogenerated</word>
- <word>brutzman</word>
- <word>codebase</word>
- <word>codebases</word>
- <word>DIS</word>
- <word>gitlab</word>
- <word>html</word>
- <word>https</word>
- <word>IITSEC</word>
- <word>integrators</word>
- <word>interoperability</word>
- <word>interoperable</word>
- <word>Javadoc</word>
- <word>LVC</word>
- <word>McGregor</word>
- <word>multicast</word>
- <word>NPS</word>
- <word>opendis</word>
- <word>PDUs</word>
- <word>Redistributions</word>
- <word>TENA</word>
- <word>UML</word>
- <word>wargaming</word>
- <word>WebRTC</word>
- <word>Wikipedia</word>
- </spellchecker-wordlist>
- </configuration>
-</project>
+ will show your customized message when someone attempts to open the customizer. -->
+ <name>Networked Graphics MV3500</name>
+ <properties/>
+ <folders>
+ <source-folder>
+ <label>Networked Graphics MV3500</label>
+ <location>.</location>
+ <encoding>UTF-8</encoding>
+ </source-folder>
+ </folders>
+ <ide-actions>
+ <action name="run">
+ <target>run.viskit</target>
+ </action>
+ <action name="clean">
+ <target>reset.viskit</target>
+ </action>
+ <action name="build">
+ <target>versions</target>
+ </action>
+ <action name="rebuild">
+ <target>reset.viskit</target>
+ <target>versions</target>
+ </action>
+ </ide-actions>
+ <view>
+ <items>
+ <source-file>
+ <location>build.xml</location>
+ </source-file>
+ </items>
+ <context-menu>
+ <ide-action name="build"/>
+ <ide-action name="rebuild"/>
+ <ide-action name="clean"/>
+ <ide-action name="run"/>
+ </context-menu>
+ </view>
+ <subprojects/>
+ </general-data>
+ <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/>
+ <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1">
+ <word>archivally</word>
+ <word>autogenerated</word>
+ <word>brutzman</word>
+ <word>codebase</word>
+ <word>codebases</word>
+ <word>DIS</word>
+ <word>gitlab</word>
+ <word>html</word>
+ <word>https</word>
+ <word>IITSEC</word>
+ <word>integrators</word>
+ <word>interoperability</word>
+ <word>interoperable</word>
+ <word>Javadoc</word>
+ <word>LVC</word>
+ <word>McGregor</word>
+ <word>multicast</word>
+ <word>NPS</word>
+ <word>opendis</word>
+ <word>PDUs</word>
+ <word>Redistributions</word>
+ <word>TENA</word>
+ <word>UML</word>
+ <word>wargaming</word>
+ <word>WebRTC</word>
+ <word>Wikipedia</word>
+ </spellchecker-wordlist>
+ </configuration>
+</project>
diff --git a/viskit/configuration/c_app.xml b/viskit/configuration/c_app.xml
index d8ae3b0790ce36407c668afd11771c8e07fe0505..61519327bf95d9746d734bf922ccdb72351c0498 100644
--- a/viskit/configuration/c_app.xml
+++ b/viskit/configuration/c_app.xml
@@ -24,7 +24,7 @@
<AssemblyRun visible="true"/>
<DesignOfExperiments visible="false"/>
<ClusterRun visible="false"/>
- <AnalystReport visible="false"/>
+ <AnalystReport visible="true"/>
</tabs>
<debug>false</debug>
</app>
diff --git a/viskit/lib/viskit.jar b/viskit/lib/viskit.jar
index e35f67b8ba6ad4a216b2efa324316d25edba6ea7..ee09dfb994312950dc330d51ea8e1d03ba44d486 100644
Binary files a/viskit/lib/viskit.jar and b/viskit/lib/viskit.jar differ