Updated DMGExtractor to use csframework instead of catacombae_io.

build.xml

@@ -79,7 +79,7 @@
 
   <target name="copyresources-standalone" depends="init">
     <copy todir="${builddir}">
-      <zipfileset src="${java.runtime.library.dir}/catacombae_io.jar" includes="**/*.class"/>
+      <zipfileset src="${java.runtime.library.dir}/csframework.jar" includes="**/*.class"/>
       <zipfileset src="${java.runtime.library.dir}/apache-ant-1.7.0-bzip2.jar" includes="**/*.class"/>
       <zipfileset src="${java.runtime.library.dir}/iharder-base64.jar" includes="**/*.class"/>
       <zipfileset src="${java.runtime.library.dir}/swing-layout-1.0.3.jar" includes="**/*.class"/>

definevars.bat

@@ -1,3 +1,3 @@
 set LIBDIR=%~dp0targets\application\lib
 
-set DMGX_CLASSPATH=%LIBDIR%\dmgextractor.jar;%LIBDIR%\catacombae_io.jar;%LIBDIR%\apache-ant-1.7.0-bzip2.jar;%LIBDIR%\filedrop.jar;%LIBDIR%\iharder-base64.jar;%LIBDIR%\swing-layout-1.0.3.jar
+set DMGX_CLASSPATH=%LIBDIR%\dmgextractor.jar

definevars.sh

@@ -2,5 +2,5 @@
 
 export LIBDIR="targets/application/lib"
 
-export DMGX_CLASSPATH="$LIBDIR/dmgextractor.jar:$LIBDIR/catacombae_io.jar:$LIBDIR/apache-ant-1.7.0-bzip2.jar:$LIBDIR/filedrop.jar:$LIBDIR/iharder-base64.jar:$LIBDIR/swing-layout-1.0.3.jar"
+export DMGX_CLASSPATH="$LIBDIR/dmgextractor.jar"
 echo "$DMGX_CLASSPATH"

netbeans/DMGExtractor/build.xml

@@ -2,6 +2,11 @@
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
 <project name="DMGExtractor" default="default" basedir=".">
     <description>Builds, tests, and runs the project DMGExtractor.</description>
     <import file="nbproject/build-impl.xml"/>

netbeans/DMGExtractor/nbproject/build-impl.xml

@@ -218,13 +218,13 @@ is divided into following sections:
             </sequential>
         </macrodef>
     </target>
-    <target name="-init-macrodef-nbjpda">
+    <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
             <attribute default="${main.class}" name="name"/>
             <attribute default="${debug.classpath}" name="classpath"/>
             <attribute default="" name="stopclassname"/>
             <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
+                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
                     <classpath>
                         <path path="@{classpath}"/>
                     </classpath>
@@ -255,6 +255,12 @@ is divided into following sections:
         <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
             <istrue value="${have-jdk-older-than-1.4}"/>
         </condition>
+        <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+            <os family="windows"/>
+        </condition>
+        <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+            <isset property="debug.transport"/>
+        </condition>
     </target>
     <target depends="-init-debug-args" name="-init-macrodef-debug">
         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
@@ -264,7 +270,7 @@ is divided into following sections:
             <sequential>
                 <java classname="@{classname}" dir="${work.dir}" fork="true">
                     <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${run.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -311,6 +317,13 @@ is divided into following sections:
                 ===================
             -->
     <target depends="init" name="deps-jar" unless="no.deps"/>
+    <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+    <target depends="init" name="-check-automatic-build">
+        <available file="${build.classes.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+    </target>
+    <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+        <antcall target="clean"/>
+    </target>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
     </target>
@@ -331,7 +344,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
     <target name="-pre-compile-single">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
@@ -345,7 +358,7 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+    <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
     <!--
                 ====================
                 JAR BUILDING SECTION

netbeans/DMGExtractor/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
 build.xml.data.CRC32=4ba71cd5
-build.xml.script.CRC32=17389b51
-build.xml.stylesheet.CRC32=be360661
+build.xml.script.CRC32=fb22c063
+build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
 nbproject/build-impl.xml.data.CRC32=4ba71cd5
-nbproject/build-impl.xml.script.CRC32=db6fe96b
-nbproject/build-impl.xml.stylesheet.CRC32=487672f9
+nbproject/build-impl.xml.script.CRC32=55a42cfc
+nbproject/build-impl.xml.stylesheet.CRC32=e55b27f5

netbeans/DMGExtractor/nbproject/project.properties

@@ -21,6 +21,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
 file.reference.apache-ant-1.7.0-bzip2.jar=..\\..\\dist\\lib\\apache-ant-1.7.0-bzip2.jar
 file.reference.catacombae_io.jar=..\\..\\dist\\lib\\catacombae_io.jar
+file.reference.csframework.jar=..\\..\\..\\FileTransfer\\lib\\csframework.jar
 file.reference.DMGExtractor-src=../../src
 file.reference.filedrop.jar=..\\..\\dist\\lib\\filedrop.jar
 file.reference.iharder-base64.jar=..\\..\\dist\\lib\\iharder-base64.jar
@@ -31,7 +32,7 @@ javac.classpath=\
     ${file.reference.apache-ant-1.7.0-bzip2.jar}:\
     ${file.reference.filedrop.jar}:\
     ${file.reference.iharder-base64.jar}:\
-    ${file.reference.catacombae_io.jar}
+    ${file.reference.csframework.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

src.META-INF/application/MANIFEST.MF

@@ -1,2 +1,2 @@
 Main-Class: org.catacombae.dmgextractor.DMGExtractorGraphical
-Class-Path: catacombae_io.jar apache-ant-1.7.0-bzip2.jar iharder-base64.jar swing-layout-1.0.3.jar
+Class-Path: csframework.jar apache-ant-1.7.0-bzip2.jar iharder-base64.jar swing-layout-1.0.3.jar

src/org/catacombae/dmgextractor/BuildNumber.java

@@ -19,7 +19,7 @@
 
 public class BuildNumber {
     //[BuildEnumerator:Opening] WARNING: The following lines are managed by an external program. Do NOT change.
-    public static final long BUILD_NUMBER = 437L;
+    public static final long BUILD_NUMBER = 438L;
     //[BuildEnumerator:Closing] The lines managed by an external program end here.
 }