FX is now completely purged from the repo. Long live Visage!!! :)

Author: steveonjava

build-src/build-components.xml

@@ -149,7 +149,7 @@
     <do-setup-and-import-component component="apps"/>
     <do-setup-and-import-component component="deploy"/>
     <do-setup-and-import-component component="docs"/>
-    <do-setup-and-import-component component="fxdloader"/>
+    <do-setup-and-import-component component="visagedloader"/>
     <do-setup-and-import-component component="jogl"/>
     <do-setup-and-import-component component="media"/>
     <do-setup-and-import-component component="mobile"/>
@@ -189,7 +189,7 @@
             <isset property="visage.apps.exists"/>
             <isset property="visage.deploy.exists"/>
             <isset property="visage.docs.exists"/>
-            <isset property="visage.fxdloader.exists"/>
+            <isset property="visage.visagedloader.exists"/>
             <isset property="visage.jogl.exists"/>
             <isset property="visage.media.exists"/>
             <isset property="visage.mobile.exists"/>
@@ -216,7 +216,7 @@
             <antcall target="visage-compiler-@{target}"/>
             <antcall target="media-@{target}"/>
             <antcall target="runtime-@{target}"/>
-            <antcall target="fxdloader-@{target}"/>
+            <antcall target="visagedloader-@{target}"/>
             <antcall target="mobile-@{target}"/>
             <antcall target="tv-@{target}"/>
             <antcall target="webservices-@{target}"/>
@@ -238,7 +238,7 @@
                      apps-clone,
                      deploy-clone,
                      docs-clone,
-                     fxdloader-clone,
+                     visagedloader-clone,
                      jogl-clone,
                      media-clone,
                      mobile-clone,
@@ -259,7 +259,7 @@
                      apps-tip,
                      deploy-tip,
                      docs-tip,
-                     fxdloader-tip,
+                     visagedloader-tip,
                      jogl-tip,
                      media-tip,
                      mobile-tip,

build-src/build-inventory.xml

@@ -114,7 +114,7 @@
         <echo message="Checking generic deployed files."/>
         <inventory-deployed-check dir="." file="java-coffee-cup-23x20.png"/>
         <inventory-deployed-check dir="." file="Decora.jnlp"/>
-        <inventory-deployed-check dir="." file="dtfx.js"/>
+        <inventory-deployed-check dir="." file="dtvisage.js"/>
         <inventory-deployed-check dir="." file="visage-loading-100x100.gif"/>
         <inventory-deployed-check dir="." file="visage-loading-25x25.gif"/>
         <inventory-deployed-check dir="." file="visage-rt.jnlp"/>
@@ -125,7 +125,7 @@
         <inventory-deployed-check dir="./shared" file="visagert.jar"/>
         <inventory-deployed-check dir="./desktop" file="applet-launcher.jar"/>
         <inventory-deployed-check dir="./desktop" file="eula.jar"/>
-        <inventory-deployed-check dir="./desktop" file="fxdloader.jar"/>
+        <inventory-deployed-check dir="./desktop" file="visagedloader.jar"/>
         <inventory-deployed-check dir="./desktop" file="decora-runtime.jar"/>
         <inventory-deployed-check dir="./desktop" file="visage-anim.jar"/>
         <inventory-deployed-check dir="./desktop" file="visage-geom.jar"/>
@@ -214,7 +214,7 @@
     <target name="-inventory-rtdeployed-generic">
         <echo message="Checking generic rt-deployed files."/>
         <inventory-rtdeployed-check file="java-coffee-cup-23x20.png"/>
-        <inventory-rtdeployed-check file="dtfx.js"/>
+        <inventory-rtdeployed-check file="dtvisage.js"/>
         <inventory-rtdeployed-check file="visage-loading-100x100.gif"/>
         <inventory-rtdeployed-check file="visage-loading-25x25.gif"/>
         <inventory-rtdeployed-check file="visage-rt.jnlp"/>
@@ -303,7 +303,7 @@
         <inventory-sdk-check dir="./docs/api/visage.data.pull"            file="package-summary.html"/>
         <inventory-sdk-check dir="./docs/api/visage.data.xml"             file="package-summary.html"/>
         <inventory-sdk-check dir="./docs/api/visage.ext.swing"            file="package-summary.html"/>
-        <inventory-sdk-check dir="./docs/api/visage.fxd"                  file="package-summary.html"/>
+        <inventory-sdk-check dir="./docs/api/visage.visaged"                  file="package-summary.html"/>
         <inventory-sdk-check dir="./docs/api/visage.geometry"             file="package-summary.html"/>
         <inventory-sdk-check dir="./docs/api/visage.io.http"              file="package-summary.html"/>
         <inventory-sdk-check dir="./docs/api/visage.lang"                 file="package-summary.html"/>
