This commit was manufactured by cvs2svn to create branchtypecode-overhaul

'typecode-overhaul'.

1 files changed, 2 insertions, 57 deletions

diff --git a/TAO/interop-tests/wchar/WChar_PasserImpl.java b/TAO/interop-tests/wchar/WChar_PasserImpl.java
index ee3086bfa1b..575ba37fbe2 100644
--- a/TAO/interop-tests/wchar/WChar_PasserImpl.java
+++ b/TAO/interop-tests/wchar/WChar_PasserImpl.java
@@ -26,8 +26,7 @@ public class WChar_PasserImpl
 
     public String orb_name ()
     {
-        // we don't really know, eh?
-        return "Java ORB";
+        return "JacORB";
     }
 
     public boolean wchar_to_server (char test, short key)
@@ -66,7 +65,7 @@ public class WChar_PasserImpl
 
     public boolean wstruct_to_server (wstruct test, short key)
     {
-        return match_wstruct (key, test);
+        return false;
     }
 
     public wstruct wstruct_from_server (short key)
@@ -74,35 +73,6 @@ public class WChar_PasserImpl
         return new wstruct();
     }
 
-    public boolean wstructseq_to_server (wstruct[] test, short key)
-    {
-        boolean result = true;
-        System.out.println ("wstructseq_to_server called, key = " + key);
-        for (int i = 0; i < test.length; i++)
-        {
-            if (wstruct_to_server(test[i],key))
-            {
-                //            System.out.println ("wstructseq_to_server passed entry " + i);
-            }
-            else
-            {
-                System.out.println ("wstructseq_to_server FAILED entry " + i);
-                result = false;
-            }
-        }            
-        return result;
-    }
-    
-    public wstruct[] wstructseq_from_server (short key)
-    {
-        wstruct[] wsList = new wstruct[5];
-        for (int i = 0; i < wsList.length; i++)
-        {
-            wsList[i] = get_wstruct(key);
-        }
-        return wsList;
-    }
-
     public boolean wunion_to_server (wunion test, short key)
     {
         return false;
@@ -163,30 +133,5 @@ public class WChar_PasserImpl
         orb.shutdown(false);
     }
 
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public wstruct get_wstruct (short key)
-    {
-        wstruct result = new wstruct();
-
-        result.st_char = ref.get_wchar(key);
-        result.st_string = ref.get_wstring(key);
-        result.st_array = ref.get_warray(key);
-        result.st_any = orb.create_any();
-        result.st_any.insert_wstring(ref.get_wstring(key));
-          
-        return result;
-    }
-      
-    // TODO: this should have a home where it's accessable to both
-    // client & server, but it doesn't belong in WCharReference
-    public boolean match_wstruct (short key, wstruct test )
-    {
-        boolean result = ref.match_wchar(key, test.st_char);
-        result &= ref.match_wstring(key, test.st_string);
-        result &= ref.match_warray(key, test.st_array);
-        // @@ todo result &= ref.match_wstring (key, test.st_any.extract_wstring());
-        return result;
-    }
 
 }