tweaks for finishing 46

This commit is contained in:
benfry
2002-11-20 17:36:38 +00:00
parent b315c7ffd9
commit 1dded5e6bf
4 changed files with 30 additions and 1 deletions

View File

@@ -765,6 +765,20 @@ public class PdeBase extends Frame implements ActionListener {
e.printStackTrace();
}
// macosx fails on its own when trying to load the library
// so need to explicitly try here.. not sure if this is the
// correct lib, but it's at least one that's loaded inside
// the javacomm solaris stuff, which is the .jar that's included
// with the osx release (and rxtx takes over)
if (platform == MACOSX) {
try {
System.loadLibrary("SolarisSerialParallel");
} catch (UnsatisfiedLinkError e) {
//e.printStackTrace();
problem = true;
}
}
// only warn them if this is the first time
if (problem && firstTime) {
JOptionPane.showMessageDialog(frame,

View File

@@ -304,6 +304,13 @@ public class PdeEditorConsole extends Component {
}
public void message(String what, boolean err, boolean advance) {
// under osx, suppress the spew about the serial port
// to avoid an error every time someone loads their app
if (PdeBase.platform == PdeBase.MACOSX) {
if (what.equals("Error loading SolarisSerial: java.lang.UnsatisfiedLinkError: no SolarisSerialParallel in java.library.path")) return;
if (what.equals("Caught java.lang.UnsatisfiedLinkError: readRegistrySerial while loading driver com.sun.comm.SolarisDriver")) return;
}
int currentLine = (firstLine + lineCount) % maxLineCount;
lines[currentLine] = what;
isError[currentLine] = err;