@@ -331,7 +331,7 @@
         <inventory-sdk-check dir="./docs" file="manpage.css"/>
         <inventory-sdk-check dir="./lib"  file="visage-runtime.properties"/>
         <inventory-sdk-check dir="./lib/desktop" file="eula.jar"/>
-        <inventory-sdk-check dir="./lib/desktop" file="fxdloader.jar"/>
+        <inventory-sdk-check dir="./lib/desktop" file="visagedloader.jar"/>
         <inventory-sdk-check dir="./lib/desktop" file="decora-runtime.jar"/>
         <inventory-sdk-check dir="./lib/desktop" file="visage-anim.jar"/>
         <inventory-sdk-check dir="./lib/desktop" file="visage-geom.jar"/>

build.xml

@@ -131,8 +131,8 @@
                ant test -Dincludes=framework/xxxTest.java
            or for example
                ant test -Dincludes=launchers/VersionTest.java
-           To run a subset, say fxunit/ of the VisageCompilerTest tests, do
-               ant test -Dtest.visage.roots=test/fxunit -Dincludes=framework/VisageCompilerTest.java
+           To run a subset, say visageunit/ of the VisageCompilerTest tests, do
+               ant test -Dtest.visage.roots=test/visageunit -Dincludes=framework/VisageCompilerTest.java
 
       name="docs"       depends="binaries,source-zip,-do-docs" description="Build binaries, docs, and src.zip"
       name="all"        depends="docs,test,pack-jars"          description="Build and test all project artifacts"
@@ -209,8 +209,8 @@
         <mkdir dir="${visage.xml.docs.dir}"/>
         <copy file="${build.dir}/docs/javacode.xml"
               tofile="${visage.xml.docs.dir}/visage-compiler_javacode.xml"/>
-        <copy file="build/docs/fxcode.xml"
-              tofile="${visage.xml.docs.dir}/visage-compiler_fxcode.xml"/>
+        <copy file="build/docs/visagecode.xml"
+              tofile="${visage.xml.docs.dir}/visage-compiler_visagecode.xml"/>
     </target>
 
     <target name="-do-visage-clean-deploy">
@@ -580,7 +580,7 @@
             <jvmarg value="-Xbootclasspath/p:${bootjars}"/>
             <jvmarg value="-Djava.awt.headless=true"/>
             <jvmarg value="-Xmx${visage.javadoc.max.memory}"/>
-            <arg value="-o"/> <arg value="build/docs/fxcode.xml"/>
+            <arg value="-o"/> <arg value="build/docs/visagecode.xml"/>
             <arg value="-nohtml"/>
             <arg value="-sourcepath"/> <arg value="${srcpathprop}"/>
             <arg value="-classpath"/> <arg value="${clsjars}"/>
@@ -825,21 +825,21 @@
         </or>
     </condition>
 
-    <target name="fxjdi" description="Build fxjdi.jar" depends="-fxjdi-build, -fxjdi-skip">
+    <target name="visagejdi" description="Build visagejdi.jar" depends="-visagejdi-build, -visagejdi-skip">
     </target>
 
-    <target name="-fxjdi-skip" description="Skip building fxjdi.jar on JDK LT 6" if="preJDK6">
-        <echo message="Skipping build of fxjdi because JDK 5 or earlier is in use"/>
+    <target name="-visagejdi-skip" description="Skip building visagejdi.jar on JDK LT 6" if="preJDK6">
+        <echo message="Skipping build of visagejdi because JDK 5 or earlier is in use"/>
     </target>
 
-    <target name="-fxjdi-build" description="Build fxjdi.jar and javadoc on JDK >= 6" unless="preJDK6">
-        <echo message="Building fxjdi"/>
-        <ant dir="fxjdi" antfile="build.xml" target="dist"  inheritAll="false">
+    <target name="-visagejdi-build" description="Build visagejdi.jar and javadoc on JDK >= 6" unless="preJDK6">
+        <echo message="Building visagejdi"/>
+        <ant dir="visagejdi" antfile="build.xml" target="dist"  inheritAll="false">
             <property name="build.defs" value="${build.defs}" />
         </ant>
-        <copy file="fxjdi/dist/fxjdi.jar" tofile="${dist.fxjdi.jar}"/>
-        <copy todir="${basedir}/dist/doc/fxjdi/api">
-              <fileset dir="fxjdi/dist/javadoc/"/>
+        <copy file="visagejdi/dist/visagejdi.jar" tofile="${dist.visagejdi.jar}"/>
+        <copy todir="${basedir}/dist/doc/visagejdi/api">
+              <fileset dir="visagejdi/dist/javadoc/"/>
         </copy>
     </target>
 
@@ -858,9 +858,9 @@
        <ant dir="${visagedoc.dir}" antfile="build.xml" target="clean" inheritall="false" />
     </target>
 
