Fix (ICE-7684) - use Disp prefix only for class with operations skeletons

13 files changed, 27 insertions, 27 deletions

diff --git a/js/test/Common/ControllerI.js b/js/test/Common/ControllerI.js
index d758fe65383..f83b3fc7083 100644
--- a/js/test/Common/ControllerI.js
+++ b/js/test/Common/ControllerI.js
@@ -33,7 +33,7 @@ function isWindows()
     return navigator.userAgent.indexOf("Windows") != -1;
 }
 
-class ProcessI extends Test.Common._ProcessDisp
+class ProcessI extends Test.Common.Process
 {
     constructor(promise, output)
     {
@@ -64,7 +64,7 @@ class ProcessI extends Test.Common._ProcessDisp
     }
 };
 
-class ProcessControllerI extends Test.Common._ProcessControllerDisp
+class ProcessControllerI extends Test.Common.ProcessController
 {
     constructor(output, logger, useWorker, scripts)
     {
diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js
index e7eb3871225..79ceee576dc 100644
--- a/js/test/Glacier2/router/Client.js
+++ b/js/test/Glacier2/router/Client.js
@@ -24,7 +24,7 @@
     var CallbackPrx = Test.CallbackPrx;
     var CallbackReceiverPrx = Test.CallbackReceiverPrx;
 
-    class CallbackReceiverI extends Test._CallbackReceiverDisp
+    class CallbackReceiverI extends Test.CallbackReceiver
     {
         constructor()
         {
diff --git a/js/test/Ice/exceptions/AMDThrowerI.js b/js/test/Ice/exceptions/AMDThrowerI.js
index fa3af915e91..a19e0904d07 100644
--- a/js/test/Ice/exceptions/AMDThrowerI.js
+++ b/js/test/Ice/exceptions/AMDThrowerI.js
@@ -21,7 +21,7 @@
         }
     };
 
-    class AMDThrowerI extends Test._ThrowerDisp
+    class AMDThrowerI extends Test.Thrower
     {
         shutdown(current)
         {
diff --git a/js/test/Ice/exceptions/Client.js b/js/test/Ice/exceptions/Client.js
index a2d8b75bd7c..a4841d61a0d 100644
--- a/js/test/Ice/exceptions/Client.js
+++ b/js/test/Ice/exceptions/Client.js
@@ -14,7 +14,7 @@
 
     var allTests = function(out, communicator, Test, bidir)
     {
-        class EmptyI extends Test._EmptyDisp
+        class EmptyI extends Test.Empty
         {
         }
 
diff --git a/js/test/Ice/exceptions/ThrowerI.js b/js/test/Ice/exceptions/ThrowerI.js
index 94b78be0743..7686ecb8a92 100644
--- a/js/test/Ice/exceptions/ThrowerI.js
+++ b/js/test/Ice/exceptions/ThrowerI.js
@@ -22,7 +22,7 @@
         }
     };
 
-    class ThrowerI extends Test._ThrowerDisp
+    class ThrowerI extends Test.Thrower
     {
         shutdown(current)
         {
diff --git a/js/test/Ice/facets/TestI.js b/js/test/Ice/facets/TestI.js
index 40368942d42..5a633ded44d 100644
--- a/js/test/Ice/facets/TestI.js
+++ b/js/test/Ice/facets/TestI.js
@@ -12,7 +12,7 @@
     var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
-    exports.DI = class extends Test._DDisp
+    exports.DI = class extends Test.D
     {
         callA(current)
         {
@@ -35,11 +35,11 @@
         }
     };
 
-    exports.EmptyI = class extends Test._EmptyDisp
+    exports.EmptyI = class extends Test.Empty
     {
     };
 
-    exports.FI = class extends Test._FDisp
+    exports.FI = class extends Test.F
     {
         callE(current)
         {
@@ -52,7 +52,7 @@
         }
     };
 
-    exports.HI = class extends Test._HDisp
+    exports.HI = class extends Test.H
     {
         callG(current)
         {
diff --git a/js/test/Ice/inheritance/InitialI.js b/js/test/Ice/inheritance/InitialI.js
index 969e37cd509..030babe3b2b 100644
--- a/js/test/Ice/inheritance/InitialI.js
+++ b/js/test/Ice/inheritance/InitialI.js
@@ -12,7 +12,7 @@
     var Ice = require("ice").Ice;
     var Test = require("Test").Test;
 
-    class CAI extends Test.MA._CADisp
+    class CAI extends Test.MA.CADisp
     {
         caop(p, current)
         {
@@ -20,7 +20,7 @@
         }
     }
 
-    class CBI extends Test.MB._CBDisp
+    class CBI extends Test.MB.CBDisp
     {
         caop(p, current)
         {
@@ -33,7 +33,7 @@
         }
     }
 
-    class CCI extends Test.MA._CCDisp
+    class CCI extends Test.MA.CCDisp
     {
         caop(p, current)
         {
@@ -51,7 +51,7 @@
         }
     }
 
-    class CDI extends Test.MA._CDDisp
+    class CDI extends Test.MA.CDDisp
     {
         caop(p, current)
         {
@@ -89,7 +89,7 @@
         }
     }
 
-    class IAI extends Test.MA._IADisp
+    class IAI extends Test.MA.IA
     {
         iaop(p, current)
         {
@@ -97,7 +97,7 @@
         }
     }
 
-    class IB1I extends Test.MB._IB1Disp
+    class IB1I extends Test.MB.IB1
     {
         iaop(p, current)
         {
@@ -110,7 +110,7 @@
         }
     }
 
-    class IB2I extends Test.MB._IB2Disp
+    class IB2I extends Test.MB.IB2
     {
         iaop(p, current)
         {
@@ -123,7 +123,7 @@
         }
     }
 
-    class ICI extends Test.MA._ICDisp
+    class ICI extends Test.MA.IC
     {
         iaop(p, current)
         {
@@ -146,7 +146,7 @@
         }
     }
 
-    class InitialI extends Test._InitialDisp
+    class InitialI extends Test.Initial
     {
         constructor(adapter, obj)
         {
diff --git a/js/test/Ice/objects/Client.js b/js/test/Ice/objects/Client.js
index 9b3a2b260f4..91413c1d1d7 100644
--- a/js/test/Ice/objects/Client.js
+++ b/js/test/Ice/objects/Client.js
@@ -85,7 +85,7 @@
     {
         constructor()
         {
-            super(Test._IDisp.ice_staticId());
+            super(Test.I.ice_staticId());
         }
     }
 
@@ -93,7 +93,7 @@
     {
         constructor()
         {
-            super(Test._JDisp.ice_staticId());
+            super(Test.J.ice_staticId());
         }
     }
 
diff --git a/js/test/Ice/operations/AMDMyDerivedClassI.js b/js/test/Ice/operations/AMDMyDerivedClassI.js
index 04f08afbad9..54f969cfc61 100644
--- a/js/test/Ice/operations/AMDMyDerivedClassI.js
+++ b/js/test/Ice/operations/AMDMyDerivedClassI.js
@@ -20,7 +20,7 @@
         }
     };
 
-    class AMDMyDerivedClassI extends Test._MyDerivedClassDisp
+    class AMDMyDerivedClassI extends Test.MyDerivedClass
     {
         //
         // Override the Object "pseudo" operations to verify the operation mode.
diff --git a/js/test/Ice/operations/MyDerivedClassI.js b/js/test/Ice/operations/MyDerivedClassI.js
index 6b8e2261bf5..dcb945ef8cb 100644
--- a/js/test/Ice/operations/MyDerivedClassI.js
+++ b/js/test/Ice/operations/MyDerivedClassI.js
@@ -20,7 +20,7 @@
         }
     };
 
-    class MyDerivedClassI extends Test._MyDerivedClassDisp
+    class MyDerivedClassI extends Test.MyDerivedClass
     {
         //
         // Override the Object "pseudo" operations to verify the operation mode.
diff --git a/js/test/Ice/operations/Twoways.js b/js/test/Ice/operations/Twoways.js
index 641a5d906dc..2b7b91aeacd 100644
--- a/js/test/Ice/operations/Twoways.js
+++ b/js/test/Ice/operations/Twoways.js
@@ -124,7 +124,7 @@
 
                 return prx.ice_ping();
             }
-        ).then(() => prx.ice_isA(Test._MyClassDisp.ice_staticId())
+        ).then(() => prx.ice_isA(Test.MyClass.ice_staticId())
         ).then(b =>
             {
                 test(b);
@@ -132,7 +132,7 @@
             }
         ).then(id =>
             {
-                test(id === Test._MyDerivedClassDisp.ice_staticId());
+                test(id === Test.MyDerivedClass.ice_staticId());
                 return prx.ice_ids();
             }
         ).then(ids =>
diff --git a/js/test/Ice/optional/AMDInitialI.js b/js/test/Ice/optional/AMDInitialI.js
index 8e5beb84371..9a5706f10ca 100644
--- a/js/test/Ice/optional/AMDInitialI.js
+++ b/js/test/Ice/optional/AMDInitialI.js
@@ -20,7 +20,7 @@
         }
     };
 
-    class AMDInitialI extends Test._InitialDisp
+    class AMDInitialI extends Test.Initial
     {
         shutdown(current)
         {
diff --git a/js/test/Ice/optional/InitialI.js b/js/test/Ice/optional/InitialI.js
index 6fed69100fc..ec7e7f6b99e 100644
--- a/js/test/Ice/optional/InitialI.js
+++ b/js/test/Ice/optional/InitialI.js
@@ -20,7 +20,7 @@
         }
     };
 
-    class InitialI extends Test._InitialDisp
+    class InitialI extends Test.Initial
     {
         shutdown(current)
         {