[Ogoglio-commits] SF.net SVN: ogoglio: [700] maven/trunk/ogoglio-viewer-applet/src/main/java/ com/ogoglio/viewer/applet/ViewerApplet.java

[<tre...@us...>]

Revision: 700
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=700&view=rev
Author:   trevorolio
Date:     2008-01-30 14:44:28 -0800 (Wed, 30 Jan 2008)

Log Message:
-----------
Added the requested IP number to the service doc so the applet can work against round robin dns clusters, on Windows, in Firefox.  Also tweaked the renderer graphics config to indicate a lowest level of texture bit depth, which also has the nice side effect of making the card use higher bit depth if possible.  

Modified Paths:
--------------
    maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java

Modified: maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java
===================================================================
--- maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java	2008-01-30 22:44:12 UTC (rev 699)
+++ maven/trunk/ogoglio-viewer-applet/src/main/java/com/ogoglio/viewer/applet/ViewerApplet.java	2008-01-30 22:44:28 UTC (rev 700)
@@ -65,6 +65,8 @@
 
     private URI serviceURI = null;
 
+    private String serverIP = null;
+    
     private String authCookie = null;
 
     private Map popupMap = new HashMap();
@@ -103,6 +105,16 @@
             return;
         }
 
+        serverIP = getParameter("serverIP");
+        if(serverIP == null || serverIP.length() == 0){
+            removeAll();
+            validate();
+            add(new ErrorPanel("I can't find the server IP."), BorderLayout.CENTER);
+            validate();
+            repaint();
+            return;
+        }
+        
         float x = getFloatParameter("x", 0);
         float y = getFloatParameter("y", 0);
         float z = getFloatParameter("z", 0);
@@ -119,6 +131,11 @@
 
         try {
             serviceURI = new URI(getParameter("serviceURI"));
+            String port = serviceURI.getPort() == -1 ? "" : ":" + serviceURI.getPort();
+            serviceURI = URI.create(serviceURI.getScheme() + "://" + serverIP + port + serviceURI.getPath());
+
+            System.out.println("Service URI is: " + serviceURI);
+            
             long spaceID = Long.parseLong(getParameter("spaceID"));
             spaceClient = new SpaceClient(spaceID, serviceURI, authCookie, spaceClientListener);
             if (x != 0 || y != 0 || z != 0 || rx != 0 || ry != 0 || rz != 0) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.