-    <target name="fxjdi-clean">
-       <echo message="clean in fxjdi/"/>
-       <ant dir="fxjdi" antfile="build.xml" target="clean" inheritall="false">
+    <target name="visagejdi-clean">
+       <echo message="clean in visagejdi/"/>
+       <ant dir="visagejdi" antfile="build.xml" target="clean" inheritall="false">
            <property name="build.defs" value="${build.defs}" />
        </ant>
     </target>
@@ -878,7 +878,7 @@
 
     <!-- Not part of the "clean" target processing.  Used by ?? -->
     <target name="real-clean">
-        <antcall target="fxjdi-clean" inheritall="false"/>
+        <antcall target="visagejdi-clean" inheritall="false"/>
         <antcall target="clean"/>
         <antcall target="visagedoc-clean" inheritall="true"/>
         <antcall target="langref-clean" inheritall="true"/>
@@ -1125,7 +1125,7 @@
         <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
     </target>
 
-    <target name="jar" depends="init,compile,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,fxjdi" description="Build JAR.">
+    <target name="jar" depends="init,compile,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,visagejdi" description="Build JAR.">
     </target>
     <!--
                 =================
@@ -1515,7 +1515,7 @@
             -->
 
 
-    <target name="-do-clean" depends="visagedoc-clean,fxjdi-clean,langref-clean,launcher-clean">
+    <target name="-do-clean" depends="visagedoc-clean,visagejdi-clean,langref-clean,launcher-clean">
         <delete quiet="true" dir="${build.dir}"/>
         <delete quiet="true" dir="${dist.dir}"/>
         <delete quiet="true" file="cobertura.ser" />

buildtools/fxbtrace/README

@@ -18,21 +18,21 @@ was cloned.
   ant  -Dbtrace.home=$BTRACE_HOME
 
 The above compiles all btrace scripts under btrace_scripts to the destination 
-directory ../../build/buildtools/fxbtrace/
+directory ../../build/buildtools/visagebtrace/
 
-Or you can use "./bin/fxbtracec" to compile a specific BTrace script file like:
+Or you can use "./bin/visagebtracec" to compile a specific BTrace script file like:
 
-    ./bin/fxbtracec btrace_scripts/InvalidationTracer.java
+    ./bin/visagebtracec btrace_scripts/InvalidationTracer.java
 
-5) ./bin/fxbtrace <compiled-btrace-script.class> <your-visage-main-class> <args>
+5) ./bin/visagebtrace <compiled-btrace-script.class> <your-visage-main-class> <args>
 
 For example,
 
- ./bin/fxbtrace ../../build/buildtools/fxbtrace/InvalidationTracer.class VisageMain
+ ./bin/visagebtrace ../../build/buildtools/visagebtrace/InvalidationTracer.class VisageMain
 
 This produces the trace output file as
 
- ../../build/buildtools/fxbtrace/InvalidationTracer.class.btrace
+ ../../build/buildtools/visagebtrace/InvalidationTracer.class.btrace
 
 The .btrace file is produced whereever the .class of the BTrace script is 
 located. 

buildtools/fxbtrace/btrace_scripts/FxBtraceTracker.java

@@ -48,20 +48,20 @@
     * mbean individually.
     */
     @Property
-    private static long fxObjectCount = 0;
+    private static long visageObjectCount = 0;
     @Property
-    private static long fxWeakRefsCount = 0;
+    private static long visageWeakRefsCount = 0;
     @Property
-    private static long fxDependentCount = 0;
+    private static long visageDependentCount = 0;
     @Property
-    private static long fxNotifyDependentsCount = 0;
+    private static long visageNotifyDependentsCount = 0;
 
     @OnMethod(
 	clazz="org.visage.runtime.VisageBase",
         method="<init>"
     ) 
