static boolean alreadyDetectedProxy = false;
/** the result of proxy autodetection */
- static HTTP.ProxyInfo cachedProxyInfo = null;
+ static Proxy cachedProxyInfo = null;
/** the current build */
public static String build = "unknown";
// reflection.
static {
- System.out.println("Detecting JVM...");
+ System.err.println("Detecting JVM...");
try {
String vendor = System.getProperty("java.vendor", "");
String version = System.getProperty("java.version", "");
String os_name = System.getProperty("os.name", "");
+ String os_version = System.getProperty("os.version", "");
String platform_class = null;
//if (os_name.startsWith("Mac OS X")) platform_class = "MacOSX";
if (vendor.startsWith("Free Software Foundation")) {
if (os_name.startsWith("Window")) platform_class = "Win32";
- else platform_class = "POSIX";
+ else platform_class = "X11";
} else if (version.startsWith("1.1") && vendor.startsWith("Netscape")) platform_class = "Netscape";
else if (version.startsWith("1.1") && vendor.startsWith("Microsoft")) platform_class = "Microsoft";
- else if (version.startsWith("1.4")) platform_class = "Java14";
- else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java12";
+ else if (!version.startsWith("1.0") && !version.startsWith("1.1")) platform_class = "Java2";
+
+ // Disable 2d hardware acceleration on Jaguar
+ if (os_name.equals("Mac OS X") && os_version.equals("10.2"))
+ System.setProperty("com.apple.hwaccel", "false");
if (platform_class != null) {
platform = (Platform)Class.forName("org.xwt.plat." + platform_class).newInstance();
if (Log.on) Log.log(Platform.class, "XWT VM detection: vendor = " + vendor);
if (Log.on) Log.log(Platform.class, " version = " + version);
- if (Log.on) Log.log(Platform.class, " os = " + os_name);
+ if (Log.on) Log.log(Platform.class, " os = " + os_name + " [version " + os_version + "]");
if (Log.on && Main.applet != null) Log.log(Platform.class, " browser = " + Main.applet.getParameter("browser"));
if (platform_class == null) {
}
/** Returns null if XWT should always use direct connection; otherwise returns a ProxyInfo object with proxy settings */
- protected synchronized HTTP.ProxyInfo _detectProxy() { return null; }
+ protected synchronized Proxy _detectProxy() { return null; }
/** displays a platform-specific "open file" dialog and returns the chosen filename, or null if the user hit cancel */
protected String _fileDialog(String suggestedFileName, boolean write) { return null; }
}
/** detects proxy settings */
- public static synchronized HTTP.ProxyInfo detectProxy() {
+ public static synchronized Proxy detectProxy() {
if (cachedProxyInfo != null) return cachedProxyInfo;
if (alreadyDetectedProxy) return null;
alreadyDetectedProxy = true;
if (Log.on) Log.log(Platform.class, "attempting environment-variable DNS proxy detection");
- cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaManual();
+ cachedProxyInfo = Proxy.detectProxyViaManual();
if (cachedProxyInfo != null) return cachedProxyInfo;
if (Log.on) Log.log(Platform.class, "attempting " + platform.getClass().getName() + " proxy detection");
cachedProxyInfo = platform._detectProxy();
if (cachedProxyInfo != null) return cachedProxyInfo;
- if (Log.on) Log.log(Platform.class, "attempting WPAD proxy detection");
- cachedProxyInfo = HTTP.ProxyInfo.detectProxyViaWPAD();
- if (cachedProxyInfo != null) return cachedProxyInfo;
-
return cachedProxyInfo;
}