diff --git a/autoconf/configure.ac b/autoconf/configure.ac old mode 100755 new mode 100644 index e682a675..7285ab7a --- a/autoconf/configure.ac +++ b/autoconf/configure.ac @@ -167,6 +167,8 @@ AC_DEFUN([AX_JAVA],[ [AC_MSG_RESULT([no]) AC_MSG_ERROR([Trick requires javac version >= 1.8]) ]) + AC_PATH_PROG(MVN, mvn, mvn) + AS_IF([test "$ac_cv_path_MVN" = "nomvn"],AC_MSG_ERROR([could not find mvn]),[]) ],[]) ]) diff --git a/bin/trick-dp b/bin/trick-dp index 7bd845cd..9796f8a5 100755 --- a/bin/trick-dp +++ b/bin/trick-dp @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Trick DP", "trick.dataproducts.trickdp.TrickDPApplication") ; +launch_java("Trick DP", "DP") ; diff --git a/bin/trick-dre b/bin/trick-dre index dd17654f..4f559134 100755 --- a/bin/trick-dre +++ b/bin/trick-dre @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Data Recording Editor", "trick.dre.DreApplication") ; +launch_java("Data Recording Editor", "Dre") ; diff --git a/bin/trick-jxplot b/bin/trick-jxplot index 9f1bcec1..a566827b 100755 --- a/bin/trick-jxplot +++ b/bin/trick-jxplot @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Trick Plot", "trick.dataproducts.plot.JXPlotApplication") ; +launch_java("Trick Plot", "JXPlot") ; diff --git a/bin/trick-mm b/bin/trick-mm index d661b243..ef51518f 100755 --- a/bin/trick-mm +++ b/bin/trick-mm @@ -4,6 +4,6 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Monte Monitor", "trick.montemonitor.MonteMonitorApplication") ; +launch_java("Monte Monitor", "MM") ; diff --git a/bin/trick-mtv b/bin/trick-mtv index 5b619313..23f89dcb 100755 --- a/bin/trick-mtv +++ b/bin/trick-mtv @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Event/Malvunction Trick View", "trick.mtv.MtvApp") ; +launch_java("Event/Malvunction Trick View", "MTV") ; diff --git a/bin/trick-qp b/bin/trick-qp index 67d711ec..9a41de20 100755 --- a/bin/trick-qp +++ b/bin/trick-qp @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Trick QP", "trick.dataproducts.trickqp.TrickQPApplication") ; +launch_java("Trick QP", "QP") ; diff --git a/bin/trick-sie b/bin/trick-sie index f9adedd2..30d6571e 100755 --- a/bin/trick-sie +++ b/bin/trick-sie @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("SIE", "trick.sie.SieApplication") ; +launch_java("SIE", "Sie") ; diff --git a/bin/trick-simcontrol b/bin/trick-simcontrol index c2f9391e..c7e18764 100755 --- a/bin/trick-simcontrol +++ b/bin/trick-simcontrol @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Sim Control", "trick.simcontrol.SimControlApplication") ; +launch_java("Sim Control", "SimControl") ; diff --git a/bin/trick-sniffer b/bin/trick-sniffer index 7ff2e690..e7a56fcc 100755 --- a/bin/trick-sniffer +++ b/bin/trick-sniffer @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Sim Sniffer", "trick.sniffer.SimSnifferApplication") ; +launch_java("Sim Sniffer", "SimSniffer") ; diff --git a/bin/trick-tv b/bin/trick-tv index e3f60179..819059bb 100755 --- a/bin/trick-tv +++ b/bin/trick-tv @@ -4,5 +4,5 @@ use FindBin qw($RealBin); use lib ("$RealBin/../libexec/trick/pm", "$RealBin/../lib/trick/pm") ; use launch_java ; -launch_java("Trick View", "trick.tv.TVApplication") ; +launch_java("Trick View", "TrickView") ; diff --git a/configure b/configure index e3825806..185c1a5b 100755 --- a/configure +++ b/configure @@ -640,6 +640,7 @@ PTHREAD_LIBS PTHREAD_CC ax_pthread_config CPP +MVN JAVA_CC_OPTS GCJ_OPTS ac_ct_JAVA_CC @@ -650,8 +651,8 @@ SWIG_LIB SWIG SWIG_BIN GNUPLOT -PYTHON_EXTRA_LIBS PYTHON_EXTRA_LDFLAGS +PYTHON_EXTRA_LIBS PYTHON_SITE_PKG PYTHON_LIBS PYTHON_CPPFLAGS @@ -717,6 +718,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -809,6 +811,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1061,6 +1064,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1198,7 +1210,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1351,6 +1363,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -5612,13 +5625,13 @@ $as_echo "$PYTHON_SITE_PKG" >&6; } # { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra libraries" >&5 $as_echo_n "checking python extra libraries... " >&6; } - if test -z "$PYTHON_EXTRA_LDFLAGS"; then - PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ + if test -z "$PYTHON_EXTRA_LIBS"; then + PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ print (conf('LIBS') + ' ' + conf('SYSLIBS'))"` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 -$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 +$as_echo "$PYTHON_EXTRA_LIBS" >&6; } # @@ -5626,13 +5639,13 @@ $as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } # { $as_echo "$as_me:${as_lineno-$LINENO}: checking python extra linking flags" >&5 $as_echo_n "checking python extra linking flags... " >&6; } - if test -z "$PYTHON_EXTRA_LIBS"; then - PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ + if test -z "$PYTHON_EXTRA_LDFLAGS"; then + PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \ conf = distutils.sysconfig.get_config_var; \ print (conf('LINKFORSHARED'))"` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LIBS" >&5 -$as_echo "$PYTHON_EXTRA_LIBS" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON_EXTRA_LDFLAGS" >&5 +$as_echo "$PYTHON_EXTRA_LDFLAGS" >&6; } # @@ -6097,6 +6110,50 @@ $as_echo "no" >&6; } fi + # Extract the first word of "mvn", so it can be a program name with args. +set dummy mvn; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_MVN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MVN in + [\\/]* | ?:[\\/]*) + ac_cv_path_MVN="$MVN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_MVN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_MVN" && ac_cv_path_MVN="mvn" + ;; +esac +fi +MVN=$ac_cv_path_MVN +if test -n "$MVN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MVN" >&5 +$as_echo "$MVN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "$ac_cv_path_MVN" = "nomvn"; then : + as_fn_error $? "could not find mvn" "$LINENO" 5 +fi fi diff --git a/libexec/trick/pm/launch_java.pm b/libexec/trick/pm/launch_java.pm index 861c27b8..2812637b 100644 --- a/libexec/trick/pm/launch_java.pm +++ b/libexec/trick/pm/launch_java.pm @@ -31,22 +31,22 @@ sub launch_java($$) { chomp($host_cpu) ; $ENV{TRICK_HOST_CPU} = $host_cpu ; + $command = "java -jar "; + if ( $^O eq "darwin" ) { - $command = "java -classpath $java_dir/dist/*:$java_dir/lib/*:$java_dir/lib/ \\ + $command .= "\\ -Xdock:name=\"$name\" \\ -Xdock:icon=$java_dir/resources/trick_icon.png \\ -Djava.net.preferIPv4Stack=true \\" ; - } else { - $command = "java -cp $java_dir/dist/*:$java_dir/lib/*:$java_dir/lib/ \\" ; } - $command .= " - $application" ; + $command .= "$java_dir/build/$application.jar "; foreach (@ARGV) { - $command .= " $_" ; + $command .= "$_ "; } + print($command); system $command ; exit $? >> 8 ; } diff --git a/trick_source/java/.gitignore b/trick_source/java/.gitignore deleted file mode 100644 index 9ef96044..00000000 --- a/trick_source/java/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build - diff --git a/trick_source/java/Makefile b/trick_source/java/Makefile new file mode 100644 index 00000000..2b13ea9b --- /dev/null +++ b/trick_source/java/Makefile @@ -0,0 +1,13 @@ +TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..) + +all: ${TRICK_HOME}/libexec/trick/java/build + @echo "Java build successful" + +${TRICK_HOME}/libexec/trick/java/build: + mvn package + +javadoc: + mvn javadoc:javadoc + +clean: + mvn clean \ No newline at end of file diff --git a/trick_source/java/build_trick b/trick_source/java/build_trick deleted file mode 100755 index a9db2161..00000000 --- a/trick_source/java/build_trick +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh -#================================================================= -# -# Name: build_trick -# -# Synopsis: build_trick [option] -# no option: creates build directory and compiles src/java -# to build directory -# creates distribution directory and builds trick.jar -# clean: deletes the build and dist directory trees -# javadoc: builds Trick java api documentation at docs/api -# doccheck: runs Sun's doccheck tool and generates reports -# at docs/api/doccheck -# clean_docs: deletes all files and folders in docs/api -# -# Examples: build_trick -# build_trick clean -# build_trick javadoc -# -#================================================================= - -# Get the relative path to where this file is located -BUILD_TRICK_DIR=`dirname $0` - -getabsPath() { - ABSPATH="" - if [ "`echo $@`" != "" ] ; then - cwd=`pwd` - TARGET=`ls -l $@ 2>/dev/null | sed -e 's/.*->\\s*//' ` - cd `dirname $TARGET 2>/dev/null` - ABSPATH="`pwd -P`/`basename $TARGET 2>/dev/null`" - cd $cwd - fi - echo "$ABSPATH" #return value -} - -printJavaHomeError() { - echo "JAVA_HOME environment variable is not set correctly" - echo "JAVA_HOME must be set to a valid jdk directory (not jre)" - JAVAC=`readlink -f \`which javac 2>/dev/null\` 2>/dev/null ` - # when "readlink -f" command doesn't work, try to find javac manually - if [ "$JAVAC" = "" ] ; then - JAVAC=`getabsPath \`which javac 2>/dev/null\` ` - fi - # the jdk directory should be 2 levels up from the javac path - JDK_DIR=`dirname \`dirname $JAVAC 2>/dev/null\` 2>/dev/null ` - if [ "$JDK_DIR" != "" ] && [ "$JDK_DIR" != "$JAVA_HOME" ] ; then - echo "try setting JAVA_HOME to: \"$JDK_DIR\"" - fi - exit -1 -} - -setJavaCmd(){ - JAVACMD="${JAVA_HOME}/bin/java" - if [ `uname -s` = "Darwin" ] && [ ! -e "${JAVA_HOME}/bin/java" ] ; then - JAVACMD="${JAVA_HOME}/Commands/java" - fi - echo `java -version` -} - -# Test if JAVA_HOME is good. -if [ "$JAVA_HOME" = "" ] || - ( [ ! -e "${JAVA_HOME}/bin/java" ] && - [ ! -e "${JAVA_HOME}/Commands/java" ] ) ; then - printJavaHomeError -else - setJavaCmd -fi - -# Test if we are using a 64-bit java executable on a 32-bit computer -WRONG_ARCHITECTURE=`echo \`$JAVACMD? -version 2>&1\` | grep \ - -e 'cannot execute' \ - -e 'format error' \ - -e 'Wrong Architecture' ` -if [ ${#WRONG_ARCHITECTURE} -ne 0 ] ; then - echo "Error: Cannot run 64 bit java in 32 bit mode." - printJavaHomeError -fi - - -# Run "Ant" via the java command to build Java applications. -# When run, Ant looks for a build.xml file in the current directory and -# uses that file as the build file. If no target (i.e. $1) is specified -# by the user, Ant runs the target specified in the 'default' attribute -# of the tag. To find out what targets are available for use, -# search for "&1` # Also redirect std error msgs to standard output - - # Viewing "BUILD SUCCESSFUL" while running compile_trick may be confusing. - # Replace/remove "BUILD SUCCESSFUL" / "BUILD FAILED" / "Total time" from stdout. - OUTPUT=`echo "$STDOUT" \ - | sed -e 's/BUILD FAILED/Java build failed/g' \ - | sed -e 's/BUILD SUCCESSFUL/Java build successful/g' \ - | sed -e 's/ warning/ warning/g' \ - | sed -e 's/Total time/Java build total time/g' ` - # Send new output to the screen. - echo "${OUTPUT}" # use quotes to preserve embedded newlines characters - - # Test for errors... - ERRORS=`echo $OUTPUT | grep "error"` - if [ ${#ERRORS} = 0 ] ; then - echo "=== Trick GUI compilation complete ===" - date - fi -elif [ "$1" = "-help" ] || [ "$1" = "-h" ] || \ - [ "$1" = "help" ] || [ "$1" = "--help" ] ; then - # Note "-help" and "-h" are reserved for Ant - if [ "$1" = "-help" ] || [ "$1" = "-h" ] ; then - # Prepend ant Options before listing build_trick options - $ANTCALL $1 - echo - fi - echo - echo "build_trick [option]" - echo "Options:" - echo -e " (no option)\t\t Builds the default target given in \"build.xml\"" - # Display every target name (+description) listed in the build file. - grep "//g' - echo -e " help, --help\t\t print this message" -else - echo - if [ "$1" = "clean" ] ; then - echo 'Cleaning Trick GUIs...' - fi - $ANTCALL $1 -fi diff --git a/trick_source/java/makefile b/trick_source/java/makefile deleted file mode 100644 index d54e0975..00000000 --- a/trick_source/java/makefile +++ /dev/null @@ -1,69 +0,0 @@ -TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../..) - -# Get JAVAC definition -include ${TRICK_HOME}/share/trick/makefiles/Makefile.common - -JAVAC ?= javac -JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation -# delineate 'javac -version' for version number -JAVAC_VERSION := $(shell ${JAVAC} -version 2>&1 | perl -ne 'print /(\d+)/') - -SRC_DIR = src -SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java) -BUILD_DIR = build -DEST_DIR = ${BUILD_DIR}/classes -LIB_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/lib -DIST_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/dist -RESOURCES_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/resources -DOCS_API_DIR = ${TRICK_HOME}/share/doc/trick/java -TEST_REPORTS_DIR = test/reports - -empty := -space := $(empty) $(empty) -CLASS_PATH = $(subst $(space),:,$(wildcard ${LIB_DIR}/*.jar)) - -RESOURCES = $(subst src/,,$(shell find src/trick -name resources)) -RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index)) - -all: ${DIST_DIR}/trick.jar resources - @echo "Java build successful" - -${DEST_DIR} ${DIST_DIR} ${RESOURCES_DIR} ${DOCS_API_DIR}: - mkdir -p $@ - -${DIST_DIR}/trick.jar: compile ${DIST_DIR} - @echo "Creating jar file..." - @jar cf ${DIST_DIR}/trick.jar -C ${DEST_DIR} . - @cd ${SRC_DIR} && jar uf ${DIST_DIR}/trick.jar ${RESOURCES} - -external_jars: - @ $(MAKE) -C $(LIB_DIR) - -compile: ${DEST_DIR} external_jars - @echo "Building Trick GUIs..." - @${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES} - -resources: ${RESOURCES_DIR}/trick_icon.png - -${RESOURCES_DIR}/trick_icon.png: ${SRC_DIR}/trick/common/resources/trick_icon.png ${RESOURCES_DIR} - @cp $< $@ - -JAVA_DOC_LINKS = \ - -link "http://docs.oracle.com/javase/6/docs/api/" \ - -link "http://www.jfree.org/jfreechart/api/javadoc/" \ - -link "http://junit.sourceforge.net/javadoc/" - -javadoc: ${DOCS_API_DIR} - javadoc -d ${DOCS_API_DIR} -classpath ${CLASS_PATH} -sourcepath ${SRC_DIR} -windowtitle "Trick GUI API" ${JAVA_DOC_LINKS} trick ${SRC_FILES} - -clean: - rm -rf ${BUILD_DIR} - rm -rf ${DIST_DIR} - rm -rf ${RESOURCES_DIR} - rm -rf ${TEST_REPORTS_DIR} - -clean_obj: - rm -rf ${BUILD_DIR} - -clean_docs: - rm -rf ${DOCS_API_DIR} diff --git a/trick_source/java/pom.xml b/trick_source/java/pom.xml new file mode 100644 index 00000000..a2d74464 --- /dev/null +++ b/trick_source/java/pom.xml @@ -0,0 +1,321 @@ + + + + 4.0.0 + + trick-java + trick-java + 1.0 + + trick-java + + http://www.example.com + + + UTF-8 + 1.8 + 1.8 + + + + + junit + junit + 4.12 + test + + + org.jdesktop.bsaf + bsaf + 1.9.2 + + + javax.jnlp + jnlp + + + + + org.jfree + jfreechart + 1.0.19 + + + org.jfree + jfreesvg + 2.1 + + + net.sf.jopt-simple + jopt-simple + 4.8 + + + org.swinglabs + swingx + 1.6.1 + + + org.hamcrest + hamcrest-core + 1.3 + test + + + org.apache.pdfbox + pdfbox + 2.0.11 + + + org.glassfish.jaxb + jaxb-jxc + 2.4.0-b180830.0438 + + + org.glassfish.jaxb + jaxb-core + 2.3.0.1 + + + + + ../../libexec/trick/java/build + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.1.1 + + ${java.home}/bin/javadoc + ../../share/doc/trick/java + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + + tv + package + + shade + + + + + trick.tv.TVApplication + + + TrickView + + + + + simcontrol + package + + shade + + + + + trick.simcontrol.SimControlApplication + + + SimControl + + + + + sniffer + package + + shade + + + + + trick.sniffer.SimSnifferApplication + + + SimSniffer + + + + + mtv + package + + shade + + + + + trick.mtv.MtvApp + + + MTV + + + + + trickqp + package + + shade + + + + + trick.dataproducts.trickqp.TrickQPApplication + + + QP + + + + + trickdp + package + + shade + + + + + trick.dataproducts.trickdp.TrickDPApplication + + + DP + + + + + dre + package + + shade + + + + + trick.dre.DreApplication + + + Dre + + + + + Sie + package + + shade + + + + + trick.sie.SieApplication + + + Sie + + + + + plot + package + + shade + + + + + trick.dataproducts.plot.JXPlotApplication + + + JXPlot + + + + + montemonitor + package + + shade + + + + + trick.montemonitor.MonteMonitorApplication + + + MM + + + + + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + -g + -Xlint:unchecked + -Xlint:deprecation + + + + + maven-surefire-plugin + 2.22.1 + + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + + + + diff --git a/trick_source/java/src/CMakeLists.txt b/trick_source/java/src/CMakeLists.txt deleted file mode 100644 index 461e8337..00000000 --- a/trick_source/java/src/CMakeLists.txt +++ /dev/null @@ -1,408 +0,0 @@ - -############################################################### -# External Java libraries -############################################################### - -set( JAVA_LIBS - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/bsaf-1.9.2.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jcommon-1.0.23.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreechart-1.0.19.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreesvg-2.1.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jopt-simple-4.8.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/junit-4.12.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/swingx-1.6.1.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/hamcrest-core-1.3.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/pdfbox-2.0.11.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/fontbox-2.0.11.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/commons-logging-1.2.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-runtime-2.4.0-b180830.0438.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-xjc-2.4.0-b180830.0438.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-jxc-2.4.0-b180830.0438.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-impl-2.4.0-b180830.0438.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-api-2.4.0-b180725.0427.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-core-2.3.0.1.jar - ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/javax.activation-1.2.0.jar -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/bsaf-1.9.2.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jdesktop/bsaf/bsaf/1.9.2/bsaf-1.9.2.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jcommon-1.0.23.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jcommon/1.0.23/jcommon-1.0.23.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreechart-1.0.19.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jfreechart/1.0.19/jfreechart-1.0.19.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jfreesvg-2.1.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/jfree/jfreesvg/2.1/jfreesvg-2.1.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jopt-simple-4.8.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/4.8/jopt-simple-4.8.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/junit-4.12.jar - COMMAND curl --retry 4 -O -s -S https://repo1.maven.org/maven2/junit/junit/4.12/junit-4.12.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/swingx-1.6.1.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/swinglabs/swingx/1.6.1/swingx-1.6.1.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/hamcrest-core-1.3.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/pdfbox-2.0.11.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/apache/pdfbox/pdfbox/2.0.11/pdfbox-2.0.11.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/fontbox-2.0.11.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/apache/pdfbox/fontbox/2.0.11/fontbox-2.0.11.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/commons-logging-1.2.jar - COMMAND curl --retry 4 -O -s -S https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-runtime-2.4.0-b180830.0438.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-runtime/2.4.0-b180830.0438/jaxb-runtime-2.4.0-b180830.0438.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-xjc-2.4.0-b180830.0438.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-xjc/2.4.0-b180830.0438/jaxb-xjc-2.4.0-b180830.0438.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-jxc-2.4.0-b180830.0438.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-jxc/2.4.0-b180830.0438/jaxb-jxc-2.4.0-b180830.0438.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-impl-2.4.0-b180830.0438.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-impl/2.4.0-b180830.0438/jaxb-impl-2.4.0-b180830.0438.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-api-2.4.0-b180725.0427.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/jaxb-core-2.3.0.1.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180725.0427/jaxb-api-2.4.0-b180725.0427.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/trick/java/lib/javax.activation-1.2.0.jar - COMMAND curl --retry 4 -O -s -S https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/libexec/trick/java/lib -) - -############################################################### -# Trick Java libraries -############################################################### - -set( JAVA_SRC - trick/common/ui/components/CommonTreeNode.java - trick/common/ui/components/DoubleJSlider.java - trick/common/ui/components/NumberTextField.java - trick/common/ui/components/FontChooser.java - trick/common/ui/panels/AnimationPlayer.java - trick/common/ui/panels/ConnectionStatusBar.java - trick/common/ui/panels/DataPanel.java - trick/common/ui/panels/DynamicTree.java - trick/common/ui/panels/FindBar.java - trick/common/ui/panels/ListPanel.java - trick/common/ui/panels/SmallTrickIconLabel.java - trick/common/ui/TrickFileFilter.java - trick/common/ui/UIUtils.java - trick/common/utils/vs/VSBoolean.java - trick/common/utils/vs/VSByte.java - trick/common/utils/vs/VSDouble.java - trick/common/utils/vs/VSFloat.java - trick/common/utils/vs/VSInteger.java - trick/common/utils/vs/VSLong.java - trick/common/utils/vs/VSShort.java - trick/common/utils/vs/VSString.java - trick/common/utils/vs/VSValue.java - trick/common/utils/vs/Variable.java - trick/common/utils/vs/VariableListener.java - trick/common/utils/vs/VariableServerFluent.java - trick/common/utils/vs/VariableTracker.java - trick/common/utils/BinaryDataReader.java - trick/common/utils/CSVDataReader.java - trick/common/utils/ErrorChecker.java - trick/common/utils/LogHeaderReader.java - trick/common/utils/LogVar.java - trick/common/utils/SortedListModel.java - trick/common/utils/TrickColors.java - trick/common/utils/UnitInfixExpression.java - trick/common/utils/UnitType.java - trick/common/utils/VariableServerConnection.java - trick/common/utils/XMLCreator.java - trick/common/utils/DataReader.java - trick/common/RunTimeTrickApplication.java - trick/common/TrickApplication.java - trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java - trick/dataproducts/plot/utils/editor/TrickAxisEditor.java - trick/dataproducts/plot/utils/editor/TrickChartEditor.java - trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java - trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java - trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java - trick/dataproducts/plot/utils/editor/TrickPlotEditor.java - trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java - trick/dataproducts/plot/utils/editor/TrickTitleEditor.java - trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java - trick/dataproducts/plot/utils/PlotUtils.java - trick/dataproducts/plot/utils/TrickChart.java - trick/dataproducts/plot/utils/TrickChartControlPanel.java - trick/dataproducts/plot/utils/TrickChartPanel.java - trick/dataproducts/plot/utils/TrickChartTheme.java - trick/dataproducts/plot/utils/TrickFrame.java - trick/dataproducts/plot/utils/TrickTableFrame.java - trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java - trick/dataproducts/plot/utils/TrickXYSeries.java - trick/dataproducts/plot/utils/TrickChartFrame.java - trick/dataproducts/plot/utils/TrickXYPlot.java - trick/dataproducts/plot/JXPlotApplication.java - trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java - trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java - trick/dataproducts/trickdp/utils/PDFBooklet.java - trick/dataproducts/trickdp/utils/TrickDPActionController.java - trick/dataproducts/trickdp/TrickDPApplication.java - trick/dataproducts/trickqp/utils/DataTransferHandler.java - trick/dataproducts/trickqp/utils/Product.java - trick/dataproducts/trickqp/utils/ProductAxis.java - trick/dataproducts/trickqp/utils/ProductCurve.java - trick/dataproducts/trickqp/utils/ProductDataPanel.java - trick/dataproducts/trickqp/utils/ProductDomParser.java - trick/dataproducts/trickqp/utils/ProductExternalFunction.java - trick/dataproducts/trickqp/utils/ProductTable.java - trick/dataproducts/trickqp/utils/ProductTree.java - trick/dataproducts/trickqp/utils/ProductVarcase.java - trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java - trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java - trick/dataproducts/trickqp/utils/VarListPanel.java - trick/dataproducts/trickqp/utils/CommonProduct.java - trick/dataproducts/trickqp/utils/ProductPage.java - trick/dataproducts/trickqp/utils/ProductPlot.java - trick/dataproducts/trickqp/utils/ProductColumn.java - trick/dataproducts/trickqp/utils/ProductMeasurement.java - trick/dataproducts/trickqp/utils/ProductVar.java - trick/dataproducts/trickqp/utils/ProductXMLCreator.java - trick/dataproducts/trickqp/utils/TrickQPActionController.java - trick/dataproducts/trickqp/TrickQPApplication.java - trick/dataproducts/utils/FileTreeNode.java - trick/dataproducts/utils/FileTreePanel.java - trick/dataproducts/utils/Session.java - trick/dataproducts/utils/SessionDomParser.java - trick/dataproducts/utils/SessionRun.java - trick/dataproducts/utils/SessionRunTransferHandler.java - trick/dataproducts/utils/SessionXMLCreator.java - trick/dataproducts/utils/SimDPTree.java - trick/dataproducts/utils/SimRunDPTree.java - trick/dataproducts/utils/SimRunTree.java - trick/dataproducts/DataProductsApplication.java - trick/dre/DreApplication.java - trick/montemonitor/MonteMonitorApplication.java - trick/montemonitor/Slave.java - trick/mtv/MtvApp.java - trick/mtv/MtvView.java - trick/sie/utils/SearchListener.java - trick/sie/utils/SearchPanel.java - trick/sie/utils/Searcher.java - trick/sie/utils/SieResourceDomParser.java - trick/sie/utils/SieTemplate.java - trick/sie/utils/SieTree.java - trick/sie/utils/SieTreeModel.java - trick/sie/utils/SieVariableTree.java - trick/sie/utils/TreeModelExclusionFilter.java - trick/sie/utils/TreeModelFilter.java - trick/sie/utils/TreeModelSortingFilter.java - trick/sie/utils/VariableList.java - trick/sie/utils/SieEnumeration.java - trick/sie/SieApplication.java - trick/simcontrol/utils/SimControlActionController.java - trick/simcontrol/utils/SimState.java - trick/simcontrol/SimControlApplication.java - trick/sniffer/SimSnifferApplication.java - trick/sniffer/SimulationInformation.java - trick/sniffer/SimulationListener.java - trick/sniffer/SimulationSniffer.java - trick/test/Client.java - trick/tv/StripChart.java - trick/tv/TVApplication.java - trick/tv/TVBean.java - trick/tv/TVBoolean.java - trick/tv/TVDouble.java - trick/tv/TVEnumeration.java - trick/tv/TVFloat.java - trick/tv/TVString.java - trick/tv/TVVariableTree.java - trick/tv/TrickViewFluent.java - trick/tv/VariableTable.java - trick/tv/DoubleComboBox.java - trick/tv/StripChartManager.java - trick/tv/TVByte.java - trick/tv/TVLong.java - trick/tv/TVShort.java - trick/tv/TVInteger.java - trick/vc/VariableCounter.java - trick/Template.java -) - -set( JAVA_RESOURCES - trick/common/resources/RunTimeTrickApplication.properties - trick/common/resources/TrickApplication.properties - trick/common/resources/filenew.gif - trick/common/resources/fileopen.gif - trick/common/resources/filesave.gif - trick/common/resources/firefox_folder_closed.gif - trick/common/resources/firefox_folder_open.gif - trick/common/resources/gnome-fs-regular.gif - trick/common/resources/page2.gif - trick/common/resources/plot.gif - trick/common/resources/program.gif - trick/common/resources/program_in.gif - trick/common/resources/program_out.gif - trick/common/resources/table_small.gif - trick/common/resources/toplevel.gif - trick/common/resources/trick.gif - trick/common/resources/trick_icon.png - trick/common/resources/trick_small.gif - trick/common/resources/variable.gif - trick/common/resources/x_variable.gif - trick/common/resources/y_variable.gif - trick/dataproducts/plot/resources/JXPlotApplication.properties - trick/dataproducts/resources/DataProductsApplication.properties - trick/dataproducts/resources/gnuplot_off.gif - trick/dataproducts/resources/gnuplot_on.gif - trick/dataproducts/resources/plot_contrast.gif - trick/dataproducts/resources/plot_coplot.gif - trick/dataproducts/resources/plot_error.gif - trick/dataproducts/resources/plot_single.gif - trick/dataproducts/resources/table_callback1.gif - trick/dataproducts/resources/table_error_callback.gif - trick/dataproducts/trickdp/resources/TrickDPApplication.properties - trick/dataproducts/trickdp/resources/adobe_pdf.gif - trick/dataproducts/trickdp/resources/help/Help.hs - trick/dataproducts/trickdp/resources/help/HelpTOC.xml - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA - trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP - trick/dataproducts/trickdp/resources/help/Map.jhm - trick/dataproducts/trickdp/resources/help/html/faq.html - trick/dataproducts/trickdp/resources/help/html/generalusage.html - trick/dataproducts/trickdp/resources/help/html/howtoorganize.html - trick/dataproducts/trickdp/resources/help/html/importingdata.html - trick/dataproducts/trickdp/resources/help/html/intro.html - trick/dataproducts/trickdp/resources/help/html/quickplot.html - trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html - trick/dataproducts/trickdp/resources/ps_coplot.gif - trick/dataproducts/trickdp/resources/ps_error.gif - trick/dataproducts/trickdp/resources/ps_single.gif - trick/dataproducts/trickdp/resources/quickplot.gif - trick/dataproducts/trickqp/resources/TrickQPApplication.properties - trick/dataproducts/trickqp/resources/function.gif - trick/dataproducts/trickqp/resources/help/Help.hs - trick/dataproducts/trickqp/resources/help/HelpTOC.xml - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA - trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP - trick/dataproducts/trickqp/resources/help/Map.jhm - trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html - trick/dataproducts/trickqp/resources/help/html/general.html - trick/dataproducts/trickqp/resources/help/html/guilayout.html - trick/dataproducts/trickqp/resources/help/html/intro.html - trick/dataproducts/trickqp/resources/help/html/leftovers.html - trick/dataproducts/trickqp/resources/help/html/minitutorial.html - trick/dre/resources/DreApplication.properties - trick/montemonitor/resources/MonteMonitorApplication.properties - trick/montemonitor/resources/dice.gif - trick/montemonitor/resources/disconnected.png - trick/montemonitor/resources/finished.png - trick/montemonitor/resources/initializing.png - trick/montemonitor/resources/killed.png - trick/montemonitor/resources/ready.png - trick/montemonitor/resources/running.png - trick/montemonitor/resources/stopped.png - trick/montemonitor/resources/stopping.png - trick/montemonitor/resources/uninitialized.png - trick/montemonitor/resources/unknown.png - trick/montemonitor/resources/unresponsive-running.png - trick/montemonitor/resources/unresponsive-stopping.png - trick/montemonitor/resources/unresponsive.png - trick/mtv/resources/MtvAboutBox.properties - trick/mtv/resources/MtvApp.properties - trick/mtv/resources/MtvView.properties - trick/mtv/resources/busyicons/busy-icon0.png - trick/mtv/resources/busyicons/busy-icon1.png - trick/mtv/resources/busyicons/busy-icon10.png - trick/mtv/resources/busyicons/busy-icon11.png - trick/mtv/resources/busyicons/busy-icon12.png - trick/mtv/resources/busyicons/busy-icon13.png - trick/mtv/resources/busyicons/busy-icon14.png - trick/mtv/resources/busyicons/busy-icon2.png - trick/mtv/resources/busyicons/busy-icon3.png - trick/mtv/resources/busyicons/busy-icon4.png - trick/mtv/resources/busyicons/busy-icon5.png - trick/mtv/resources/busyicons/busy-icon6.png - trick/mtv/resources/busyicons/busy-icon7.png - trick/mtv/resources/busyicons/busy-icon8.png - trick/mtv/resources/busyicons/busy-icon9.png - trick/mtv/resources/busyicons/idle-icon.png - trick/mtv/resources/delete_22x22.gif - trick/mtv/resources/fileopen.gif - trick/mtv/resources/filesave.gif - trick/mtv/resources/trick4.gif - trick/mtv/resources/trick_icon.png - trick/sie/resources/SieApplication.properties - trick/simcontrol/resources/SimControlApplication.properties - trick/simcontrol/resources/mtv_22x22.png - trick/simcontrol/resources/throttle_22x22.png - trick/simcontrol/resources/tv_22x22.png - trick/sniffer/resources/SimSnifferApplication.properties - trick/sniffer/resources/nose.gif - trick/tv/jaxb.index - trick/tv/resources/CP.gif - trick/tv/resources/TVApplication.properties - trick/tv/resources/delete_22x22.gif - trick/tv/resources/fileimport.gif - trick/tv/resources/kmplot.gif - trick/tv/resources/trickView.xsd - trick/tv/resources/tv.xsd - trick/tv/resources/tv_32x32.gif - trick/tv/resources/tv_off.png - trick/tv/resources/tv_on.png -) - -add_jar( trick_jar - SOURCES ${JAVA_SRC} ${JAVA_RESOURCES} - INCLUDE_JARS ${JAVA_LIBS} - OUTPUT_NAME trick - OUTPUT_DIR ${CMAKE_BINARY_DIR}/libexec/trick/java/dist -) - -file(COPY trick/common/resources/trick_icon.png DESTINATION ${CMAKE_BINARY_DIR}/libexec/trick/java/resources) diff --git a/trick_source/java/src/trick/Template.java b/trick_source/java/src/main/java/trick/Template.java similarity index 100% rename from trick_source/java/src/trick/Template.java rename to trick_source/java/src/main/java/trick/Template.java diff --git a/trick_source/java/src/trick/common/RunTimeTrickApplication.java b/trick_source/java/src/main/java/trick/common/RunTimeTrickApplication.java similarity index 100% rename from trick_source/java/src/trick/common/RunTimeTrickApplication.java rename to trick_source/java/src/main/java/trick/common/RunTimeTrickApplication.java diff --git a/trick_source/java/src/trick/common/TrickApplication.java b/trick_source/java/src/main/java/trick/common/TrickApplication.java similarity index 100% rename from trick_source/java/src/trick/common/TrickApplication.java rename to trick_source/java/src/main/java/trick/common/TrickApplication.java diff --git a/trick_source/java/src/trick/common/ui/TrickFileFilter.java b/trick_source/java/src/main/java/trick/common/ui/TrickFileFilter.java similarity index 100% rename from trick_source/java/src/trick/common/ui/TrickFileFilter.java rename to trick_source/java/src/main/java/trick/common/ui/TrickFileFilter.java diff --git a/trick_source/java/src/trick/common/ui/UIUtils.java b/trick_source/java/src/main/java/trick/common/ui/UIUtils.java similarity index 100% rename from trick_source/java/src/trick/common/ui/UIUtils.java rename to trick_source/java/src/main/java/trick/common/ui/UIUtils.java diff --git a/trick_source/java/src/trick/common/ui/components/CommonTreeNode.java b/trick_source/java/src/main/java/trick/common/ui/components/CommonTreeNode.java similarity index 100% rename from trick_source/java/src/trick/common/ui/components/CommonTreeNode.java rename to trick_source/java/src/main/java/trick/common/ui/components/CommonTreeNode.java diff --git a/trick_source/java/src/trick/common/ui/components/DoubleJSlider.java b/trick_source/java/src/main/java/trick/common/ui/components/DoubleJSlider.java similarity index 100% rename from trick_source/java/src/trick/common/ui/components/DoubleJSlider.java rename to trick_source/java/src/main/java/trick/common/ui/components/DoubleJSlider.java diff --git a/trick_source/java/src/trick/common/ui/components/FontChooser.java b/trick_source/java/src/main/java/trick/common/ui/components/FontChooser.java similarity index 100% rename from trick_source/java/src/trick/common/ui/components/FontChooser.java rename to trick_source/java/src/main/java/trick/common/ui/components/FontChooser.java diff --git a/trick_source/java/src/trick/common/ui/components/NumberTextField.java b/trick_source/java/src/main/java/trick/common/ui/components/NumberTextField.java similarity index 100% rename from trick_source/java/src/trick/common/ui/components/NumberTextField.java rename to trick_source/java/src/main/java/trick/common/ui/components/NumberTextField.java diff --git a/trick_source/java/src/trick/common/ui/panels/AnimationPlayer.java b/trick_source/java/src/main/java/trick/common/ui/panels/AnimationPlayer.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/AnimationPlayer.java rename to trick_source/java/src/main/java/trick/common/ui/panels/AnimationPlayer.java diff --git a/trick_source/java/src/trick/common/ui/panels/ConnectionStatusBar.java b/trick_source/java/src/main/java/trick/common/ui/panels/ConnectionStatusBar.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/ConnectionStatusBar.java rename to trick_source/java/src/main/java/trick/common/ui/panels/ConnectionStatusBar.java diff --git a/trick_source/java/src/trick/common/ui/panels/DataPanel.java b/trick_source/java/src/main/java/trick/common/ui/panels/DataPanel.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/DataPanel.java rename to trick_source/java/src/main/java/trick/common/ui/panels/DataPanel.java diff --git a/trick_source/java/src/trick/common/ui/panels/DynamicTree.java b/trick_source/java/src/main/java/trick/common/ui/panels/DynamicTree.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/DynamicTree.java rename to trick_source/java/src/main/java/trick/common/ui/panels/DynamicTree.java diff --git a/trick_source/java/src/trick/common/ui/panels/FindBar.java b/trick_source/java/src/main/java/trick/common/ui/panels/FindBar.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/FindBar.java rename to trick_source/java/src/main/java/trick/common/ui/panels/FindBar.java diff --git a/trick_source/java/src/trick/common/ui/panels/ListPanel.java b/trick_source/java/src/main/java/trick/common/ui/panels/ListPanel.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/ListPanel.java rename to trick_source/java/src/main/java/trick/common/ui/panels/ListPanel.java diff --git a/trick_source/java/src/trick/common/ui/panels/SmallTrickIconLabel.java b/trick_source/java/src/main/java/trick/common/ui/panels/SmallTrickIconLabel.java similarity index 100% rename from trick_source/java/src/trick/common/ui/panels/SmallTrickIconLabel.java rename to trick_source/java/src/main/java/trick/common/ui/panels/SmallTrickIconLabel.java diff --git a/trick_source/java/src/trick/common/utils/BinaryDataReader.java b/trick_source/java/src/main/java/trick/common/utils/BinaryDataReader.java similarity index 100% rename from trick_source/java/src/trick/common/utils/BinaryDataReader.java rename to trick_source/java/src/main/java/trick/common/utils/BinaryDataReader.java diff --git a/trick_source/java/src/trick/common/utils/CSVDataReader.java b/trick_source/java/src/main/java/trick/common/utils/CSVDataReader.java similarity index 100% rename from trick_source/java/src/trick/common/utils/CSVDataReader.java rename to trick_source/java/src/main/java/trick/common/utils/CSVDataReader.java diff --git a/trick_source/java/src/trick/common/utils/DataReader.java b/trick_source/java/src/main/java/trick/common/utils/DataReader.java similarity index 100% rename from trick_source/java/src/trick/common/utils/DataReader.java rename to trick_source/java/src/main/java/trick/common/utils/DataReader.java diff --git a/trick_source/java/src/trick/common/utils/ErrorChecker.java b/trick_source/java/src/main/java/trick/common/utils/ErrorChecker.java similarity index 100% rename from trick_source/java/src/trick/common/utils/ErrorChecker.java rename to trick_source/java/src/main/java/trick/common/utils/ErrorChecker.java diff --git a/trick_source/java/src/trick/common/utils/LogHeaderReader.java b/trick_source/java/src/main/java/trick/common/utils/LogHeaderReader.java similarity index 100% rename from trick_source/java/src/trick/common/utils/LogHeaderReader.java rename to trick_source/java/src/main/java/trick/common/utils/LogHeaderReader.java diff --git a/trick_source/java/src/trick/common/utils/LogVar.java b/trick_source/java/src/main/java/trick/common/utils/LogVar.java similarity index 100% rename from trick_source/java/src/trick/common/utils/LogVar.java rename to trick_source/java/src/main/java/trick/common/utils/LogVar.java diff --git a/trick_source/java/src/trick/common/utils/SortedListModel.java b/trick_source/java/src/main/java/trick/common/utils/SortedListModel.java similarity index 100% rename from trick_source/java/src/trick/common/utils/SortedListModel.java rename to trick_source/java/src/main/java/trick/common/utils/SortedListModel.java diff --git a/trick_source/java/src/trick/common/utils/TrickColors.java b/trick_source/java/src/main/java/trick/common/utils/TrickColors.java similarity index 100% rename from trick_source/java/src/trick/common/utils/TrickColors.java rename to trick_source/java/src/main/java/trick/common/utils/TrickColors.java diff --git a/trick_source/java/src/trick/common/utils/UnitInfixExpression.java b/trick_source/java/src/main/java/trick/common/utils/UnitInfixExpression.java similarity index 100% rename from trick_source/java/src/trick/common/utils/UnitInfixExpression.java rename to trick_source/java/src/main/java/trick/common/utils/UnitInfixExpression.java diff --git a/trick_source/java/src/trick/common/utils/UnitType.java b/trick_source/java/src/main/java/trick/common/utils/UnitType.java similarity index 100% rename from trick_source/java/src/trick/common/utils/UnitType.java rename to trick_source/java/src/main/java/trick/common/utils/UnitType.java diff --git a/trick_source/java/src/trick/common/utils/VariableServerConnection.java b/trick_source/java/src/main/java/trick/common/utils/VariableServerConnection.java similarity index 100% rename from trick_source/java/src/trick/common/utils/VariableServerConnection.java rename to trick_source/java/src/main/java/trick/common/utils/VariableServerConnection.java diff --git a/trick_source/java/src/trick/common/utils/XMLCreator.java b/trick_source/java/src/main/java/trick/common/utils/XMLCreator.java similarity index 100% rename from trick_source/java/src/trick/common/utils/XMLCreator.java rename to trick_source/java/src/main/java/trick/common/utils/XMLCreator.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSBoolean.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSBoolean.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSBoolean.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSBoolean.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSByte.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSByte.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSByte.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSByte.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSDouble.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSDouble.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSDouble.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSDouble.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSFloat.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSFloat.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSFloat.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSFloat.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSInteger.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSInteger.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSInteger.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSInteger.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSLong.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSLong.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSLong.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSLong.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSShort.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSShort.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSShort.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSShort.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSString.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSString.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSString.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSString.java diff --git a/trick_source/java/src/trick/common/utils/vs/VSValue.java b/trick_source/java/src/main/java/trick/common/utils/vs/VSValue.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VSValue.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VSValue.java diff --git a/trick_source/java/src/trick/common/utils/vs/Variable.java b/trick_source/java/src/main/java/trick/common/utils/vs/Variable.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/Variable.java rename to trick_source/java/src/main/java/trick/common/utils/vs/Variable.java diff --git a/trick_source/java/src/trick/common/utils/vs/VariableListener.java b/trick_source/java/src/main/java/trick/common/utils/vs/VariableListener.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VariableListener.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VariableListener.java diff --git a/trick_source/java/src/trick/common/utils/vs/VariableServerFluent.java b/trick_source/java/src/main/java/trick/common/utils/vs/VariableServerFluent.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VariableServerFluent.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VariableServerFluent.java diff --git a/trick_source/java/src/trick/common/utils/vs/VariableTracker.java b/trick_source/java/src/main/java/trick/common/utils/vs/VariableTracker.java similarity index 100% rename from trick_source/java/src/trick/common/utils/vs/VariableTracker.java rename to trick_source/java/src/main/java/trick/common/utils/vs/VariableTracker.java diff --git a/trick_source/java/src/trick/dataproducts/DataProductsApplication.java b/trick_source/java/src/main/java/trick/dataproducts/DataProductsApplication.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/DataProductsApplication.java rename to trick_source/java/src/main/java/trick/dataproducts/DataProductsApplication.java diff --git a/trick_source/java/src/trick/dataproducts/plot/JXPlotApplication.java b/trick_source/java/src/main/java/trick/dataproducts/plot/JXPlotApplication.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/JXPlotApplication.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/JXPlotApplication.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/PlotUtils.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/PlotUtils.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/PlotUtils.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/PlotUtils.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickChart.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChart.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickChart.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChart.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickChartControlPanel.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartControlPanel.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickChartControlPanel.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartControlPanel.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickChartFrame.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartFrame.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickChartFrame.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartFrame.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickChartPanel.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartPanel.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickChartPanel.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartPanel.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickChartTheme.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartTheme.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickChartTheme.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickChartTheme.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickFrame.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickFrame.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickFrame.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickFrame.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickTableFrame.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickTableFrame.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickTableFrame.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickTableFrame.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYLineAndShapeRenderer.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickXYPlot.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYPlot.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickXYPlot.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYPlot.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/TrickXYSeries.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYSeries.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/TrickXYSeries.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/TrickXYSeries.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/DefaultLogAxisEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickAxisEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickAxisEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickAxisEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickAxisEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditorFactory.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickChartEditorManager.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickNumberAxisEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickPlotEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickPlotEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickPlotEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickPlotEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickPolarPlotEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickTitleEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickTitleEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickTitleEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickTitleEditor.java diff --git a/trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java b/trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java rename to trick_source/java/src/main/java/trick/dataproducts/plot/utils/editor/TrickValueAxisEditor.java diff --git a/trick_source/java/src/trick/dataproducts/trickdp/TrickDPApplication.java b/trick_source/java/src/main/java/trick/dataproducts/trickdp/TrickDPApplication.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/TrickDPApplication.java rename to trick_source/java/src/main/java/trick/dataproducts/trickdp/TrickDPApplication.java diff --git a/trick_source/java/src/trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java b/trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java rename to trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/DPRemoteCallInterface.java diff --git a/trick_source/java/src/trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java b/trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java rename to trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/DPRemoteCallInterfaceImpl.java diff --git a/trick_source/java/src/trick/dataproducts/trickdp/utils/PDFBooklet.java b/trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/PDFBooklet.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/utils/PDFBooklet.java rename to trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/PDFBooklet.java diff --git a/trick_source/java/src/trick/dataproducts/trickdp/utils/TrickDPActionController.java b/trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/TrickDPActionController.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/utils/TrickDPActionController.java rename to trick_source/java/src/main/java/trick/dataproducts/trickdp/utils/TrickDPActionController.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/TrickQPApplication.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/TrickQPApplication.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/TrickQPApplication.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/TrickQPApplication.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/CommonProduct.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/CommonProduct.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/CommonProduct.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/CommonProduct.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/DataTransferHandler.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/DataTransferHandler.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/DataTransferHandler.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/DataTransferHandler.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/Product.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/Product.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/Product.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/Product.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductAxis.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductAxis.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductAxis.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductAxis.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductColumn.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductColumn.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductColumn.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductColumn.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductCurve.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductCurve.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductCurve.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductCurve.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductDataPanel.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductDataPanel.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductDataPanel.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductDataPanel.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductDomParser.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductDomParser.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductDomParser.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductDomParser.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductExternalFunction.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductExternalFunction.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductExternalFunction.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductExternalFunction.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductMeasurement.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductMeasurement.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductMeasurement.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductMeasurement.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductPage.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductPage.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductPage.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductPage.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductPlot.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductPlot.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductPlot.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductPlot.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductTable.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductTable.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductTable.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductTable.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductTree.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductTree.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductTree.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductTree.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductVar.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductVar.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductVar.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductVar.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductVarcase.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductVarcase.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductVarcase.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductVarcase.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/ProductXMLCreator.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductXMLCreator.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/ProductXMLCreator.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/ProductXMLCreator.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/QPRemoteCallInterface.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/QPRemoteCallInterfaceImpl.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/TrickQPActionController.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/TrickQPActionController.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/TrickQPActionController.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/TrickQPActionController.java diff --git a/trick_source/java/src/trick/dataproducts/trickqp/utils/VarListPanel.java b/trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/VarListPanel.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/utils/VarListPanel.java rename to trick_source/java/src/main/java/trick/dataproducts/trickqp/utils/VarListPanel.java diff --git a/trick_source/java/src/trick/dataproducts/utils/FileTreeNode.java b/trick_source/java/src/main/java/trick/dataproducts/utils/FileTreeNode.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/FileTreeNode.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/FileTreeNode.java diff --git a/trick_source/java/src/trick/dataproducts/utils/FileTreePanel.java b/trick_source/java/src/main/java/trick/dataproducts/utils/FileTreePanel.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/FileTreePanel.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/FileTreePanel.java diff --git a/trick_source/java/src/trick/dataproducts/utils/Session.java b/trick_source/java/src/main/java/trick/dataproducts/utils/Session.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/Session.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/Session.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SessionDomParser.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SessionDomParser.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SessionDomParser.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SessionDomParser.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SessionRun.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SessionRun.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SessionRun.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SessionRun.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SessionRunTransferHandler.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SessionRunTransferHandler.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SessionRunTransferHandler.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SessionRunTransferHandler.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SessionXMLCreator.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SessionXMLCreator.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SessionXMLCreator.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SessionXMLCreator.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SimDPTree.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SimDPTree.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SimDPTree.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SimDPTree.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SimRunDPTree.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SimRunDPTree.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SimRunDPTree.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SimRunDPTree.java diff --git a/trick_source/java/src/trick/dataproducts/utils/SimRunTree.java b/trick_source/java/src/main/java/trick/dataproducts/utils/SimRunTree.java similarity index 100% rename from trick_source/java/src/trick/dataproducts/utils/SimRunTree.java rename to trick_source/java/src/main/java/trick/dataproducts/utils/SimRunTree.java diff --git a/trick_source/java/src/trick/dre/DreApplication.java b/trick_source/java/src/main/java/trick/dre/DreApplication.java similarity index 100% rename from trick_source/java/src/trick/dre/DreApplication.java rename to trick_source/java/src/main/java/trick/dre/DreApplication.java diff --git a/trick_source/java/src/trick/montemonitor/MonteMonitorApplication.java b/trick_source/java/src/main/java/trick/montemonitor/MonteMonitorApplication.java similarity index 100% rename from trick_source/java/src/trick/montemonitor/MonteMonitorApplication.java rename to trick_source/java/src/main/java/trick/montemonitor/MonteMonitorApplication.java diff --git a/trick_source/java/src/trick/montemonitor/Slave.java b/trick_source/java/src/main/java/trick/montemonitor/Slave.java similarity index 100% rename from trick_source/java/src/trick/montemonitor/Slave.java rename to trick_source/java/src/main/java/trick/montemonitor/Slave.java diff --git a/trick_source/java/src/trick/mtv/MtvApp.java b/trick_source/java/src/main/java/trick/mtv/MtvApp.java similarity index 100% rename from trick_source/java/src/trick/mtv/MtvApp.java rename to trick_source/java/src/main/java/trick/mtv/MtvApp.java diff --git a/trick_source/java/src/trick/mtv/MtvView.java b/trick_source/java/src/main/java/trick/mtv/MtvView.java similarity index 100% rename from trick_source/java/src/trick/mtv/MtvView.java rename to trick_source/java/src/main/java/trick/mtv/MtvView.java diff --git a/trick_source/java/src/trick/sie/SieApplication.java b/trick_source/java/src/main/java/trick/sie/SieApplication.java similarity index 100% rename from trick_source/java/src/trick/sie/SieApplication.java rename to trick_source/java/src/main/java/trick/sie/SieApplication.java diff --git a/trick_source/java/src/trick/sie/utils/SearchListener.java b/trick_source/java/src/main/java/trick/sie/utils/SearchListener.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SearchListener.java rename to trick_source/java/src/main/java/trick/sie/utils/SearchListener.java diff --git a/trick_source/java/src/trick/sie/utils/SearchPanel.java b/trick_source/java/src/main/java/trick/sie/utils/SearchPanel.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SearchPanel.java rename to trick_source/java/src/main/java/trick/sie/utils/SearchPanel.java diff --git a/trick_source/java/src/trick/sie/utils/Searcher.java b/trick_source/java/src/main/java/trick/sie/utils/Searcher.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/Searcher.java rename to trick_source/java/src/main/java/trick/sie/utils/Searcher.java diff --git a/trick_source/java/src/trick/sie/utils/SieEnumeration.java b/trick_source/java/src/main/java/trick/sie/utils/SieEnumeration.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieEnumeration.java rename to trick_source/java/src/main/java/trick/sie/utils/SieEnumeration.java diff --git a/trick_source/java/src/trick/sie/utils/SieResourceDomParser.java b/trick_source/java/src/main/java/trick/sie/utils/SieResourceDomParser.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieResourceDomParser.java rename to trick_source/java/src/main/java/trick/sie/utils/SieResourceDomParser.java diff --git a/trick_source/java/src/trick/sie/utils/SieTemplate.java b/trick_source/java/src/main/java/trick/sie/utils/SieTemplate.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieTemplate.java rename to trick_source/java/src/main/java/trick/sie/utils/SieTemplate.java diff --git a/trick_source/java/src/trick/sie/utils/SieTree.java b/trick_source/java/src/main/java/trick/sie/utils/SieTree.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieTree.java rename to trick_source/java/src/main/java/trick/sie/utils/SieTree.java diff --git a/trick_source/java/src/trick/sie/utils/SieTreeModel.java b/trick_source/java/src/main/java/trick/sie/utils/SieTreeModel.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieTreeModel.java rename to trick_source/java/src/main/java/trick/sie/utils/SieTreeModel.java diff --git a/trick_source/java/src/trick/sie/utils/SieVariableTree.java b/trick_source/java/src/main/java/trick/sie/utils/SieVariableTree.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/SieVariableTree.java rename to trick_source/java/src/main/java/trick/sie/utils/SieVariableTree.java diff --git a/trick_source/java/src/trick/sie/utils/TreeModelExclusionFilter.java b/trick_source/java/src/main/java/trick/sie/utils/TreeModelExclusionFilter.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/TreeModelExclusionFilter.java rename to trick_source/java/src/main/java/trick/sie/utils/TreeModelExclusionFilter.java diff --git a/trick_source/java/src/trick/sie/utils/TreeModelFilter.java b/trick_source/java/src/main/java/trick/sie/utils/TreeModelFilter.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/TreeModelFilter.java rename to trick_source/java/src/main/java/trick/sie/utils/TreeModelFilter.java diff --git a/trick_source/java/src/trick/sie/utils/TreeModelSortingFilter.java b/trick_source/java/src/main/java/trick/sie/utils/TreeModelSortingFilter.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/TreeModelSortingFilter.java rename to trick_source/java/src/main/java/trick/sie/utils/TreeModelSortingFilter.java diff --git a/trick_source/java/src/trick/sie/utils/VariableList.java b/trick_source/java/src/main/java/trick/sie/utils/VariableList.java similarity index 100% rename from trick_source/java/src/trick/sie/utils/VariableList.java rename to trick_source/java/src/main/java/trick/sie/utils/VariableList.java diff --git a/trick_source/java/src/trick/simcontrol/SimControlApplication.java b/trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java similarity index 100% rename from trick_source/java/src/trick/simcontrol/SimControlApplication.java rename to trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java diff --git a/trick_source/java/src/trick/simcontrol/utils/SimControlActionController.java b/trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java similarity index 100% rename from trick_source/java/src/trick/simcontrol/utils/SimControlActionController.java rename to trick_source/java/src/main/java/trick/simcontrol/utils/SimControlActionController.java diff --git a/trick_source/java/src/trick/simcontrol/utils/SimState.java b/trick_source/java/src/main/java/trick/simcontrol/utils/SimState.java similarity index 100% rename from trick_source/java/src/trick/simcontrol/utils/SimState.java rename to trick_source/java/src/main/java/trick/simcontrol/utils/SimState.java diff --git a/trick_source/java/src/trick/sniffer/SimSnifferApplication.java b/trick_source/java/src/main/java/trick/sniffer/SimSnifferApplication.java similarity index 100% rename from trick_source/java/src/trick/sniffer/SimSnifferApplication.java rename to trick_source/java/src/main/java/trick/sniffer/SimSnifferApplication.java diff --git a/trick_source/java/src/trick/sniffer/SimulationInformation.java b/trick_source/java/src/main/java/trick/sniffer/SimulationInformation.java similarity index 100% rename from trick_source/java/src/trick/sniffer/SimulationInformation.java rename to trick_source/java/src/main/java/trick/sniffer/SimulationInformation.java diff --git a/trick_source/java/src/trick/sniffer/SimulationListener.java b/trick_source/java/src/main/java/trick/sniffer/SimulationListener.java similarity index 100% rename from trick_source/java/src/trick/sniffer/SimulationListener.java rename to trick_source/java/src/main/java/trick/sniffer/SimulationListener.java diff --git a/trick_source/java/src/trick/sniffer/SimulationSniffer.java b/trick_source/java/src/main/java/trick/sniffer/SimulationSniffer.java similarity index 100% rename from trick_source/java/src/trick/sniffer/SimulationSniffer.java rename to trick_source/java/src/main/java/trick/sniffer/SimulationSniffer.java diff --git a/trick_source/java/src/trick/test/Client.java b/trick_source/java/src/main/java/trick/test/Client.java similarity index 100% rename from trick_source/java/src/trick/test/Client.java rename to trick_source/java/src/main/java/trick/test/Client.java diff --git a/trick_source/java/src/trick/tv/DoubleComboBox.java b/trick_source/java/src/main/java/trick/tv/DoubleComboBox.java similarity index 100% rename from trick_source/java/src/trick/tv/DoubleComboBox.java rename to trick_source/java/src/main/java/trick/tv/DoubleComboBox.java diff --git a/trick_source/java/src/trick/tv/StripChart.java b/trick_source/java/src/main/java/trick/tv/StripChart.java similarity index 100% rename from trick_source/java/src/trick/tv/StripChart.java rename to trick_source/java/src/main/java/trick/tv/StripChart.java diff --git a/trick_source/java/src/trick/tv/StripChartManager.java b/trick_source/java/src/main/java/trick/tv/StripChartManager.java similarity index 100% rename from trick_source/java/src/trick/tv/StripChartManager.java rename to trick_source/java/src/main/java/trick/tv/StripChartManager.java diff --git a/trick_source/java/src/trick/tv/TVApplication.java b/trick_source/java/src/main/java/trick/tv/TVApplication.java similarity index 100% rename from trick_source/java/src/trick/tv/TVApplication.java rename to trick_source/java/src/main/java/trick/tv/TVApplication.java diff --git a/trick_source/java/src/trick/tv/TVBean.java b/trick_source/java/src/main/java/trick/tv/TVBean.java similarity index 100% rename from trick_source/java/src/trick/tv/TVBean.java rename to trick_source/java/src/main/java/trick/tv/TVBean.java diff --git a/trick_source/java/src/trick/tv/TVBoolean.java b/trick_source/java/src/main/java/trick/tv/TVBoolean.java similarity index 100% rename from trick_source/java/src/trick/tv/TVBoolean.java rename to trick_source/java/src/main/java/trick/tv/TVBoolean.java diff --git a/trick_source/java/src/trick/tv/TVByte.java b/trick_source/java/src/main/java/trick/tv/TVByte.java similarity index 100% rename from trick_source/java/src/trick/tv/TVByte.java rename to trick_source/java/src/main/java/trick/tv/TVByte.java diff --git a/trick_source/java/src/trick/tv/TVDouble.java b/trick_source/java/src/main/java/trick/tv/TVDouble.java similarity index 100% rename from trick_source/java/src/trick/tv/TVDouble.java rename to trick_source/java/src/main/java/trick/tv/TVDouble.java diff --git a/trick_source/java/src/trick/tv/TVEnumeration.java b/trick_source/java/src/main/java/trick/tv/TVEnumeration.java similarity index 100% rename from trick_source/java/src/trick/tv/TVEnumeration.java rename to trick_source/java/src/main/java/trick/tv/TVEnumeration.java diff --git a/trick_source/java/src/trick/tv/TVFloat.java b/trick_source/java/src/main/java/trick/tv/TVFloat.java similarity index 100% rename from trick_source/java/src/trick/tv/TVFloat.java rename to trick_source/java/src/main/java/trick/tv/TVFloat.java diff --git a/trick_source/java/src/trick/tv/TVInteger.java b/trick_source/java/src/main/java/trick/tv/TVInteger.java similarity index 100% rename from trick_source/java/src/trick/tv/TVInteger.java rename to trick_source/java/src/main/java/trick/tv/TVInteger.java diff --git a/trick_source/java/src/trick/tv/TVLong.java b/trick_source/java/src/main/java/trick/tv/TVLong.java similarity index 100% rename from trick_source/java/src/trick/tv/TVLong.java rename to trick_source/java/src/main/java/trick/tv/TVLong.java diff --git a/trick_source/java/src/trick/tv/TVShort.java b/trick_source/java/src/main/java/trick/tv/TVShort.java similarity index 100% rename from trick_source/java/src/trick/tv/TVShort.java rename to trick_source/java/src/main/java/trick/tv/TVShort.java diff --git a/trick_source/java/src/trick/tv/TVString.java b/trick_source/java/src/main/java/trick/tv/TVString.java similarity index 100% rename from trick_source/java/src/trick/tv/TVString.java rename to trick_source/java/src/main/java/trick/tv/TVString.java diff --git a/trick_source/java/src/trick/tv/TVVariableTree.java b/trick_source/java/src/main/java/trick/tv/TVVariableTree.java similarity index 100% rename from trick_source/java/src/trick/tv/TVVariableTree.java rename to trick_source/java/src/main/java/trick/tv/TVVariableTree.java diff --git a/trick_source/java/src/trick/tv/TrickViewFluent.java b/trick_source/java/src/main/java/trick/tv/TrickViewFluent.java similarity index 100% rename from trick_source/java/src/trick/tv/TrickViewFluent.java rename to trick_source/java/src/main/java/trick/tv/TrickViewFluent.java diff --git a/trick_source/java/src/trick/tv/VariableTable.java b/trick_source/java/src/main/java/trick/tv/VariableTable.java similarity index 100% rename from trick_source/java/src/trick/tv/VariableTable.java rename to trick_source/java/src/main/java/trick/tv/VariableTable.java diff --git a/trick_source/java/src/trick/vc/VariableCounter.java b/trick_source/java/src/main/java/trick/vc/VariableCounter.java similarity index 100% rename from trick_source/java/src/trick/vc/VariableCounter.java rename to trick_source/java/src/main/java/trick/vc/VariableCounter.java diff --git a/trick_source/java/src/trick/common/resources/RunTimeTrickApplication.properties b/trick_source/java/src/main/resources/trick/common/resources/RunTimeTrickApplication.properties similarity index 100% rename from trick_source/java/src/trick/common/resources/RunTimeTrickApplication.properties rename to trick_source/java/src/main/resources/trick/common/resources/RunTimeTrickApplication.properties diff --git a/trick_source/java/src/trick/common/resources/TrickApplication.properties b/trick_source/java/src/main/resources/trick/common/resources/TrickApplication.properties similarity index 100% rename from trick_source/java/src/trick/common/resources/TrickApplication.properties rename to trick_source/java/src/main/resources/trick/common/resources/TrickApplication.properties diff --git a/trick_source/java/src/trick/common/resources/filenew.gif b/trick_source/java/src/main/resources/trick/common/resources/filenew.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/filenew.gif rename to trick_source/java/src/main/resources/trick/common/resources/filenew.gif diff --git a/trick_source/java/src/trick/common/resources/fileopen.gif b/trick_source/java/src/main/resources/trick/common/resources/fileopen.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/fileopen.gif rename to trick_source/java/src/main/resources/trick/common/resources/fileopen.gif diff --git a/trick_source/java/src/trick/common/resources/filesave.gif b/trick_source/java/src/main/resources/trick/common/resources/filesave.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/filesave.gif rename to trick_source/java/src/main/resources/trick/common/resources/filesave.gif diff --git a/trick_source/java/src/trick/common/resources/firefox_folder_closed.gif b/trick_source/java/src/main/resources/trick/common/resources/firefox_folder_closed.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/firefox_folder_closed.gif rename to trick_source/java/src/main/resources/trick/common/resources/firefox_folder_closed.gif diff --git a/trick_source/java/src/trick/common/resources/firefox_folder_open.gif b/trick_source/java/src/main/resources/trick/common/resources/firefox_folder_open.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/firefox_folder_open.gif rename to trick_source/java/src/main/resources/trick/common/resources/firefox_folder_open.gif diff --git a/trick_source/java/src/trick/common/resources/gnome-fs-regular.gif b/trick_source/java/src/main/resources/trick/common/resources/gnome-fs-regular.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/gnome-fs-regular.gif rename to trick_source/java/src/main/resources/trick/common/resources/gnome-fs-regular.gif diff --git a/trick_source/java/src/trick/common/resources/page2.gif b/trick_source/java/src/main/resources/trick/common/resources/page2.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/page2.gif rename to trick_source/java/src/main/resources/trick/common/resources/page2.gif diff --git a/trick_source/java/src/trick/common/resources/plot.gif b/trick_source/java/src/main/resources/trick/common/resources/plot.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/plot.gif rename to trick_source/java/src/main/resources/trick/common/resources/plot.gif diff --git a/trick_source/java/src/trick/common/resources/program.gif b/trick_source/java/src/main/resources/trick/common/resources/program.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/program.gif rename to trick_source/java/src/main/resources/trick/common/resources/program.gif diff --git a/trick_source/java/src/trick/common/resources/program_in.gif b/trick_source/java/src/main/resources/trick/common/resources/program_in.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/program_in.gif rename to trick_source/java/src/main/resources/trick/common/resources/program_in.gif diff --git a/trick_source/java/src/trick/common/resources/program_out.gif b/trick_source/java/src/main/resources/trick/common/resources/program_out.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/program_out.gif rename to trick_source/java/src/main/resources/trick/common/resources/program_out.gif diff --git a/trick_source/java/src/trick/common/resources/table_small.gif b/trick_source/java/src/main/resources/trick/common/resources/table_small.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/table_small.gif rename to trick_source/java/src/main/resources/trick/common/resources/table_small.gif diff --git a/trick_source/java/src/trick/common/resources/toplevel.gif b/trick_source/java/src/main/resources/trick/common/resources/toplevel.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/toplevel.gif rename to trick_source/java/src/main/resources/trick/common/resources/toplevel.gif diff --git a/trick_source/java/src/trick/common/resources/trick.gif b/trick_source/java/src/main/resources/trick/common/resources/trick.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/trick.gif rename to trick_source/java/src/main/resources/trick/common/resources/trick.gif diff --git a/trick_source/java/src/trick/common/resources/trick_icon.png b/trick_source/java/src/main/resources/trick/common/resources/trick_icon.png similarity index 100% rename from trick_source/java/src/trick/common/resources/trick_icon.png rename to trick_source/java/src/main/resources/trick/common/resources/trick_icon.png diff --git a/trick_source/java/src/trick/common/resources/trick_small.gif b/trick_source/java/src/main/resources/trick/common/resources/trick_small.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/trick_small.gif rename to trick_source/java/src/main/resources/trick/common/resources/trick_small.gif diff --git a/trick_source/java/src/trick/common/resources/variable.gif b/trick_source/java/src/main/resources/trick/common/resources/variable.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/variable.gif rename to trick_source/java/src/main/resources/trick/common/resources/variable.gif diff --git a/trick_source/java/src/trick/common/resources/x_variable.gif b/trick_source/java/src/main/resources/trick/common/resources/x_variable.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/x_variable.gif rename to trick_source/java/src/main/resources/trick/common/resources/x_variable.gif diff --git a/trick_source/java/src/trick/common/resources/y_variable.gif b/trick_source/java/src/main/resources/trick/common/resources/y_variable.gif similarity index 100% rename from trick_source/java/src/trick/common/resources/y_variable.gif rename to trick_source/java/src/main/resources/trick/common/resources/y_variable.gif diff --git a/trick_source/java/src/trick/dataproducts/plot/resources/JXPlotApplication.properties b/trick_source/java/src/main/resources/trick/dataproducts/plot/resources/JXPlotApplication.properties similarity index 100% rename from trick_source/java/src/trick/dataproducts/plot/resources/JXPlotApplication.properties rename to trick_source/java/src/main/resources/trick/dataproducts/plot/resources/JXPlotApplication.properties diff --git a/trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties b/trick_source/java/src/main/resources/trick/dataproducts/resources/DataProductsApplication.properties similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/DataProductsApplication.properties rename to trick_source/java/src/main/resources/trick/dataproducts/resources/DataProductsApplication.properties diff --git a/trick_source/java/src/trick/dataproducts/resources/gnuplot_off.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/gnuplot_off.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/gnuplot_off.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/gnuplot_off.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/gnuplot_on.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/gnuplot_on.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/gnuplot_on.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/gnuplot_on.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/plot_contrast.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/plot_contrast.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/plot_contrast.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/plot_contrast.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/plot_coplot.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/plot_coplot.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/plot_coplot.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/plot_coplot.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/plot_error.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/plot_error.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/plot_error.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/plot_error.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/plot_single.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/plot_single.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/plot_single.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/plot_single.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/table_callback1.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/table_callback1.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/table_callback1.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/table_callback1.gif diff --git a/trick_source/java/src/trick/dataproducts/resources/table_error_callback.gif b/trick_source/java/src/main/resources/trick/dataproducts/resources/table_error_callback.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/resources/table_error_callback.gif rename to trick_source/java/src/main/resources/trick/dataproducts/resources/table_error_callback.gif diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/TrickDPApplication.properties b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/TrickDPApplication.properties similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/TrickDPApplication.properties rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/TrickDPApplication.properties diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/adobe_pdf.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/adobe_pdf.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/adobe_pdf.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/adobe_pdf.gif diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/Help.hs b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/Help.hs similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/Help.hs rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/Help.hs diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/HelpTOC.xml b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/HelpTOC.xml similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/HelpTOC.xml rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/HelpTOC.xml diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/DOCS.TAB diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/OFFSETS diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/POSITIONS diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/SCHEMA diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/JavaHelpSearch/TMAP diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/Map.jhm b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/Map.jhm similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/Map.jhm rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/Map.jhm diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/faq.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/faq.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/faq.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/faq.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/generalusage.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/generalusage.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/generalusage.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/generalusage.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/howtoorganize.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/howtoorganize.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/howtoorganize.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/howtoorganize.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/importingdata.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/importingdata.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/importingdata.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/importingdata.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/intro.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/intro.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/intro.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/intro.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/quickplot.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/quickplot.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/quickplot.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/quickplot.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/help/html/usinggnuplot.html diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/ps_coplot.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_coplot.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/ps_coplot.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_coplot.gif diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/ps_error.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_error.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/ps_error.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_error.gif diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/ps_single.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_single.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/ps_single.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/ps_single.gif diff --git a/trick_source/java/src/trick/dataproducts/trickdp/resources/quickplot.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/quickplot.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickdp/resources/quickplot.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickdp/resources/quickplot.gif diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/TrickQPApplication.properties b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/TrickQPApplication.properties similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/TrickQPApplication.properties rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/TrickQPApplication.properties diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/function.gif b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/function.gif similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/function.gif rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/function.gif diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/Help.hs b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/Help.hs similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/Help.hs rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/Help.hs diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/HelpTOC.xml b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/HelpTOC.xml similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/HelpTOC.xml rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/HelpTOC.xml diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/DOCS.TAB diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/OFFSETS diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/POSITIONS diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/SCHEMA diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/JavaHelpSearch/TMAP diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/Map.jhm b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/Map.jhm similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/Map.jhm rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/Map.jhm diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/anatomyofaplot.html diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/general.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/general.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/general.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/general.html diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/guilayout.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/guilayout.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/guilayout.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/guilayout.html diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/intro.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/intro.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/intro.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/intro.html diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/leftovers.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/leftovers.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/leftovers.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/leftovers.html diff --git a/trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/minitutorial.html b/trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/minitutorial.html similarity index 100% rename from trick_source/java/src/trick/dataproducts/trickqp/resources/help/html/minitutorial.html rename to trick_source/java/src/main/resources/trick/dataproducts/trickqp/resources/help/html/minitutorial.html diff --git a/trick_source/java/src/trick/dre/resources/DreApplication.properties b/trick_source/java/src/main/resources/trick/dre/resources/DreApplication.properties similarity index 100% rename from trick_source/java/src/trick/dre/resources/DreApplication.properties rename to trick_source/java/src/main/resources/trick/dre/resources/DreApplication.properties diff --git a/trick_source/java/src/trick/montemonitor/resources/MonteMonitorApplication.properties b/trick_source/java/src/main/resources/trick/montemonitor/resources/MonteMonitorApplication.properties similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/MonteMonitorApplication.properties rename to trick_source/java/src/main/resources/trick/montemonitor/resources/MonteMonitorApplication.properties diff --git a/trick_source/java/src/trick/montemonitor/resources/dice.gif b/trick_source/java/src/main/resources/trick/montemonitor/resources/dice.gif similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/dice.gif rename to trick_source/java/src/main/resources/trick/montemonitor/resources/dice.gif diff --git a/trick_source/java/src/trick/montemonitor/resources/disconnected.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/disconnected.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/disconnected.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/disconnected.png diff --git a/trick_source/java/src/trick/montemonitor/resources/finished.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/finished.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/finished.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/finished.png diff --git a/trick_source/java/src/trick/montemonitor/resources/initializing.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/initializing.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/initializing.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/initializing.png diff --git a/trick_source/java/src/trick/montemonitor/resources/killed.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/killed.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/killed.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/killed.png diff --git a/trick_source/java/src/trick/montemonitor/resources/ready.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/ready.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/ready.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/ready.png diff --git a/trick_source/java/src/trick/montemonitor/resources/running.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/running.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/running.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/running.png diff --git a/trick_source/java/src/trick/montemonitor/resources/stopped.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/stopped.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/stopped.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/stopped.png diff --git a/trick_source/java/src/trick/montemonitor/resources/stopping.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/stopping.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/stopping.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/stopping.png diff --git a/trick_source/java/src/trick/montemonitor/resources/uninitialized.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/uninitialized.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/uninitialized.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/uninitialized.png diff --git a/trick_source/java/src/trick/montemonitor/resources/unknown.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/unknown.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/unknown.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/unknown.png diff --git a/trick_source/java/src/trick/montemonitor/resources/unresponsive-running.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive-running.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/unresponsive-running.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive-running.png diff --git a/trick_source/java/src/trick/montemonitor/resources/unresponsive-stopping.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive-stopping.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/unresponsive-stopping.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive-stopping.png diff --git a/trick_source/java/src/trick/montemonitor/resources/unresponsive.png b/trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive.png similarity index 100% rename from trick_source/java/src/trick/montemonitor/resources/unresponsive.png rename to trick_source/java/src/main/resources/trick/montemonitor/resources/unresponsive.png diff --git a/trick_source/java/src/trick/mtv/MtvView.form b/trick_source/java/src/main/resources/trick/mtv/MtvView.form similarity index 100% rename from trick_source/java/src/trick/mtv/MtvView.form rename to trick_source/java/src/main/resources/trick/mtv/MtvView.form diff --git a/trick_source/java/src/trick/mtv/resources/MtvAboutBox.properties b/trick_source/java/src/main/resources/trick/mtv/resources/MtvAboutBox.properties similarity index 100% rename from trick_source/java/src/trick/mtv/resources/MtvAboutBox.properties rename to trick_source/java/src/main/resources/trick/mtv/resources/MtvAboutBox.properties diff --git a/trick_source/java/src/trick/mtv/resources/MtvApp.properties b/trick_source/java/src/main/resources/trick/mtv/resources/MtvApp.properties similarity index 100% rename from trick_source/java/src/trick/mtv/resources/MtvApp.properties rename to trick_source/java/src/main/resources/trick/mtv/resources/MtvApp.properties diff --git a/trick_source/java/src/trick/mtv/resources/MtvView.properties b/trick_source/java/src/main/resources/trick/mtv/resources/MtvView.properties similarity index 100% rename from trick_source/java/src/trick/mtv/resources/MtvView.properties rename to trick_source/java/src/main/resources/trick/mtv/resources/MtvView.properties diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon0.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon0.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon0.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon0.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon1.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon1.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon1.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon1.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon10.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon10.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon10.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon10.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon11.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon11.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon11.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon11.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon12.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon12.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon12.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon12.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon13.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon13.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon13.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon13.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon14.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon14.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon14.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon14.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon2.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon2.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon2.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon2.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon3.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon3.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon3.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon3.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon4.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon4.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon4.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon4.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon5.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon5.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon5.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon5.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon6.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon6.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon6.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon6.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon7.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon7.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon7.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon7.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon8.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon8.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon8.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon8.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/busy-icon9.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon9.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/busy-icon9.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/busy-icon9.png diff --git a/trick_source/java/src/trick/mtv/resources/busyicons/idle-icon.png b/trick_source/java/src/main/resources/trick/mtv/resources/busyicons/idle-icon.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/busyicons/idle-icon.png rename to trick_source/java/src/main/resources/trick/mtv/resources/busyicons/idle-icon.png diff --git a/trick_source/java/src/trick/mtv/resources/delete_22x22.gif b/trick_source/java/src/main/resources/trick/mtv/resources/delete_22x22.gif similarity index 100% rename from trick_source/java/src/trick/mtv/resources/delete_22x22.gif rename to trick_source/java/src/main/resources/trick/mtv/resources/delete_22x22.gif diff --git a/trick_source/java/src/trick/mtv/resources/fileopen.gif b/trick_source/java/src/main/resources/trick/mtv/resources/fileopen.gif similarity index 100% rename from trick_source/java/src/trick/mtv/resources/fileopen.gif rename to trick_source/java/src/main/resources/trick/mtv/resources/fileopen.gif diff --git a/trick_source/java/src/trick/mtv/resources/filesave.gif b/trick_source/java/src/main/resources/trick/mtv/resources/filesave.gif similarity index 100% rename from trick_source/java/src/trick/mtv/resources/filesave.gif rename to trick_source/java/src/main/resources/trick/mtv/resources/filesave.gif diff --git a/trick_source/java/src/trick/mtv/resources/trick4.gif b/trick_source/java/src/main/resources/trick/mtv/resources/trick4.gif similarity index 100% rename from trick_source/java/src/trick/mtv/resources/trick4.gif rename to trick_source/java/src/main/resources/trick/mtv/resources/trick4.gif diff --git a/trick_source/java/src/trick/mtv/resources/trick_icon.png b/trick_source/java/src/main/resources/trick/mtv/resources/trick_icon.png similarity index 100% rename from trick_source/java/src/trick/mtv/resources/trick_icon.png rename to trick_source/java/src/main/resources/trick/mtv/resources/trick_icon.png diff --git a/trick_source/java/src/trick/sie/resources/SieApplication.properties b/trick_source/java/src/main/resources/trick/sie/resources/SieApplication.properties similarity index 100% rename from trick_source/java/src/trick/sie/resources/SieApplication.properties rename to trick_source/java/src/main/resources/trick/sie/resources/SieApplication.properties diff --git a/trick_source/java/src/trick/simcontrol/resources/SimControlApplication.properties b/trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties similarity index 100% rename from trick_source/java/src/trick/simcontrol/resources/SimControlApplication.properties rename to trick_source/java/src/main/resources/trick/simcontrol/resources/SimControlApplication.properties diff --git a/trick_source/java/src/trick/simcontrol/resources/mtv_22x22.png b/trick_source/java/src/main/resources/trick/simcontrol/resources/mtv_22x22.png similarity index 100% rename from trick_source/java/src/trick/simcontrol/resources/mtv_22x22.png rename to trick_source/java/src/main/resources/trick/simcontrol/resources/mtv_22x22.png diff --git a/trick_source/java/src/trick/simcontrol/resources/throttle_22x22.png b/trick_source/java/src/main/resources/trick/simcontrol/resources/throttle_22x22.png similarity index 100% rename from trick_source/java/src/trick/simcontrol/resources/throttle_22x22.png rename to trick_source/java/src/main/resources/trick/simcontrol/resources/throttle_22x22.png diff --git a/trick_source/java/src/trick/simcontrol/resources/tv_22x22.png b/trick_source/java/src/main/resources/trick/simcontrol/resources/tv_22x22.png similarity index 100% rename from trick_source/java/src/trick/simcontrol/resources/tv_22x22.png rename to trick_source/java/src/main/resources/trick/simcontrol/resources/tv_22x22.png diff --git a/trick_source/java/src/trick/sniffer/resources/SimSnifferApplication.properties b/trick_source/java/src/main/resources/trick/sniffer/resources/SimSnifferApplication.properties similarity index 100% rename from trick_source/java/src/trick/sniffer/resources/SimSnifferApplication.properties rename to trick_source/java/src/main/resources/trick/sniffer/resources/SimSnifferApplication.properties diff --git a/trick_source/java/src/trick/sniffer/resources/nose.gif b/trick_source/java/src/main/resources/trick/sniffer/resources/nose.gif similarity index 100% rename from trick_source/java/src/trick/sniffer/resources/nose.gif rename to trick_source/java/src/main/resources/trick/sniffer/resources/nose.gif diff --git a/trick_source/java/src/trick/tv/jaxb.index b/trick_source/java/src/main/resources/trick/tv/jaxb.index similarity index 100% rename from trick_source/java/src/trick/tv/jaxb.index rename to trick_source/java/src/main/resources/trick/tv/jaxb.index diff --git a/trick_source/java/src/trick/tv/resources/CP.gif b/trick_source/java/src/main/resources/trick/tv/resources/CP.gif similarity index 100% rename from trick_source/java/src/trick/tv/resources/CP.gif rename to trick_source/java/src/main/resources/trick/tv/resources/CP.gif diff --git a/trick_source/java/src/trick/tv/resources/TVApplication.properties b/trick_source/java/src/main/resources/trick/tv/resources/TVApplication.properties similarity index 100% rename from trick_source/java/src/trick/tv/resources/TVApplication.properties rename to trick_source/java/src/main/resources/trick/tv/resources/TVApplication.properties diff --git a/trick_source/java/src/trick/tv/resources/delete_22x22.gif b/trick_source/java/src/main/resources/trick/tv/resources/delete_22x22.gif similarity index 100% rename from trick_source/java/src/trick/tv/resources/delete_22x22.gif rename to trick_source/java/src/main/resources/trick/tv/resources/delete_22x22.gif diff --git a/trick_source/java/src/trick/tv/resources/fileimport.gif b/trick_source/java/src/main/resources/trick/tv/resources/fileimport.gif similarity index 100% rename from trick_source/java/src/trick/tv/resources/fileimport.gif rename to trick_source/java/src/main/resources/trick/tv/resources/fileimport.gif diff --git a/trick_source/java/src/trick/tv/resources/kmplot.gif b/trick_source/java/src/main/resources/trick/tv/resources/kmplot.gif similarity index 100% rename from trick_source/java/src/trick/tv/resources/kmplot.gif rename to trick_source/java/src/main/resources/trick/tv/resources/kmplot.gif diff --git a/trick_source/java/src/trick/tv/resources/trickView.xsd b/trick_source/java/src/main/resources/trick/tv/resources/trickView.xsd similarity index 100% rename from trick_source/java/src/trick/tv/resources/trickView.xsd rename to trick_source/java/src/main/resources/trick/tv/resources/trickView.xsd diff --git a/trick_source/java/src/trick/tv/resources/tv.xsd b/trick_source/java/src/main/resources/trick/tv/resources/tv.xsd similarity index 100% rename from trick_source/java/src/trick/tv/resources/tv.xsd rename to trick_source/java/src/main/resources/trick/tv/resources/tv.xsd diff --git a/trick_source/java/src/trick/tv/resources/tv_32x32.gif b/trick_source/java/src/main/resources/trick/tv/resources/tv_32x32.gif similarity index 100% rename from trick_source/java/src/trick/tv/resources/tv_32x32.gif rename to trick_source/java/src/main/resources/trick/tv/resources/tv_32x32.gif diff --git a/trick_source/java/src/trick/tv/resources/tv_off.png b/trick_source/java/src/main/resources/trick/tv/resources/tv_off.png similarity index 100% rename from trick_source/java/src/trick/tv/resources/tv_off.png rename to trick_source/java/src/main/resources/trick/tv/resources/tv_off.png diff --git a/trick_source/java/src/trick/tv/resources/tv_on.png b/trick_source/java/src/main/resources/trick/tv/resources/tv_on.png similarity index 100% rename from trick_source/java/src/trick/tv/resources/tv_on.png rename to trick_source/java/src/main/resources/trick/tv/resources/tv_on.png diff --git a/trick_source/java/test/Makefile b/trick_source/java/test/Makefile deleted file mode 100644 index 870ec318..00000000 --- a/trick_source/java/test/Makefile +++ /dev/null @@ -1,88 +0,0 @@ -# To run new unit tests, add new tests to the "test" target - -TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..) - -# Get JAVAC definition -include ${TRICK_HOME}/share/trick/makefiles/Makefile.common - -JAVAC ?= javac -JAVAC_FLAGS = -g -Xlint:unchecked -Xlint:deprecation -# delineate 'javac -version' for version number -JAVAC_VERSION := $(shell ${JAVAC} -version 2>&1 | perl -ne 'print /(\d+)/') - -# include java.se.ee for JAXB xml annotations (for trick-tv) in java version 9 -ifeq ($(JAVAC_VERSION),9) - JAVAC_FLAGS += --add-modules java.se.ee -endif -ifeq ($(JAVAC_VERSION),10) - JAVAC_FLAGS += --add-modules java.se.ee -endif - -SRC_DIR = src -SRC_FILES = $(shell find ${SRC_DIR} -type f -name \*.java) -BUILD_DIR = build -DEST_DIR = ${BUILD_DIR}/classes -LIB_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/lib -DIST_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/dist -TEST_DIR = ${TRICK_HOME}/$(LIBEXEC)/trick/java/test -TRICK_TEST = ${TRICK_HOME}/trick_test - -empty := -space := $(empty) $(empty) -CLASS_PATH = $(subst $(space),:,$(wildcard ${LIB_DIR}/*.jar):${DIST_DIR}/trick.jar) - -RESOURCES = $(subst src/,,$(shell find src/trick -name resources)) -RESOURCES += $(subst src/,,$(shell find src/trick -name jaxb.index)) - -all: test - @echo "Java test successful" - -test: ${TEST_DIR}/test.jar ${TRICK_TEST} - @echo "trick.common.RunTimeTrickApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.RunTimeTrickApplicationTest - @echo "trick.common.TrickApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.TrickApplicationTest - @echo "trick.common.utils.LogHeaderReaderTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.utils.LogHeaderReaderTest - @# Error with UnitTypeTest - @# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.common.utils.UnitTypeTest - @echo "trick.dataproducts.trickdp.TrickDPApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dataproducts.trickdp.TrickDPApplicationTest - @echo "trick.dataproducts.trickqp.TrickQPApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dataproducts.trickqp.TrickQPApplicationTest - @echo "trick.dre.DreApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.dre.DreApplicationTest - @echo "trick.montemonitor.MonteMonitorApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.montemonitor.MonteMonitorApplicationTest - @echo "trick.mtv.MtvApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.mtv.MtvApplicationTest - @# SieApplicationTest needs to be updated - @# java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.sie.SieApplicationTest - @echo "trick.sniffer.SnifferApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.sniffer.SnifferApplicationTest - @echo "trick.tv.TrickApplicationTest" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.tv.TVApplicationTest - @echo "trick.simcontrol.SimControlApplicationTest" - @echo "CLICK OK ON GUI TO CONTINUE" - @java -cp "${LIB_DIR}/*:${DIST_DIR}/*:${TEST_DIR}/*" org.junit.runner.JUnitCore trick.simcontrol.SimControlApplicationTest - -${DEST_DIR} ${TEST_DIR} ${TRICK_TEST}: - mkdir -p $@ - -${TEST_DIR}/test.jar: compile ${TEST_DIR} - @echo "Creating jar file..." - @jar cf ${TEST_DIR}/test.jar -C ${DEST_DIR} . - -trick_guis: - @ $(MAKE) -C .. - -compile: ${DEST_DIR} trick_guis - @echo "Building Trick GUI tests .." - @${JAVAC} ${JAVAC_FLAGS} -classpath ${CLASS_PATH} -d ${DEST_DIR} -sourcepath ${SRC_DIR} ${SRC_FILES} - -clean: - rm -rf ${BUILD_DIR} - rm -rf ${TEST_DIR} - -clean_obj: - rm -rf ${BUILD_DIR} diff --git a/trick_source/java/test/resources/S_sie.resource b/trick_source/java/test/resources/S_sie.resource deleted file mode 100644 index b1783806..00000000 --- a/trick_source/java/test/resources/S_sie.resource +++ /dev/null @@ -1,3605 +0,0 @@ - - - - - trick_sys - - - - - - trick_mm - - - - trick_cmd_args - - - - message - - - - - - - - - - trick_ip - - - - monte_carlo - - trick_vs - - - - - - - - - - - - - - data_record - - - - - - - - - - master_slave - - - - - - real_time - - - - - - - - - - instruments - - - - - - dmtcp - - - - zero_conf - - - - utest - - - - ball - - - - - - my_integ_loop - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SIM_MODE - - - 0 - - - - 1 - - - - 4 - - - - 5 - - - - 6 - - - - - TCCommBlocking - - - 0 - - - - 1 - - - - 2 - - - - 3 - - - - - TCCommFlag - - - 0 - - - - 1 - - - - 0 - - - - 1 - - - - 0 - - - - 1 - - - - - Trick::EventBeforeAfter - - - 0 - - - - 1 - - - - 2 - - - - - Trick::MonteCarlo::Verbosity - - - 0 - - - - 1 - - - - 2 - - - - 3 - - - - - Trick::MonteRun::ExitStatus - - - 0 - - - - 1 - - - - 2 - - - - 3 - - - - 4 - - - - 5 - - - - - Trick::MonteSlave::State - - - 0 - - - - 1 - - - - 2 - - - - 3 - - - - 4 - - - - 5 - - - - 6 - - - - 7 - - - - 8 - - - - 9 - - - - - Trick::RemoteShell - - - 0 - - - - 1 - - - - 2 - - - - - TrickErrorLevel - - - 0 - - - - 1 - - - - 2 - - - - 3 - - - - 4 - - - - 5 - - - - 6 - - - - 7 - - - - 8 - - - - diff --git a/trick_source/java/test/resources/log_Ball.header b/trick_source/java/test/resources/log_Ball.header deleted file mode 100644 index 49dd3a74..00000000 --- a/trick_source/java/test/resources/log_Ball.header +++ /dev/null @@ -1,10 +0,0 @@ -log_Ball byte_order is in ASCII -log_Ball double s sys.exec.out.time -log_Ball double m ball.obj.state.output.position[0] -log_Ball double m ball.obj.state.output.position[1] -log_Ball double m/s ball.obj.state.output.velocity[0] -log_Ball double m/s ball.obj.state.output.velocity[1] -log_Ball double m/s2 ball.obj.state.output.acceleration[0] -log_Ball double m/s2 ball.obj.state.output.acceleration[1] -log_Ball double N ball.obj.state.output.external_force[0] -log_Ball double N ball.obj.state.output.external_force[1] diff --git a/trick_source/java/test/resources/log_Ball2.header b/trick_source/java/test/resources/log_Ball2.header deleted file mode 100644 index 20973d80..00000000 --- a/trick_source/java/test/resources/log_Ball2.header +++ /dev/null @@ -1,10 +0,0 @@ -log_Ball2 byte_order is in HDF5 -log_Ball2 double s sys.exec.out.time -log_Ball2 double m ball.obj.state.output.position[0] -log_Ball2 double m ball.obj.state.output.position[1] -log_Ball2 double m/s ball.obj.state.output.velocity[0] -log_Ball2 double m/s ball.obj.state.output.velocity[1] -log_Ball2 double m/s2 ball.obj.state.output.acceleration[0] -log_Ball2 double m/s2 ball.obj.state.output.acceleration[1] -log_Ball2 double N ball.obj.state.output.external_force[0] -log_Ball2 double N ball.obj.state.output.external_force[1] diff --git a/trick_source/java/test/resources/log_Ball3.header b/trick_source/java/test/resources/log_Ball3.header deleted file mode 100644 index e9cb18ea..00000000 --- a/trick_source/java/test/resources/log_Ball3.header +++ /dev/null @@ -1,10 +0,0 @@ -log_Ball3 byte_order is little_endian -log_Ball3 double s sys.exec.out.time -log_Ball3 double m ball.obj.state.output.position[0] -log_Ball3 double m ball.obj.state.output.position[1] -log_Ball3 double m/s ball.obj.state.output.velocity[0] -log_Ball3 double m/s ball.obj.state.output.velocity[1] -log_Ball3 double m/s2 ball.obj.state.output.acceleration[0] -log_Ball3 double m/s2 ball.obj.state.output.acceleration[1] -log_Ball3 double N ball.obj.state.output.external_force[0] -log_Ball3 double N ball.obj.state.output.external_force[1] diff --git a/trick_source/java/test/src/trick/common/CheckApplicationProperties.java b/trick_source/java/test/src/trick/common/CheckApplicationProperties.java deleted file mode 100644 index 8fa29541..00000000 --- a/trick_source/java/test/src/trick/common/CheckApplicationProperties.java +++ /dev/null @@ -1,88 +0,0 @@ -package trick.common; - - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import javax.swing.ActionMap; -import javax.swing.Icon; - -import org.jdesktop.application.ResourceMap; - -/** - * A class for checking different properties of an {@link Application}. - * - * @author Hong Chen - */ -public abstract class CheckApplicationProperties{ - - - public static String getActionText(javax.swing.Action action) { - return (String)action.getValue(javax.swing.Action.NAME); - } - - public static String getActionShortDescription(javax.swing.Action action) { - return (String)action.getValue(javax.swing.Action.SHORT_DESCRIPTION); - } - - // check to see if the action exists (the related @Action code needs to be implemented) - public static javax.swing.Action checkAction(ActionMap aMap, String actionKey) { - javax.swing.Action action = aMap.get(actionKey); - assertNotNull(actionMapGetString(actionKey), action); - return action; - } - - // check to see if the action text exists - public static void checkActionText(ActionMap aMap, String actionKey) { - javax.swing.Action action = checkAction(aMap, actionKey); - assertNotNull(actionMapGetString(actionKey) + ".getValue(javax.swing.Action.Name)", getActionText(action)); - } - - // check to see if the action short description exists - public static void checkActionShortDescription(ActionMap aMap, String actionKey) { - javax.swing.Action action = checkAction(aMap, actionKey); - assertNotNull(actionMapGetString(actionKey) + ".getValue(javax.swing.Action.SHORT_DESCRIPTION)", getActionShortDescription(action)); - } - - // check to see if the action text is as expected - public static void checkActionText(ActionMap aMap, String actionKey, String expectedValue) { - javax.swing.Action action = aMap.get(actionKey); - assertEquals(actionMapGetString(actionKey) + ".getValue(javax.swing.Action.Name)", expectedValue, (String)action.getValue(javax.swing.Action.NAME)); - } - - // check to see if the action short description is as expected - public static void checkActionShortDescription(ActionMap aMap, String actionKey, String expectedValue) { - javax.swing.Action action = checkAction(aMap, actionKey); - assertEquals(actionMapGetString(actionKey) + ".getValue(javax.swing.Action.SHORT_DESCRIPTION)", expectedValue, getActionShortDescription(action)); - } - - // check to see if the action icon is specified - public static void checkActionIcon(ActionMap aMap, String actionKey) { - javax.swing.Action action = checkAction(aMap, actionKey); - Icon icon = (Icon)(action.getValue(javax.swing.Action.SMALL_ICON)); - assertNotNull(actionMapGetString(actionKey) + ".getValue(javax.swing.Action.SMALL_ICON)", icon); - } - - // check to see if the text of a key is defined - public static void checkKeyText(ResourceMap rMap, String key) { - assertNotNull(rMap.getString(key)); - } - - // check to see if the text of a key is as expected - public static void checkKeyText(ResourceMap rMap, String key, String expectedValue) { - String keyText = rMap.getString(key); - assertNotNull(keyText); - if (expectedValue != null) { - assertEquals(resourceMapGetString(key), expectedValue, keyText); - } - } - - private static String actionMapGetString(String actionKey) { - return "ActionMap.get(\"" + actionKey + "\")"; - } - - private static String resourceMapGetString(String key) { - return "ResourceMap.get(\"" + key + "\")"; - } - -} diff --git a/trick_source/java/test/src/trick/common/RunTimeTrickApplicationTest.java b/trick_source/java/test/src/trick/common/RunTimeTrickApplicationTest.java deleted file mode 100644 index 353fe805..00000000 --- a/trick_source/java/test/src/trick/common/RunTimeTrickApplicationTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package trick.common; - - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.BeforeClass; -import org.junit.Test; - - - -/** - * Test the Actions that are defined by the {@link RunTimeTrickApplication}. - * Depends on ResourceBundle resources/RunTimeTrickApplication.properties - * - * @author Hong Chen - */ -public class RunTimeTrickApplicationTest { - - @BeforeClass - public static void unitSetup() { - WaitForRunTimeTrickApplication.launchAndWait(WaitForRunTimeTrickApplication.class); - } - - @Test - public void testReady() { - assertTrue("TrickApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - /*@Test - public void testDefinedActions() { - String[] actionNames = {"connect", "disconnect"}; - String[] actionTexts = {"Connect", "Disconnect"}; - String[] actionShortDescriptions = {"Connect to the simulation.", "Disconnect from the simulation."}; - for (int i = 0; i< actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - }*/ - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForRunTimeTrickApplication application() { - return Application.getInstance(WaitForRunTimeTrickApplication.class); - } - -} diff --git a/trick_source/java/test/src/trick/common/TrickApplicationTest.java b/trick_source/java/test/src/trick/common/TrickApplicationTest.java deleted file mode 100644 index bb9f7e61..00000000 --- a/trick_source/java/test/src/trick/common/TrickApplicationTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package trick.common; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Test TrickApplication life cycle. - * - * @author hchen - * - */ -public class TrickApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForTrickApplication.launchAndWait(WaitForTrickApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("TrickApplicationTest is not ready yet!", application().isReady()); - } - - @Test - public void testPropertyLocation() { - application(); - application(); - boolean rightLocation = (TrickApplication.propDirectory.equals(System.getenv("HOME") + java.io.File.separator + ".trick")) - || (TrickApplication.propDirectory.equals(System.getenv("TRICK_USER_HOME") + java.io.File.separator + ".trick")); - assertTrue("The default property location is not at ../.trick!", rightLocation); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"exitConfirmation", "helpContents", "showAboutBox", "closeAboutBox"}; - String[] actionTexts = {"Show Exit Confirmation Prompt", "Help Contents", "About...", "OK"}; - String[] actionShortDescriptions = {"Turn On/Off popup box that verifies if the user really wants to close this application.", - "Show Help Contents", "Show the application's about box dialog", "Close the about box dialog"}; - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - } - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForTrickApplication application() { - return Application.getInstance(WaitForTrickApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/common/WaitForRunTimeTrickApplication.java b/trick_source/java/test/src/trick/common/WaitForRunTimeTrickApplication.java deleted file mode 100644 index f833e7d3..00000000 --- a/trick_source/java/test/src/trick/common/WaitForRunTimeTrickApplication.java +++ /dev/null @@ -1,57 +0,0 @@ -package trick.common; - - -import javax.swing.JComponent; -import javax.swing.JPanel; - -import org.jdesktop.application.Application; - - -public class WaitForRunTimeTrickApplication extends RunTimeTrickApplication { - static Object lock = new Object(); - - boolean isEnded; - - protected JComponent createMainPanel() { - return new JPanel(); - } - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - /** - * Launch the specified subclsas of RunTimeTrickApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForRunTimeTrickApplication.class); - if (app instanceof WaitForRunTimeTrickApplication) { - if (((WaitForRunTimeTrickApplication)app).isReady()) { - break; - } - } - } - } - } - -} diff --git a/trick_source/java/test/src/trick/common/WaitForTrickApplication.java b/trick_source/java/test/src/trick/common/WaitForTrickApplication.java deleted file mode 100644 index 895ea931..00000000 --- a/trick_source/java/test/src/trick/common/WaitForTrickApplication.java +++ /dev/null @@ -1,57 +0,0 @@ -package trick.common; - - -import javax.swing.JComponent; -import javax.swing.JPanel; - -import org.jdesktop.application.Application; - - -public class WaitForTrickApplication extends TrickApplication { - static Object lock = new Object(); - - boolean isEnded; - - protected JComponent createMainPanel() { - return new JPanel(); - } - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of TrickApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForTrickApplication.class); - if (app instanceof WaitForTrickApplication) { - if (((WaitForTrickApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java b/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java deleted file mode 100644 index e7b41ecc..00000000 --- a/trick_source/java/test/src/trick/common/utils/LogHeaderReaderTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package trick.common.utils; - - -import static org.junit.Assert.assertArrayEquals; - -import java.io.FileNotFoundException; -import java.io.IOException; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - - -public class LogHeaderReaderTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test(expected = FileNotFoundException.class) - public void testGetContentsWithNotFoundFile() throws FileNotFoundException, IOException { - DataReader reader = new LogHeaderReader("resources" + java.io.File.separator + "unknowFile.header"); - reader.processHeader(); - } - - @Test - public void testGetContents() throws FileNotFoundException { - LogVar[] expectedVarList = new LogVar[9]; - - expectedVarList[0] = new LogVar("sys.exec.out.time"); - expectedVarList[0].setUnits("s"); - expectedVarList[1] = new LogVar("ball.obj.state.output.position[0]"); - expectedVarList[1].setUnits("m"); - expectedVarList[2] = new LogVar("ball.obj.state.output.position[1]"); - expectedVarList[2].setUnits("m"); - expectedVarList[3] = new LogVar("ball.obj.state.output.velocity[0]"); - expectedVarList[3].setUnits("m/s"); - expectedVarList[4] = new LogVar("ball.obj.state.output.velocity[1]"); - expectedVarList[4].setUnits("m/s"); - expectedVarList[5] = new LogVar("ball.obj.state.output.acceleration[0]"); - expectedVarList[5].setUnits("m/s2"); - expectedVarList[6] = new LogVar("ball.obj.state.output.acceleration[1]"); - expectedVarList[6].setUnits("m/s2"); - expectedVarList[7] = new LogVar("ball.obj.state.output.external_force[0]"); - expectedVarList[7].setUnits("N"); - expectedVarList[8] = new LogVar("ball.obj.state.output.external_force[1]"); - expectedVarList[8].setUnits("N"); - - // ASCII - DataReader reader = new LogHeaderReader("resources" + java.io.File.separator + "log_Ball.header"); - assertArrayEquals("Error in getContents for ASCII in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray()); - - // HDF5 - reader = new LogHeaderReader("resources" + java.io.File.separator + "log_Ball2.header"); - assertArrayEquals("Error in getContents for HDF5 in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray()); - - // little_endian - reader = new LogHeaderReader("resources" + java.io.File.separator + "log_Ball3.header"); - assertArrayEquals("Error in getContents for little_endian in DataReader.java", expectedVarList, reader.getRecordedVarList().toArray()); - } - -} diff --git a/trick_source/java/test/src/trick/common/utils/UnitTypeTest.java b/trick_source/java/test/src/trick/common/utils/UnitTypeTest.java deleted file mode 100644 index 16680f25..00000000 --- a/trick_source/java/test/src/trick/common/utils/UnitTypeTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package trick.common.utils; - -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.utils.UnitType.IllegalUnitConversionException; - -public class UnitTypeTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testGetPermutationList() { - String units = "m/s"; - - String[] expectedPermutableList = new String[] { - "m/s", "m/ps", "m/ns", "m/us", "m/ms", "m/cs", "m/ds", "m/das", "m/hs", "m/ks", "m/Ms", "m/Gs", "m/Ts", "m/min", "m/hr", "m/day", - "pm/s", "pm/ps", "pm/ns", "pm/us", "pm/ms", "pm/cs", "pm/ds", "pm/das", "pm/hs", "pm/ks", "pm/Ms", "pm/Gs", "pm/Ts", "pm/min", "pm/hr", "pm/day", - "nm/s", "nm/ps", "nm/ns", "nm/us", "nm/ms", "nm/cs", "nm/ds", "nm/das", "nm/hs", "nm/ks", "nm/Ms", "nm/Gs", "nm/Ts", "nm/min", "nm/hr", "nm/day", - "um/s", "um/ps", "um/ns", "um/us", "um/ms", "um/cs", "um/ds", "um/das", "um/hs", "um/ks", "um/Ms", "um/Gs", "um/Ts", "um/min", "um/hr", "um/day", - "mm/s", "mm/ps", "mm/ns", "mm/us", "mm/ms", "mm/cs", "mm/ds", "mm/das", "mm/hs", "mm/ks", "mm/Ms", "mm/Gs", "mm/Ts", "mm/min", "mm/hr", "mm/day", - "cm/s", "cm/ps", "cm/ns", "cm/us", "cm/ms", "cm/cs", "cm/ds", "cm/das", "cm/hs", "cm/ks", "cm/Ms", "cm/Gs", "cm/Ts", "cm/min", "cm/hr", "cm/day", - "dm/s", "dm/ps", "dm/ns", "dm/us", "dm/ms", "dm/cs", "dm/ds", "dm/das", "dm/hs", "dm/ks", "dm/Ms", "dm/Gs", "dm/Ts", "dm/min", "dm/hr", "dm/day", - "dam/s", "dam/ps", "dam/ns", "dam/us", "dam/ms", "dam/cs", "dam/ds", "dam/das", "dam/hs", "dam/ks", "dam/Ms", "dam/Gs", "dam/Ts", "dam/min", "dam/hr", "dam/day", - "hm/s", "hm/ps", "hm/ns", "hm/us", "hm/ms", "hm/cs", "hm/ds", "hm/das", "hm/hs", "hm/ks", "hm/Ms", "hm/Gs", "hm/Ts", "hm/min", "hm/hr", "hm/day", - "km/s", "km/ps", "km/ns", "km/us", "km/ms", "km/cs", "km/ds", "km/das", "km/hs", "km/ks", "km/Ms", "km/Gs", "km/Ts", "km/min", "km/hr", "km/day", - "Mm/s", "Mm/ps", "Mm/ns", "Mm/us", "Mm/ms", "Mm/cs", "Mm/ds", "Mm/das", "Mm/hs", "Mm/ks", "Mm/Ms", "Mm/Gs", "Mm/Ts", "Mm/min", "Mm/hr", "Mm/day", - "Gm/s", "Gm/ps", "Gm/ns", "Gm/us", "Gm/ms", "Gm/cs", "Gm/ds", "Gm/das", "Gm/hs", "Gm/ks", "Gm/Ms", "Gm/Gs", "Gm/Ts", "Gm/min", "Gm/hr", "Gm/day", - "Tm/s", "Tm/ps", "Tm/ns", "Tm/us", "Tm/ms", "Tm/cs", "Tm/ds", "Tm/das", "Tm/hs", "Tm/ks", "Tm/Ms", "Tm/Gs", "Tm/Ts", "Tm/min", "Tm/hr", "Tm/day", - "in/s", "in/ps", "in/ns", "in/us", "in/ms", "in/cs", "in/ds", "in/das", "in/hs", "in/ks", "in/Ms", "in/Gs", "in/Ts", "in/min", "in/hr", "in/day", - "ft/s", "ft/ps", "ft/ns", "ft/us", "ft/ms", "ft/cs", "ft/ds", "ft/das", "ft/hs", "ft/ks", "ft/Ms", "ft/Gs", "ft/Ts", "ft/min", "ft/hr", "ft/day", - "kft/s", "kft/ps", "kft/ns", "kft/us", "kft/ms", "kft/cs", "kft/ds", "kft/das", "kft/hs", "kft/ks", "kft/Ms", "kft/Gs", "kft/Ts", "kft/min", "kft/hr", "kft/day", - "yd/s", "yd/ps", "yd/ns", "yd/us", "yd/ms", "yd/cs", "yd/ds", "yd/das", "yd/hs", "yd/ks", "yd/Ms", "yd/Gs", "yd/Ts", "yd/min", "yd/hr", "yd/day", - "mi/s", "mi/ps", "mi/ns", "mi/us", "mi/ms", "mi/cs", "mi/ds", "mi/das", "mi/hs", "mi/ks", "mi/Ms", "mi/Gs", "mi/Ts", "mi/min", "mi/hr", "mi/day", - "n.m./s", "n.m./ps", "n.m./ns", "n.m./us", "n.m./ms", "n.m./cs", "n.m./ds", "n.m./das", "n.m./hs", "n.m./ks", "n.m./Ms", "n.m./Gs", "n.m./Ts", "n.m./min", "n.m./hr", "n.m./day" - - }; - assertArrayEquals("The permutable list of units (m/s) is wrong. Error in getPermutationList in UnitsUtils.java", expectedPermutableList, UnitType.getAll(units).toArray()); - } - - @Test - public void testIsPermutable() { - assertTrue("m/s2 and km/min2 should be convertable", UnitType.isConvertible("m/s2", "km/min2")); - assertTrue("kg*m/s2 and lbm*ft/s2 should be convertable", UnitType.isConvertible("kg*m/s2", "lbm*ft/s2")); - } - - @Test - public void getUnitType() { - assertNull("Foo UnitType doesn't exist", UnitType.getType("Foo")); - assertNotNull("das (s with da meaning deca- prefix) UnitType should exist", UnitType.getType("das")); - } - - @Test(expected=UnitType.IllegalUnitConversionException.class) - public void testIllegalConvertUnits() throws IllegalUnitConversionException { - UnitType.convertUnits(1.0, "g", "s"); - } - - @Test - public void testConvertUnits() throws IllegalUnitConversionException { - assertEquals("20s (second) = 1/3min (minute)", 1.0/3.0, UnitType.convertUnits(20.0, "s", "min"), 0.01); - assertEquals("20m = 1/3hr", 1.0/3.0, UnitType.convertUnits(20.0, "min", "hr"), 0.01); - assertEquals("1 C = 274.15K", 274.15, UnitType.convertUnits(1.0, "C", "K"), 0.001); - assertEquals("1 C = 33.8F", 33.8, UnitType.convertUnits(1.0, "C", "F"), 0.001); - assertEquals("1 C = 493.47R", 493.47, UnitType.convertUnits(1.0, "C", "R"), 0.001); - assertEquals("17 Celsius = 62.599999999999994 Fahrenheit", 62.599999999999994, UnitType.convertUnits(17.0, "C", "F"), 0.01); - assertEquals("1 F = 255.927778K", 255.927778, UnitType.convertUnits(1.0, "F", "K"), 0.001); - //assertEquals("1 K = 1.8R", 1.8, UnitType.convertUnits(1.0, "K", "R"), 0.001); - assertEquals("1s = 1000000us", 1000000.0, UnitType.convertUnits(1.0, "s", "us"), 0.001); - assertEquals("1g = 0.0022046226229374033lbm", new Double(0.0022046226229374033), UnitType.convertUnits(1.0, "g", "lbm"), 0.01); - assertEquals("1g = 0.001kg", 0.001, UnitType.convertUnits(1.0, "g", "kg"), 0.001); - assertEquals("1 lbm/ft3 = 16.019 kg/m3", 16.01846336605033, UnitType.convertUnits(1.0, "lbm/ft3", "kg/m3"), 0.01); - assertEquals("1 kg*m/s2 = 1 lbm*ft/s2", 7.233013854781507, UnitType.convertUnits(1.0, "kg*m/s/s", "lbm*ft/s/s"), 0.01); - assertEquals("1 Mhz = 1000000 Hz", 1000000.0, UnitType.convertUnits(1.0, "MHz", "Hz"), 0.001); - assertEquals("1 J/kg*K = 0.001 J/g*C", 0.001, UnitType.convertUnits(1.0, "J/kg*K", "J/g*C"), 0.001); - assertEquals("1 BTU/lbf/C = 1.798796216558 BTU/lbf/F", 1.798796216558, UnitType.convertUnits(1.0, "BTU/lbf/C", "BTU/lbf/F"), 0.01); - assertEquals("1 K*m2/W = 1.798796216558 F*m2/W", 1.798796216558, UnitType.convertUnits(1.0, "K*m2/W", "F*m2/W"), 0.01); - } -} diff --git a/trick_source/java/test/src/trick/dataproducts/trickdp/TrickDPApplicationTest.java b/trick_source/java/test/src/trick/dataproducts/trickdp/TrickDPApplicationTest.java deleted file mode 100644 index 39708767..00000000 --- a/trick_source/java/test/src/trick/dataproducts/trickdp/TrickDPApplicationTest.java +++ /dev/null @@ -1,100 +0,0 @@ -package trick.dataproducts.trickdp; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test TrickDPApplication life cycle. - * - * @author hchen - * - */ -public class TrickDPApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForTrickDPApplication.launchAndWait(WaitForTrickDPApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("TrickDPApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"newSession", "openSession", "saveSession", "refreshSession", "importSimDir", "addRunDir", - "addDP", "editSelectedDP", "editRightClickedDP", "filterDP", "gnuSinglePlot", "gnuComparisonPlot", - "gnuErrorPlot", "quickPlot", "createPDF", "addRuns", "readDPList", "openSelected", - "closeSelected", "removeSelectedNodes", "addDPs", "removeSelectedItems", "removeAllItems", "runSim", - "refreshSelected"}; - String[] actionTexts = {"New...", "Open...", "Save...", "Refresh...", "Import Sim Dir...", "Add Run Dir...", "Add DP...", - "Edit DP...", "Edit DP...", "Filter...", "GNUplot Postscript Single Plot...", - "GNUplot Postscript Comparison Plot...", "GNUplot Postscript Error Plot...", - "Quickplot...", "Create PDF Booklet...", "Add run(s)", "Read DP List", "Opentree", - "Closetree", "Remove", "Add DPs", "Remove", "Remove All", "Run Sim", "Refresh"}; - String[] actionShortDescriptions = {"Start a New Session", "Open an Existing Session", "Save Current Session", - "Refresh Current Session", "Import Sim Directory to Current Session", - "Add a Run Directory to Current Session", "Add a Data Product file to Current Session", - "Open Quickplot to edit the Selected Data Product from DP Selections", "Open Quickplot to edit the Selected Data Product file", - "Filter the Displayed Data Product files", - "Show GNU Postscript Single Plot", "Show GNU Postscript Comparison Plot", - "Show GNU Postscript Error Plot", "Quick Plot", "Create PDF Booklet...", "Selects run(s)", - "Add DP List in Selected SIM Directory", "Open Selected Tree Nodes", "Close Selected Tree Nodes", - "Remove Selected Node(s)", "Add Selected to DP List", "Remove Selected List Item(s)", - "Remove All List Items", "Run Selected Sim", "Refresh the Selected Nodes of the Tree"}; - - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - } - - @Test - public void testDefinedKeyText() { - String[] keyNames = {"fileMenu.text", "sessionMenu.text", "simsRunsMenu.text", "dataProductMenu.text", - "settingsMenu.text", "actionsMenu.text", "helpMenu.text"}; - String[] keyTexts = {"&File", "&Session", "Sims/&Runs", "&Data Product", "Se&ttings", "&Actions", "&Help"}; - - for (int i = 0; i < keyNames.length; i++) { - CheckApplicationProperties.checkKeyText(application().resourceMap, keyNames[i], keyTexts[i]); - } - - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForTrickDPApplication application() { - return Application.getInstance(WaitForTrickDPApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/dataproducts/trickdp/WaitForTrickDPApplication.java b/trick_source/java/test/src/trick/dataproducts/trickdp/WaitForTrickDPApplication.java deleted file mode 100644 index ffed30af..00000000 --- a/trick_source/java/test/src/trick/dataproducts/trickdp/WaitForTrickDPApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.dataproducts.trickdp; - - -import org.jdesktop.application.Application; - - -public class WaitForTrickDPApplication extends TrickDPApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclass of TrickDPApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForTrickDPApplication.class); - if (app instanceof WaitForTrickDPApplication) { - if (((WaitForTrickDPApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/dataproducts/trickqp/TrickQPApplicationTest.java b/trick_source/java/test/src/trick/dataproducts/trickqp/TrickQPApplicationTest.java deleted file mode 100644 index 397fff04..00000000 --- a/trick_source/java/test/src/trick/dataproducts/trickqp/TrickQPApplicationTest.java +++ /dev/null @@ -1,94 +0,0 @@ -package trick.dataproducts.trickqp; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test TrickQPApplication life cycle. - * - * @author hchen - * - */ -public class TrickQPApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForTrickQPApplication.launchAndWait(WaitForTrickQPApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("TrickQPApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"searchVar", "newDP", "openDP", "refreshDP", "saveDP", "saveAsDP", - "addVar", "expandVar", "contractVar", "changeUnits", "addRun", "removeRun", - "newPage", "removeAllPages", "newPlot", "newCurve", "newVarcase", - "newTable", "newColumn", "removeTable"}; - String[] actionTexts = {"Search", "New DP...", "Open DP...", "Refresh...", "Save...", "Save As...", "Add Var", - "Expand Var", "Contract Var", "Change Units...", "Add Run...", "Remove Run", - "New Page", "Remove All Pages", "New Plot", "New Curve", "New Varcase", - "New Table", "New Column", "Remove All Tables"}; - String[] actionShortDescriptions = {"Search Variables (all variables return if leave it blank)", - "Start a New DP", "Open an Existing DP File", "Refresh DP", - "Save Current DP", "Save Current DP As", "Add Selected Variables", - "Expand Selected Variables / All", "Contract Selected Variables / All", - "Change Units", "Add Run Directories", "Remove Selected Run Directories", - "Add a New Page", "Remove All Pages", "Add a New Plot", "Add a New Curve", - "Add One Variable Group Option for the Curve", "Add a New Table", - "Add a New Column to Table", "Remove All Tables"}; - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - } - - @Test - public void testDefinedKeyText() { - String[] keyNames = {"varsMenu.text", "runsMenu.text", "plotsMenu.text", "tablesMenu.text", - "programsMenu.text", "settingsMenu.text", "actionsMenu.text", "helpMenu.text"}; - String[] keyTexts = {"&Vars", "&Runs", "&Plots", "&Tables", "Pro&grams", "&Settings", "&Actions", "&Help"}; - - for (int i = 0; i < keyNames.length; i++) { - CheckApplicationProperties.checkKeyText(application().resourceMap, keyNames[i], keyTexts[i]); - } - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForTrickQPApplication application() { - return Application.getInstance(WaitForTrickQPApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/dataproducts/trickqp/WaitForTrickQPApplication.java b/trick_source/java/test/src/trick/dataproducts/trickqp/WaitForTrickQPApplication.java deleted file mode 100644 index 52e7ea48..00000000 --- a/trick_source/java/test/src/trick/dataproducts/trickqp/WaitForTrickQPApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.dataproducts.trickqp; - - -import org.jdesktop.application.Application; - - -public class WaitForTrickQPApplication extends TrickQPApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclass of TrickDPApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForTrickQPApplication.class); - if (app instanceof WaitForTrickQPApplication) { - if (((WaitForTrickQPApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/dre/DreApplicationTest.java b/trick_source/java/test/src/trick/dre/DreApplicationTest.java deleted file mode 100644 index 86055926..00000000 --- a/trick_source/java/test/src/trick/dre/DreApplicationTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package trick.dre; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test DreApplication life cycle. - * - * @author hchen - * - */ -public class DreApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForDreApplication.launchAndWait(WaitForDreApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("DreApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"openDR", "saveDR", "selectDRBinary", "selectDRAscii", "selectDRHDF5", - "selectDRAlways", "selectDRChanges", "selectDRStepChanges", "toggleSinglePrecision", - "selectDRBuffer", "selectDRNoBuffer", "selectDRRingBuffer", "selectDRThreadBuffer", - "addVariables", "removeSelected", "removeAll"}; - String[] actionTexts = {"Open...", "Save...", "DR Binary", "DR Ascii", "DR HDF5", "DR Always", "DR Changes", - "DR Step Changes", "Single Precision", "DR Buffer", "DR No Buffer", "DR Ring Buffer", - "DR Thread Buffer", "Add", "Remove Selected", "Remove All"}; - - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - } - } - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "optionsMenu.text", "&Options"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForDreApplication application() { - return Application.getInstance(WaitForDreApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/dre/WaitForDreApplication.java b/trick_source/java/test/src/trick/dre/WaitForDreApplication.java deleted file mode 100644 index f501f018..00000000 --- a/trick_source/java/test/src/trick/dre/WaitForDreApplication.java +++ /dev/null @@ -1,51 +0,0 @@ -package trick.dre; - - -import org.jdesktop.application.Application; - - -public class WaitForDreApplication extends DreApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of DreApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - sieResourcePath ="resources" + java.io.File.separator + "S_sie.resource"; - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForDreApplication.class); - if (app instanceof WaitForDreApplication) { - if (((WaitForDreApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/montemonitor/MonteMonitorApplicationTest.java b/trick_source/java/test/src/trick/montemonitor/MonteMonitorApplicationTest.java deleted file mode 100644 index 9b3d4227..00000000 --- a/trick_source/java/test/src/trick/montemonitor/MonteMonitorApplicationTest.java +++ /dev/null @@ -1,81 +0,0 @@ -package trick.montemonitor; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test MonteMonitorApplication life cycle. - * - * @author hchen - * - */ -public class MonteMonitorApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForMonteMonitorApplication.launchAndWait(WaitForMonteMonitorApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("MonteMonitorApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - /*@Test - public void testDefinedActions() { - String[] actionNames = {"stopMonteCarlo", "runMonteCarlo", "runSelectedSlaves", "stopSelectedSlaves", "addNewSlave"}; - String[] actionTexts = {"Stop", "Start", "Start", "Stop", "Add"}; - String[] actionShortDescriptions = {"Dispatch no further runs to any slave. Allow current runs to complete.", - "Begin dispatching runs to all live slaves.", - "Begin dispatching runs to all live selected slaves.", - "Dispatch no further jobs to the selected slaves. Allow current runs to complete.", - "Add and start a new slave."}; - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - }*/ - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - //CheckApplicationProperties.checkKeyText(application().resourceMap, "monteMenu.text", "&Monte Carlo"); - //CheckApplicationProperties.checkKeyText(application().resourceMap, "slavesMenu.text", "&Slaves"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForMonteMonitorApplication application() { - return Application.getInstance(WaitForMonteMonitorApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/montemonitor/WaitForMonteMonitorApplication.java b/trick_source/java/test/src/trick/montemonitor/WaitForMonteMonitorApplication.java deleted file mode 100644 index 016d3bb1..00000000 --- a/trick_source/java/test/src/trick/montemonitor/WaitForMonteMonitorApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.montemonitor; - - -import org.jdesktop.application.Application; - - -public class WaitForMonteMonitorApplication extends MonteMonitorApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of MonteMonitorApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForMonteMonitorApplication.class); - if (app instanceof WaitForMonteMonitorApplication) { - if (((WaitForMonteMonitorApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/mtv/MtvApplicationTest.java b/trick_source/java/test/src/trick/mtv/MtvApplicationTest.java deleted file mode 100644 index bf6acbbb..00000000 --- a/trick_source/java/test/src/trick/mtv/MtvApplicationTest.java +++ /dev/null @@ -1,62 +0,0 @@ -package trick.mtv; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test MtvApplication life cycle. - * - * @author hchen - * - */ -public class MtvApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForMtvApplication.launchAndWait(WaitForMtvApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("MtvApplicationTest is not ready yet!", application().isReady()); - } - - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "default_event_directory", "./Modified_data"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForMtvApplication application() { - return Application.getInstance(WaitForMtvApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/mtv/WaitForMtvApplication.java b/trick_source/java/test/src/trick/mtv/WaitForMtvApplication.java deleted file mode 100644 index 4cefaf18..00000000 --- a/trick_source/java/test/src/trick/mtv/WaitForMtvApplication.java +++ /dev/null @@ -1,49 +0,0 @@ -package trick.mtv; - - -import org.jdesktop.application.Application; - - -public class WaitForMtvApplication extends MtvApp { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - /** - * Launch the specified subclsas of MtvApp and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForMtvApplication.class); - if (app instanceof WaitForMtvApplication) { - if (((WaitForMtvApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/sie/SieApplicationTest.java b/trick_source/java/test/src/trick/sie/SieApplicationTest.java deleted file mode 100644 index ccf4dee9..00000000 --- a/trick_source/java/test/src/trick/sie/SieApplicationTest.java +++ /dev/null @@ -1,74 +0,0 @@ -package trick.sie; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test SieApplication life cycle. - * - * @author hchen - * - */ -public class SieApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForSieApplication.launchAndWait(WaitForSieApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("SieApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"saveVariableDetails", "showVariableDetails"}; - String[] actionTexts = {"Save Variable Details ...", "Show Details"}; - - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - } - } - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForSieApplication application() { - return Application.getInstance(WaitForSieApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/sie/WaitForSieApplication.java b/trick_source/java/test/src/trick/sie/WaitForSieApplication.java deleted file mode 100644 index 87799b16..00000000 --- a/trick_source/java/test/src/trick/sie/WaitForSieApplication.java +++ /dev/null @@ -1,51 +0,0 @@ -package trick.sie; - - -import org.jdesktop.application.Application; - - -public class WaitForSieApplication extends SieApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of SieApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - sieResourcePath = "resources" + java.io.File.separator + "S_sie.resource"; - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForSieApplication.class); - if (app instanceof WaitForSieApplication) { - if (((WaitForSieApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/simcontrol/SimControlApplicationTest.java b/trick_source/java/test/src/trick/simcontrol/SimControlApplicationTest.java deleted file mode 100644 index 65f2c902..00000000 --- a/trick_source/java/test/src/trick/simcontrol/SimControlApplicationTest.java +++ /dev/null @@ -1,86 +0,0 @@ -package trick.simcontrol; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test SimControlApplication life cycle. - * - * @author hchen - * - */ -public class SimControlApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForSimControlApplication.launchAndWait(WaitForSimControlApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("SimControlApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - @Test - public void testDefinedActions() { - String[] actionNames = {"saveStatusMsgs", "clearStatusMsgs", "startTV", "startMTV", "freezeAt", "freezeIn", - "checkpointObjects", "throttle", "connect", "stepSim", "recordingSim", "startSim", - "realtime", "freezeSim", "dumpDMTCPChkpnt", "dumpChkpntASCII", "shutdownSim", "loadChkpnt", "lite"}; - String[] actionTexts = {"Save Status Msgs...", "Clear Status Msgs...", "Start Trick View", - "Start Event/Malfunction Trick View", "Freeze At...", "Freeze In...", - "Checkpoint Objects...", "Throttle...", "Connect", "Step", "Data Rec On", - "Start", "RealTime On", "Freeze", "Dump DMTCP Chkpnt", "Dump Chkpnt", "Shutdown", "Load Chkpnt", "Lite"}; - String[] actionShortDescriptions = {"Save Status Messages", "Clear Status Messages", "Start Trick View (TV)", - "Start Event/Malfunction Trick View (MTV)", "Freeze At", "Freeze In", - "Checkpoint the specified objects", "Throttle", "Connect to the specified server at specified port", - "Step through sim initialization", "Data Recording On/Off", "Start the simulation", - "Realtime on/off", "Freeze/Stop the simulation", "Dump DMTCP Checkpoint", "Dump ASCII Checkpoint", - "Shutdown Simulation", "Load ASCII Checkpoint", "Lite/Full"}; - - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - } - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForSimControlApplication application() { - return Application.getInstance(WaitForSimControlApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/simcontrol/WaitForSimControlApplication.java b/trick_source/java/test/src/trick/simcontrol/WaitForSimControlApplication.java deleted file mode 100644 index 15fd1807..00000000 --- a/trick_source/java/test/src/trick/simcontrol/WaitForSimControlApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.simcontrol; - - -import org.jdesktop.application.Application; - - -public class WaitForSimControlApplication extends SimControlApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of SimControlApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForSimControlApplication.class); - if (app instanceof WaitForSimControlApplication) { - if (((WaitForSimControlApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/sniffer/SnifferApplicationTest.java b/trick_source/java/test/src/trick/sniffer/SnifferApplicationTest.java deleted file mode 100644 index 8f7ae6c0..00000000 --- a/trick_source/java/test/src/trick/sniffer/SnifferApplicationTest.java +++ /dev/null @@ -1,76 +0,0 @@ -package trick.sniffer; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test SnifferApplication life cycle. - * - * @author hchen - * - */ -public class SnifferApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForSnifferApplication.launchAndWait(WaitForSnifferApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("SnifferApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - /* @Test - public void testDefinedActions() { - String[] actionNames = {"launchSimControlPanel", "launchTrickView"}; - String[] actionTexts = {"Launch Sim Control Panel", "Launch Trick View"}; - String[] actionShortDescriptions = {"Launch the Sim Control Panel and connect it to the selected simulation.", - "Launch Trick View and connect it to the selected simulation."}; - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - }*/ - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForSnifferApplication application() { - return Application.getInstance(WaitForSnifferApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/sniffer/WaitForSnifferApplication.java b/trick_source/java/test/src/trick/sniffer/WaitForSnifferApplication.java deleted file mode 100644 index a17db831..00000000 --- a/trick_source/java/test/src/trick/sniffer/WaitForSnifferApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.sniffer; - - -import org.jdesktop.application.Application; - - -public class WaitForSnifferApplication extends SimSnifferApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of SnifferApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForSnifferApplication.class); - if (app instanceof WaitForSnifferApplication) { - if (((WaitForSnifferApplication)app).isReady()) { - break; - } - } - } - } - } -} diff --git a/trick_source/java/test/src/trick/tv/TVApplicationTest.java b/trick_source/java/test/src/trick/tv/TVApplicationTest.java deleted file mode 100644 index f49f8204..00000000 --- a/trick_source/java/test/src/trick/tv/TVApplicationTest.java +++ /dev/null @@ -1,92 +0,0 @@ -package trick.tv; - -import static org.junit.Assert.assertTrue; - -import org.jdesktop.application.Application; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import trick.common.CheckApplicationProperties; - -/** - * - * Test TVApplication life cycle. - * - * @author hchen - * - */ -public class TVApplicationTest { - - @BeforeClass - public static void setUpBeforeClass() throws Exception { - WaitForTVApplication.launchAndWait(WaitForTVApplication.class); - } - - @AfterClass - public static void tearDownAfterClass() throws Exception { - } - - @Before - public void setUp() throws Exception { - } - - @After - public void tearDown() throws Exception { - } - - @Test - public void testReady() { - assertTrue("TVApplicationTest is not ready yet!", application().isReady()); - } - - /** - * Verify that all implemented actions exist as well as their text, shortDescription properties. - */ - /*@Test - public void testDefinedActions() { - String[] actionNames = {"newSession", "openSession", "openAndSet", "set", "saveSession", "startMonitoring", - "stopMonitoring", "stripchartSelection", "removeSelection", "addVariablesFromTree", - "addVariablesFromList", "purgeBadRefs", "commitVariableAddition"}; - String[] actionTexts = {"New", "Open", "Open & Set", "Set", "Save", "Start the Monitor", "Stop the Monitor", - "Stripchart Selection", "Remove Selection", "Add Selection", "Add Selection", - "Purge BAD_REFs", "Ok"}; - String[] actionShortDescriptions = {"Clear the variable table.", "Replace the variable table with a TV input file without setting the values.", - "Replace the variable table with a TV input file and set each value.", - "Set the variable values from a TV input file without changing the variable table.", - "Save the variable table to a TV input file.", - "Start updating variable values.", "Stop updating variable values.", - "Stripchart the selected variables.", "Delete the selected rows.", - "Begin watching the selected variables.", "Begin watching the selected variables.", - "Remove all variables that failed to resolve.", "Commit the variable additions."}; - for (int i = 0; i < actionNames.length; i++) { - CheckApplicationProperties.checkAction(application().actionMap, actionNames[i]); - CheckApplicationProperties.checkActionText(application().actionMap, actionNames[i], actionTexts[i]); - CheckApplicationProperties.checkActionShortDescription(application().actionMap, actionNames[i], actionShortDescriptions[i]); - } - }*/ - - @Test - public void testDefinedKeyText() { - CheckApplicationProperties.checkKeyText(application().resourceMap, "fileMenu.text", "&File"); - /*CheckApplicationProperties.checkKeyText(application().resourceMap, "actionsMenu.text", "&Actions"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "preferencesMenu.text", "&Preferences"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "notifyOnDisconnectCheckBoxMenuItem.text", "Not&ify on Disconnect"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "caseInsensitiveCheckBox.text", "Case Insensitive"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "containsRadioButton.text", "Contains"); - CheckApplicationProperties.checkKeyText(application().resourceMap, "regularExpressionRadioButton.text", "RegEx");*/ - } - - @Test - public void testExit() { - application().removeExitListener(application().exitListener); - application().exit(); - assertTrue(application().isEnded); - } - - private static WaitForTVApplication application() { - return Application.getInstance(WaitForTVApplication.class); - } -} diff --git a/trick_source/java/test/src/trick/tv/WaitForTVApplication.java b/trick_source/java/test/src/trick/tv/WaitForTVApplication.java deleted file mode 100644 index 37ed0de6..00000000 --- a/trick_source/java/test/src/trick/tv/WaitForTVApplication.java +++ /dev/null @@ -1,50 +0,0 @@ -package trick.tv; - - -import org.jdesktop.application.Application; - - -public class WaitForTVApplication extends TVApplication { - static Object lock = new Object(); - - boolean isEnded; - - @Override - protected void end() { - isEnded = true; - } - - @Override - protected void ready() { - super.ready(); - synchronized(lock) { - lock.notifyAll(); - } - } - - - /** - * Launch the specified subclsas of TVApplication and block - * (wait) until it's startup() method has run. - */ - public static void launchAndWait(Class applicationClass) { - synchronized(lock) { - Application.launch(applicationClass, new String[]{}); - while(true) { - try { - lock.wait(); - } - catch (InterruptedException e) { - System.err.println("launchAndWait interrupted!"); - break; - } - Application app = Application.getInstance(WaitForTVApplication.class); - if (app instanceof WaitForTVApplication) { - if (((WaitForTVApplication)app).isReady()) { - break; - } - } - } - } - } -}