diff --git a/.classpath b/.classpath
index 06fc1ee0..71d1ffda 100644
--- a/.classpath
+++ b/.classpath
@@ -8,7 +8,7 @@
-
-
+
+
diff --git a/.gitignore b/.gitignore
index bd6d6c7e..e9928f7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ ADTProTrace.txt
dest/
tasks/
/bin/
+/*.patch
.DS_Store
diff --git a/build/.gitignore b/build/.gitignore
index a2d34487..8f3d7a0c 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -1,10 +1,7 @@
*.dsk
*.po
*.hdv
-ADTPro-*.zip
-ADTPro-*.jar
-ADTPro-*.tar
-ADTPro-*.gz
+ADTPro-*
ADT
ADTPRO
ADTPROAUD
diff --git a/build/README b/build/README
index 18d014ba..2e4e4ea7 100644
--- a/build/README
+++ b/build/README
@@ -41,7 +41,7 @@ Your distribution should contain most of these, depending on platform:
* lib/ADTPro-v.r.m.jar - ADTPro server-side software
(a Java .jar file)
* lib/jssc/... - Java serial library files
- * lib/AppleCommander/AppleCommander-v.r.m.p-ac.jar
+ * lib/AppleCommander/AppleCommander-ant-v.r.m.jar
- AppleCommander support Jar
In all cases above, v.r.m is replaced with the version, release
diff --git a/build/acbase.bat b/build/acbase.bat
index 81a0bd66..336717be 100644
--- a/build/acbase.bat
+++ b/build/acbase.bat
@@ -16,4 +16,4 @@ REM
REM SET ADTPRO_HOME=C:\src\workspace\35\adtpro\build\
REM SET MY_JAVA_HOME=C:\Progra~1\IBM\Java142\bin\
-%MY_JAVA_HOME%java -Xms128m -Xmx256m -jar "%ADTPRO_HOME%lib\AppleCommander\AppleCommander-%AC_VERSION%.jar" %*
\ No newline at end of file
+%MY_JAVA_HOME%java -Xms128m -Xmx256m -jar "%ADTPRO_HOME%lib\AppleCommander\AppleCommander-ant-%AC_VERSION%.jar" %*
diff --git a/build/acbase.sh b/build/acbase.sh
index a08216e2..439a67ee 100644
--- a/build/acbase.sh
+++ b/build/acbase.sh
@@ -21,4 +21,4 @@ export ADTPRO_HOME=`pwd`
# export MY_JAVA_HOME=/usr/local/java/bin/
# export ADTPRO_HOME=~/myuser/adtpro
-"$MY_JAVA_HOME"java -Xms256m -Xmx512m -jar lib/AppleCommander/AppleCommander-%AC_VERSION%.jar $*
+"$MY_JAVA_HOME"java -Xms256m -Xmx512m -jar lib/AppleCommander/AppleCommander-ant-%AC_VERSION%.jar $*
diff --git a/build/adtprobase.bat b/build/adtprobase.bat
index 10469da6..be2e6e0d 100644
--- a/build/adtprobase.bat
+++ b/build/adtprobase.bat
@@ -21,4 +21,4 @@ REM SET MY_JAVA_HOME=C:\Progra~1\IBM\Java142\bin\
:start
CD "%ADTPRO_HOME%"
-start /min %MY_JAVA_HOME%java -Xms128m -Xmx256m %ADTPRO_EXTRA_JAVA_PARMS% -cp "%ADTPRO_HOME%lib\%ADTPRO_VERSION%";"%ADTPRO_HOME%lib\AppleCommander\AppleCommander-%AC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\jssc-%JSSC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\slf4j-nop-%SLF4J_VERSION%.jar" org.adtpro.ADTPro %*
+start /min %MY_JAVA_HOME%java -Xms128m -Xmx256m %ADTPRO_EXTRA_JAVA_PARMS% -cp "%ADTPRO_HOME%lib\%ADTPRO_VERSION%";"%ADTPRO_HOME%lib\AppleCommander\AppleCommander-ant-%AC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\jssc-%JSSC_VERSION%.jar";"%ADTPRO_HOME%lib\jssc\slf4j-nop-%SLF4J_VERSION%.jar" org.adtpro.ADTPro %*
diff --git a/build/adtprobase.sh b/build/adtprobase.sh
index c8c28e04..7464320a 100644
--- a/build/adtprobase.sh
+++ b/build/adtprobase.sh
@@ -40,4 +40,4 @@ if [ "$1x" = "headlessx" ]; then
fi
fi
-$HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m -cp "$ADTPRO_HOME"lib/%ADTPRO_VERSION%:"$ADTPRO_HOME"lib/AppleCommander/AppleCommander-%AC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/jssc-%JSSC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/slf4j-nop-%SLF4J_VERSION%.jar org.adtpro.ADTPro $*
+$HEADLESS"$MY_JAVA_HOME"java -Xms256m -Xmx512m -cp "$ADTPRO_HOME"lib/%ADTPRO_VERSION%:"$ADTPRO_HOME"lib/AppleCommander/AppleCommander-ant-%AC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/jssc-%JSSC_VERSION%.jar:"$ADTPRO_HOME"lib/jssc/slf4j-nop-%SLF4J_VERSION%.jar org.adtpro.ADTPro $*
diff --git a/build/build.xml b/build/build.xml
index 47895837..944d183f 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -30,6 +30,8 @@ all
vdrive-image-prep
prodos-vedrive
vdrive-image-prep
+ prodos-vedrive2
+ vdrive-image-prep
sos
sos-serial
sos-image-prep
@@ -50,12 +52,14 @@ all
-->
-
+
+
+
@@ -67,15 +71,13 @@ all
-
-
-
+
+
-
-
+
-
+
@@ -207,7 +209,7 @@ all
ProDOS section
============================================================================================
-->
-
+
@@ -377,10 +379,10 @@ all
-
+
-
+
@@ -389,8 +391,6 @@ all
-
-
diff --git a/build/lib/AppleCommander/AppleCommander-1.3.5.13-ac.jar b/build/lib/AppleCommander/AppleCommander-1.3.5.13-ac.jar
deleted file mode 100644
index 5813ca91..00000000
Binary files a/build/lib/AppleCommander/AppleCommander-1.3.5.13-ac.jar and /dev/null differ
diff --git a/build/lib/AppleCommander/AppleCommander-ant-1.8.0-SNAPSHOT.jar b/build/lib/AppleCommander/AppleCommander-ant-1.8.0-SNAPSHOT.jar
deleted file mode 100644
index 51e65a57..00000000
Binary files a/build/lib/AppleCommander/AppleCommander-ant-1.8.0-SNAPSHOT.jar and /dev/null differ
diff --git a/build/lib/AppleCommander/AppleCommander-ant-1.9.0.jar b/build/lib/AppleCommander/AppleCommander-ant-1.9.0.jar
new file mode 100644
index 00000000..ea31f3fc
Binary files /dev/null and b/build/lib/AppleCommander/AppleCommander-ant-1.9.0.jar differ
diff --git a/build/lib/ip65/a2combo.lib b/build/lib/ip65/a2combo.lib
index b9a3ecd1..aca0bdb3 100644
Binary files a/build/lib/ip65/a2combo.lib and b/build/lib/ip65/a2combo.lib differ
diff --git a/build/lib/ip65/a2uther2.lib b/build/lib/ip65/a2uther2.lib
index 42cd53a1..5ae617ce 100644
Binary files a/build/lib/ip65/a2uther2.lib and b/build/lib/ip65/a2uther2.lib differ
diff --git a/build/lib/ip65/inc/ip65.h b/build/lib/ip65/inc/ip65.h
index 5fb77311..1ef10724 100644
--- a/build/lib/ip65/inc/ip65.h
+++ b/build/lib/ip65/inc/ip65.h
@@ -8,8 +8,6 @@
//
#if defined(__APPLE2__)
#define ETH_INIT_DEFAULT 3 // Apple II slot number
-#elif defined(__ATARI__)
-#define ETH_INIT_DEFAULT 8 // ATARI PBI device ID
#else
#define ETH_INIT_DEFAULT 0 // Unused
#endif
@@ -294,16 +292,18 @@ bool __fastcall__ tftp_upload_from_memory(uint32_t server, const char* name,
//
// On success the variables url_ip, url_port and url_selector (see below) are valid.
//
-// Inputs: url: Zero (or ctrl char) terminated string containing the URL
+// Inputs: url: Zero (or ctrl char) terminated string containing the URL
+// resolve: Resolve host in URL
// Output: true if an error occured, false otherwise
//
-bool __fastcall__ url_parse(const char* url);
+bool __fastcall__ url_parse(const char* url, bool resolve);
// Access to parsed HTTP URL
//
-// Access to the three items below is only valid after url_parse returned false.
+// Access to the four items below is only valid after url_parse returned false.
//
-extern uint32_t url_ip; // IP address of host in URL
+extern char* url_host; // Zero terminated string containing host in URL + "\r\n\r\n"
+extern uint32_t url_ip; // IP address of host in URL (only if 'resolve' is true)
extern uint16_t url_port; // Port number of URL
extern char* url_selector; // Zero terminated string containing selector part of URL
diff --git a/build/lib/ip65/ip65.lib b/build/lib/ip65/ip65.lib
index 63257ed5..0bf40b7e 100644
Binary files a/build/lib/ip65/ip65.lib and b/build/lib/ip65/ip65.lib differ
diff --git a/build/lib/jssc/jssc-2.10.2.jar b/build/lib/jssc/jssc-2.10.2.jar
new file mode 100644
index 00000000..fb7b9d20
Binary files /dev/null and b/build/lib/jssc/jssc-2.10.2.jar differ
diff --git a/build/lib/jssc/jssc-2.9.4.jar b/build/lib/jssc/jssc-2.9.4.jar
deleted file mode 100644
index a754a20b..00000000
Binary files a/build/lib/jssc/jssc-2.9.4.jar and /dev/null differ
diff --git a/build/lib/jssc/slf4j-nop-1.7.36.jar b/build/lib/jssc/slf4j-nop-1.7.36.jar
deleted file mode 100644
index 734ad96a..00000000
Binary files a/build/lib/jssc/slf4j-nop-1.7.36.jar and /dev/null differ
diff --git a/build/lib/jssc/slf4j-nop-2.0.17.jar b/build/lib/jssc/slf4j-nop-2.0.17.jar
new file mode 100644
index 00000000..8c6e6892
Binary files /dev/null and b/build/lib/jssc/slf4j-nop-2.0.17.jar differ
diff --git a/src/client/prodos/ethernet/drive2/initheavystack.asm b/src/client/prodos/ethernet/drive2/initheavystack.asm
index 78cd6cd9..73f24d39 100644
--- a/src/client/prodos/ethernet/drive2/initheavystack.asm
+++ b/src/client/prodos/ethernet/drive2/initheavystack.asm
@@ -8,44 +8,36 @@
; Free Software Foundation; either version 2 of the License, or (at your
; option) any later version.
;
-; This program is distributed in the hope that it will be useful, but
-; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+; This program is distributed in the hope that it will be useful, but
+; WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
; for more details.
;
-; You should have received a copy of the GNU General Public License along
-; with this program; if not, write to the Free Software Foundation, Inc.,
+; You should have received a copy of the GNU General Public License along
+; with this program; if not, write to the Free Software Foundation, Inc.,
; 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
;
-.import eth_driver_io_base ; Used to distinguish between Uthernet II and everything else
-.import eth_driver_name ; Used to distinguish between Uthernet II and everything else
-
.import ip65_init
.import dhcp_init
-.import a2_set_slot
+.import _w5100_name
init_entry:
- ldx #$07 ; Start looking for a slot from the top
+ ldx #$07 ; Start looking for a slot from the top
stx TEMPSLOT
another:
- dec TEMPSLOT ; Decrement first, as we are zero-indexing
+ dec TEMPSLOT ; Decrement first, as we are zero-indexing
bmi nonefound
jsr INITETHERNET
- bcs another ; Not found? Branch around for another
+ bcs another ; Not found? Branch around for another
found:
lda TEMPSLOT
clc
adc #$b0
sta $0400
- lda eth_driver_io_base ; Check for Uthernet II-ness
- and #$0f
- cmp #$04
- bne notUII ; Nope, not a II, but still valid
- lda eth_driver_name+$0a ; Another check
+ lda _w5100_name+$0a ; Check for Uthernet II (byte 'I')
cmp #$49
- beq isUthernetII ; Yep, found one!
-notUII:
+ beq isUthernetII ; Uthernet II detected
sec
rts
@@ -57,40 +49,36 @@ nonefound:
isUthernetII:
sta $402
- ; Load up the W5100 driver
- ; Need to copy w5100init.asm(hdr) to w5100io.asm(hdr_from_init) (8 bytes)
- ; before moving the code up to driver space
- ; Set up vectors, etc. - common with ip65 code at this point, maybe
+ ; Load up the W5100 driver (handled by uthernet2.s)
clc
rts
;---------------------------------------------------------
; INITETHERNET - Attempt to initialize the Ethernet card in TEMPSLOT
-; Returns with carry clear on success, carry set on failure
+; Returns with carry clear on success, carry set on failure
;---------------------------------------------------------
INITETHERNET:
- GO_SLOW ; Slow down for SOS
+ GO_SLOW ; Slow down for SOS
ldx TEMPSLOT
inx
- txa
- jsr a2_set_slot
+ txa ; Slot number (1-7) in A for ip65_init
jsr ip65_init
bcc @UTHEROK
- GO_FAST ; Speed back up for SOS
+ GO_FAST ; Speed back up for SOS
sec
rts
@UTHEROK:
jsr dhcp_init
bcc @UTHEROK2
- GO_FAST ; Speed back up for SOS
+ GO_FAST ; Speed back up for SOS
sec
rts
@UTHEROK2:
- GO_FAST ; Speed back up for SOS
+ GO_FAST ; Speed back up for SOS
lda TEMPSLOT
sta COMMSLOT
clc
rts
TEMPSLOT:
- .res 1
\ No newline at end of file
+ .res 1
diff --git a/src/org/adtpro/gui/AudioConfig.java b/src/org/adtpro/gui/AudioConfig.java
index 4af53fee..11d65eea 100644
--- a/src/org/adtpro/gui/AudioConfig.java
+++ b/src/org/adtpro/gui/AudioConfig.java
@@ -130,10 +130,12 @@ private AudioConfig(ADTProperties properties)
*/
}
}
-/*
- Log.println(true, Messages.getString("Gui.NoAudio")); //$NON-NLS-1$
- Log.println(false, "AudioConfig Constructor could not instantiate the rxtx library.");
-*/
+
+ if (comboAudioDevice.getItemCount() <= 1) // only default mixer present
+ {
+ Log.println(true, Messages.getString("Gui.NoAudio"));
+ Log.println(false, "AudioConfig Constructor could not initialize audio devices.");
+ }
labelAudioDevice = new JLabel(Messages.getString("Gui.AudioConfigMixer"), SwingConstants.LEFT); //$NON-NLS-1$
GridBagUtil.constrain(configPanel, labelAudioDevice, 1, 1, // X, Y Coordinates
diff --git a/src/org/adtpro/gui/Gui.java b/src/org/adtpro/gui/Gui.java
index 722548d8..620da61c 100644
--- a/src/org/adtpro/gui/Gui.java
+++ b/src/org/adtpro/gui/Gui.java
@@ -21,6 +21,7 @@
package org.adtpro.gui;
import java.awt.BorderLayout;
+import java.awt.Desktop;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
@@ -32,6 +33,7 @@
import java.io.FilenameFilter;
import java.io.IOException;
import java.net.InetAddress;
+import java.net.URI;
import java.util.Arrays;
import java.util.Properties;
@@ -43,7 +45,6 @@
import org.adtpro.transport.SerialTransport;
import org.adtpro.transport.SerialIPTransport;
import org.adtpro.transport.UDPTransport;
-import org.adtpro.utilities.BareBonesBrowserLaunch;
import org.adtpro.utilities.Log;
import org.adtpro.utilities.StringUtilities;
import org.adtpro.ADTProperties;
@@ -401,7 +402,7 @@ public void actionPerformed(ActionEvent e)
}
else
{
- JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoRXTXDialogText"), Messages.getString("Gui.NoRXTXDialogTitle"), JOptionPane.OK_OPTION);
+ JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoSerialLibDialogText"), Messages.getString("Gui.NoSerialLibDialogTitle"), JOptionPane.OK_OPTION);
_disconnectButton.doClick();
}
}
@@ -703,7 +704,14 @@ else if (e.getActionCommand().equals(Messages.getString("Gui.About"))) //$NON-NL
}
else if (e.getActionCommand().equals(Messages.getString("Gui.Website"))) //$NON-NLS-1$
{
- BareBonesBrowserLaunch.openURL("http://adtpro.com");
+ try
+ {
+ Desktop.getDesktop().browse(new URI("http://adtpro.com"));
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
}
else if (e.getActionCommand().equals(Messages.getString("Gui.CD"))) //$NON-NLS-1$
{
diff --git a/src/org/adtpro/gui/SerialConfig.java b/src/org/adtpro/gui/SerialConfig.java
index 0b81e1ab..1ef2dc80 100644
--- a/src/org/adtpro/gui/SerialConfig.java
+++ b/src/org/adtpro/gui/SerialConfig.java
@@ -299,8 +299,8 @@ public void actionPerformed(ActionEvent e)
else
{
// Hrm - can't find any serial stuff at all.
- JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoRXTXDialogText"),
- Messages.getString("Gui.NoRXTXDialogTitle"), JOptionPane.OK_OPTION);
+ JOptionPane.showMessageDialog(this, Messages.getString("Gui.NoSerialLibDialogText"),
+ Messages.getString("Gui.NoSerialLibDialogTitle"), JOptionPane.OK_OPTION);
_parent.setSerialAvailable(false);
}
_properties.setProperty("CommPortSpeed", (String) comboSpeed.getSelectedItem());
diff --git a/src/org/adtpro/resources/messagesOrig.properties b/src/org/adtpro/resources/messagesOrig.properties
index 34e794d1..ebf89c8f 100644
--- a/src/org/adtpro/resources/messagesOrig.properties
+++ b/src/org/adtpro/resources/messagesOrig.properties
@@ -49,9 +49,9 @@ Gui.NoAudio=There are no audio devices available to Java on this machine.
Gui.NoAudioDialogTitle=No Audio Devices
Gui.NoAudioDialogText=There are no audio devices available to Java on this machine.
Gui.DefaultAudioMixer=ADTPro Default Audio Capture
-Gui.NoRXTX=Serial library not installed.
-Gui.NoRXTXDialogTitle=No Serial Ports
-Gui.NoRXTXDialogText=There are no serial ports, or the serial library RXTX is not installed or visible.
Please see http://adtpro.com/install.html for details.
+Gui.NoSerialLib=Serial library not installed.
+Gui.NoSerialLibDialogTitle=No Serial Ports
+Gui.NoSerialLibDialogText=There are no serial ports, or the serial library is not installed or visible.
Please see http://adtpro.com/install.html for details.
Gui.File=File
Gui.Config=Configuration
Gui.IIc=Apple IIc w/Imagewriter Cable
diff --git a/src/org/adtpro/resources/messages_es.native b/src/org/adtpro/resources/messages_es.native
index 108563f1..16784fed 100644
--- a/src/org/adtpro/resources/messages_es.native
+++ b/src/org/adtpro/resources/messages_es.native
@@ -35,9 +35,9 @@ Gui.NoAudio=Java no tiene dispositivos de audio disponibles en este equipo.
Gui.NoAudioDialogTitle=No hay dispositivos de audio
Gui.NoAudioDialogText=Java no tiene dispositivos de audio disponibles en este equipo.
Gui.DefaultAudioMixer=ADTPro Captura de audio por defecto
-Gui.NoRXTX=La librería serie no está instalada.
-Gui.NoRXTXDialogTitle=No hay puertos serie
-Gui.NoRXTXDialogText=No hay puertos serie, o la librería serie RXTX no está instalada o visible.
Por favor recurra a http://adtpro.com/install.html para más detalles.
+Gui.NoSerialLib=La librería serie no está instalada.
+Gui.NoSerialLibDialogTitle=No hay puertos serie
+Gui.NoSerialLibDialogText=No hay puertos serie, o la librería serie no está instalada o visible.
Por favor recurra a http://adtpro.com/install.html para más detalles.
Gui.File=Archivo
Gui.Config=Configuración
Gui.IIc=Apple IIc con cable Imagewriter
diff --git a/src/org/adtpro/resources/messages_fr.native b/src/org/adtpro/resources/messages_fr.native
index e399c0b8..07bbc6b3 100644
--- a/src/org/adtpro/resources/messages_fr.native
+++ b/src/org/adtpro/resources/messages_fr.native
@@ -36,9 +36,9 @@ Gui.NoAudio=Il n'y a pas de p
Gui.NoAudioDialogTitle=Aucun périphérique audio
Gui.NoAudioDialogText=Il n'y a pas de périphérique audio pour Java sur cette machine.
Gui.DefaultAudioMixer=Capture audio ADTPro par défaut
-Gui.NoRXTX=Bibliothèque série non installée.
-Gui.NoRXTXDialogTitle=Aucun port série
-Gui.NoRXTXDialogText=Il n'y a pas de port série, ou la bibliothèque série RXTX n'est pas installée ou n'est pas visible.
Veuillez aller sur http://adtpro.com/install.html pour de plus amples renseignements.
+Gui.NoSerialLib=Bibliothèque série non installée.
+Gui.NoSerialLibDialogTitle=Aucun port série
+Gui.NoSerialLibDialogText=Il n'y a pas de port série, ou la bibliothèque série n'est pas installée ou n'est pas visible.
Veuillez aller sur http://adtpro.com/install.html pour de plus amples renseignements.
Gui.File=Fichier
Gui.Config=Configuration
Gui.IIc=Câble Apple IIc avec Imagewriter
diff --git a/src/org/adtpro/resources/messages_it.native b/src/org/adtpro/resources/messages_it.native
index 2d1b26c4..841e16a1 100644
--- a/src/org/adtpro/resources/messages_it.native
+++ b/src/org/adtpro/resources/messages_it.native
@@ -36,9 +36,9 @@ Gui.NoAudio=Non ci sono dispositivi audio disponibili a Java.
Gui.NoAudioDialogTitle=Non ci sono dispositivi audio
Gui.NoAudioDialogText=Non ci sono dispositivi audio disponibili a Java.
Gui.DefaultAudioMixer=ADTPro Dispositivo di cattura audio
-Gui.NoRXTX=La libreria seriale RXTX non \u00e8 installata.
-Gui.NoRXTXDialogTitle=Non ci sono porte seriali
-Gui.NoRXTXDialogText=Non ci sono porte seriali oppure la libreria seriale RXTX non \u00e8 installata o visibile.
Consultare http://adtpro.com/install.html per ulteriori informazioni.
+Gui.NoSerialLib=La libreria seriale non \u00e8 installata.
+Gui.NoSerialLibDialogTitle=Non ci sono porte seriali
+Gui.NoSerialLibDialogText=Non ci sono porte seriali oppure la libreria seriale non \u00e8 installata o visibile.
Consultare http://adtpro.com/install.html per ulteriori informazioni.
Gui.File=File
Gui.Config=Configurazione
Gui.IIc=Apple IIc con cavo Imagewriter
diff --git a/src/org/adtpro/resources/messages_ko_KR.native b/src/org/adtpro/resources/messages_ko_KR.native
index 0c30c04a..e07586b1 100644
--- a/src/org/adtpro/resources/messages_ko_KR.native
+++ b/src/org/adtpro/resources/messages_ko_KR.native
@@ -37,9 +37,9 @@ Gui.NoAudio=Java
Gui.NoAudioDialogTitle=¿Àµð¿À ÀåÄ¡ ¾øÀ½
Gui.NoAudioDialogText=Java ¿¡ »ç¿ë °¡´ÉÇÑ ¿Àµð¿À ÀåÄ¡°¡ ¾ø½À´Ï´Ù.
Gui.DefaultAudioMixer=ADTPro ±âº» ¿Àµð¿À ĸÃÄ
-Gui.NoRXTX=½Ã¸®¾ó ¶óÀ̺귯¸®°¡ ¼³Ä¡µÇ¾îÀÖÁö ¾Ê½À´Ï´Ù.
-Gui.NoRXTXDialogTitle=½Ã¸®¾ó Æ÷Æ® ¾øÀ½
-Gui.NoRXTXDialogText=½Ã¸®¾ó Æ÷Æ®°¡ ¾ø°Å³ª ½Ã¸®¾ó ¶óÀ̺귯¸® RXTX °¡ ¼³Ä¡µÇ¾îÀÖÁö ¾Ê°Å³ª ãÀ» ¼ö ¾ø½À´Ï´Ù.
Âü°í »çÀÌÆ® http://adtpro.com/install.html
+Gui.NoSerialLib=½Ã¸®¾ó ¶óÀ̺귯¸®°¡ ¼³Ä¡µÇ¾îÀÖÁö ¾Ê½À´Ï´Ù.
+Gui.NoSerialLibDialogTitle=½Ã¸®¾ó Æ÷Æ® ¾øÀ½
+Gui.NoSerialLibDialogText=½Ã¸®¾ó Æ÷Æ®°¡ ¾ø°Å³ª ½Ã¸®¾ó ¶óÀ̺귯¸® °¡ ¼³Ä¡µÇ¾îÀÖÁö ¾Ê°Å³ª ãÀ» ¼ö ¾ø½À´Ï´Ù.
Âü°í »çÀÌÆ® http://adtpro.com/install.html
Gui.File=ÆÄÀÏ
Gui.Config=¼³Á¤
Gui.IIc=Apple IIc ¿¡ À̹ÌÁö¶óÀÌÅÍ ÄÉÀ̺í·Î ¿¬°á
diff --git a/src/org/adtpro/resources/messages_pt_BR.native b/src/org/adtpro/resources/messages_pt_BR.native
index d8332981..26c5609d 100644
--- a/src/org/adtpro/resources/messages_pt_BR.native
+++ b/src/org/adtpro/resources/messages_pt_BR.native
@@ -36,9 +36,9 @@ Gui.NoAudio=N
Gui.NoAudioDialogTitle=Dispositivos de áudio não encontrados
Gui.NoAudioDialogText=Não existem dispositivos de áudio diponíveis para o console Java neste computador.
Gui.DefaultAudioMixer=ADTPro Captura de Áudio Padrão
-Gui.NoRXTX=Biblioteca Serial não instalada
-Gui.NoRXTXDialogTitle=Portas seriais não disponíveis
-Gui.NoRXTXDialogText=Não há portas seriais ou a Biblioteca serial RXTX não está instalada ou visível.
Please see http://adtpro.com/install.html for details.
+Gui.NoSerialLib=Biblioteca Serial não instalada
+Gui.NoSerialLibDialogTitle=Portas seriais não disponíveis
+Gui.NoSerialLibDialogText=Não há portas seriais ou a Biblioteca serial não está instalada ou visível.
Please see http://adtpro.com/install.html for details.
Gui.File=Arquivo
Gui.Config=Configuração
Gui.IIc=Apple IIc com Cabo Imagewriter
diff --git a/src/org/adtpro/transport/SerialTransport.java b/src/org/adtpro/transport/SerialTransport.java
index 6a892aa5..13a476bb 100644
--- a/src/org/adtpro/transport/SerialTransport.java
+++ b/src/org/adtpro/transport/SerialTransport.java
@@ -257,10 +257,10 @@ public void setParms(String newPort, int newSpeed, boolean newHardware) throws E
}
/**
- * Sets the speed of the underlying Java COMM API rxtxPort.
+ * Sets the speed of the underlying serial port.
*
* @param speed
- * The speed to set the transrxtxPort to.
+ * The speed to set the serial port to.
* @exception IOException
* thrown when a problem occurs with flushing the
* stream.
@@ -367,7 +367,7 @@ public void writeByte(byte datum, String str)
public void pullBuffer()
{
- // Serial rxtxPort is byte-by-byte, no buffering
+ // Serial port is byte-by-byte, no buffering
}
public void pushBuffer()
diff --git a/src/org/adtpro/utilities/BareBonesBrowserLaunch.java b/src/org/adtpro/utilities/BareBonesBrowserLaunch.java
deleted file mode 100644
index a94c8548..00000000
--- a/src/org/adtpro/utilities/BareBonesBrowserLaunch.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * ADTPro - Apple Disk Transfer ProDOS
- * Copyright (C) 2007 by David Schmidt
- * 1110325+david-schmidt@users.noreply.github.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-package org.adtpro.utilities;
-
-/////////////////////////////////////////////////////////
-// Bare Bones Browser Launch
-//
-// Version 1.5
-//
-// December 10, 2005
-//
-// Supports: Mac OS X, GNU/Linux, Unix, Windows XP
-//
-// Example Usage:
-//
-// String url = "http://www.centerkey.com/";
-//
-// BareBonesBrowserLaunch.openURL(url);
-//
-// Public Domain Software -- Free to Use as You Like
-// /////////////////////////////////////////////////////////
-import java.lang.reflect.Method;
-import javax.swing.JOptionPane;
-
-public class BareBonesBrowserLaunch
-{
- private static final String errMsg = "Error attempting to launch web browser";
-
- public static void openURL(String url)
- {
- String osName = System.getProperty("os.name");
- try
- {
- if (osName.startsWith("Mac OS"))
- {
- Class fileMgr = Class.forName("com.apple.eio.FileManager");
- Method openURL = fileMgr.getDeclaredMethod("openURL", new Class[]
- { String.class });
- openURL.invoke(null, new Object[]
- { url });
- }
- else
- if (osName.startsWith("Windows"))
- Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + url);
- else
- { // assume Unix or Linux
- String[] browsers =
- { "firefox", "opera", "konqueror", "epiphany", "mozilla", "netscape" };
- String browser = null;
- for (int count = 0; count < browsers.length && browser == null; count++)
- if (Runtime.getRuntime().exec(new String[]
- { "which", browsers[count] }).waitFor() == 0) browser = browsers[count];
- if (browser == null) throw new Exception("Could not find web browser");
- else
- {
- Runtime.getRuntime().exec(new String[]{ browser, url });
- }
- }
- }
- catch (Exception e)
- {
- JOptionPane.showMessageDialog(null, errMsg + ":\n" + e.getLocalizedMessage());
- }
- }
-}
\ No newline at end of file