-    public static void onNewFXObject(@Self Object obj, boolean dummy) {
-        fxObjectCount++;
+    public static void onNewVisageObject(@Self Object obj, boolean dummy) {
+        visageObjectCount++;
         String cn = name(classOf(obj));
         Integer i = get(histo, cn);
         if (i == null) {
@@ -78,7 +78,7 @@ public static void onNewFXObject(@Self Object obj, boolean dummy) {
     )
     public static void onNewWeakBinderRef(@Self Object obj, VisageObject referred) {
         weakBinderRefClass = probeClass();
-        fxWeakRefsCount++;
+        visageWeakRefsCount++;
     }
 
     @OnMethod(
@@ -87,7 +87,7 @@ public static void onNewWeakBinderRef(@Self Object obj, VisageObject referred) {
     )
     public static void onNewDependent(@Self Object obj, VisageObject referred) {
         dependentClass = probeClass();
-        fxWeakRefsCount++;
+        visageWeakRefsCount++;
     }
 
     @OnMethod(
@@ -97,7 +97,7 @@ public static void onNewDependent(@Self Object obj, VisageObject referred) {
     public static void onReferenceClear(@Self Object obj) {
         if ((dependentClass != null && isInstance(dependentClass, obj)) ||
             (weakBinderRefClass != null && isInstance(weakBinderRefClass, obj))) {
-            fxWeakRefsCount--;
+            visageWeakRefsCount--;
         }
     }
 
@@ -106,23 +106,23 @@ public static void onReferenceClear(@Self Object obj) {
         method="addDependent$"
     ) 
     public static void onAddDependent(VisageObject obj, int varNum, VisageObject dep) {
-        fxDependentCount++;
+        visageDependentCount++;
     }
 
     @OnMethod(
 	clazz="org.visage.runtime.VisageBase",
         method="removeDependent$"
     ) 
     public static void onRemoveDependent(VisageObject obj, int varNum, VisageObject dep) {
-        fxDependentCount--;
+        visageDependentCount--;
     }
 
     @OnMethod(
 	clazz="org.visage.runtime.VisageBase",
         method="notifyDependents$"
     ) 
     public static void onNotifyDependents(VisageObject obj, int varNum) {
-        fxNotifyDependentsCount++;
+        visageNotifyDependentsCount++;
     }
 
     @OnTimer(4000) 

buildtools/fxbtrace/btrace_scripts/InstVarCount.java

@@ -46,7 +46,7 @@
         clazz="org.visage.runtime.VisageBase",
         method="<init>"
     )
-    public static void onNewFXObject(@Self VisageBase self, AnyType[] args) {
+    public static void onNewVisageObject(@Self VisageBase self, AnyType[] args) {
         String className = self.getClass().getName();
         if (! instVarCounts.containsKey(className)) {
             instVarCounts.put(className, self.count$());

buildtools/fxbtrace/build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="fxtracker" default="all" basedir=".">
-    <property name="builddir" location="${basedir}/../../build/buildtools/fxbtrace"/>
+<project name="visagetracker" default="all" basedir=".">
+    <property name="builddir" location="${basedir}/../../build/buildtools/visagebtrace"/>
     <property name="visage.home" location="${basedir}/../../../artifacts/sdk"/>
     <property name="srcdir"   location="${basedir}/src"/>
     <property name="btrace_scriptsdir"   location="${basedir}/btrace_scripts"/>

buildtools/fxbtrace/src/VisageBTraceRunner.java

@@ -43,7 +43,7 @@
  * @author A. Sundararajan (removed csv stuff for now)
  * 
  * Readme:
- * Here are the steps needed to run the fxbtrace.
+ * Here are the steps needed to run the visagebtrace.
  *
  * 1. Download the btrace binary bundle from https://btrace.dev.java.net/
  * 2. Extract it to BTRACE_HOME
@@ -53,7 +53,7 @@
  *   a. BUILD_DIR   or build.dir     : clean location for the build files
  *   b. VISAGE_HOME or visage.home : location of visage sdk
  *   c. BTRACE_HOME or btrace.home : location of btrace distro
- *   d. BASE_DIR    or base.dir    : location of the fxbtrace directory
+ *   d. BASE_DIR    or base.dir    : location of the visagebtrace directory
  * 
  * Options:
  *   Must set --jar pointer to a jar with a main-class
@@ -64,13 +64,13 @@
  * 
  * Notes:
  *  VM parameters to the test specimen may be passed as follows:
- *  % java -DFXBTraceRunner.vmoptions="-Xmx512m, -Xss128, -Xfoobar=XX" VisageBTraceRunner options
+ *  % java -DVisageBTraceRunner.vmoptions="-Xmx512m, -Xss128, -Xfoobar=XX" VisageBTraceRunner options
  * 
  * Files:
- *  a. visage/visage-compiler/buildtools/fxbtrace/btrace_scripts/*.java
+ *  a. visage/visage-compiler/buildtools/visagebtrace/btrace_scripts/*.java
  *     Various btrace script files that can be used to trace Visage apps.
  * 
- *  b. visage/visage-compiler/buildtools/fxbtrace/src/VisageBTraceRunner.java
+ *  b. visage/visage-compiler/buildtools/visagebtrace/src/VisageBTraceRunner.java
  *     This is simply a runner script takes care of compile the script, 
  *     running btrace on the application, killing the application.
  *  
@@ -257,7 +257,7 @@ static void doRun() {
         }
 
 
-        // run the fxbtrace script and application
+        // run the visagebtrace script and application
         cmdsList.clear();
         cmdsList.add(VISAGE_EXE);
         cmdsList.add("-D" + VISAGEBTRACERUNNER_NAME + ".interval=" + interval);