Fixed demos and exception test to get rid of case-insensitivity warnings.

9 files changed, 18 insertions, 18 deletions

diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index 769b064e2ec..c761b2415a2 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -73,23 +73,23 @@ public class Client
                 }
                 if(line.equals("t"))
                 {
-                    twoway.hello();
+                    twoway.sayHello();
                 }
                 else if(line.equals("o"))
                 {
-                    oneway.hello();
+                    oneway.sayHello();
                 }
                 else if(line.equals("O"))
                 {
-                    batchOneway.hello();
+                    batchOneway.sayHello();
                 }
                 else if(line.equals("d"))
                 {
-                    datagram.hello();
+                    datagram.sayHello();
                 }
                 else if(line.equals("D"))
                 {
-                    batchDatagram.hello();
+                    batchDatagram.sayHello();
                 }
                 else if(line.equals("f"))
                 {
diff --git a/java/demo/Ice/hello/Hello.ice b/java/demo/Ice/hello/Hello.ice
index c753e2cdce8..c84da211ef8 100644
--- a/java/demo/Ice/hello/Hello.ice
+++ b/java/demo/Ice/hello/Hello.ice
@@ -13,7 +13,7 @@
 
 class Hello
 {
-    void hello();
+    void sayHello();
     void shutdown();
 };
 
diff --git a/java/demo/Ice/hello/HelloI.java b/java/demo/Ice/hello/HelloI.java
index 8f20e96d9d6..e40b8dd42d0 100644
--- a/java/demo/Ice/hello/HelloI.java
+++ b/java/demo/Ice/hello/HelloI.java
@@ -17,7 +17,7 @@ public class HelloI extends Hello
     }
 
     public void
-    hello(Ice.Current current)
+    sayHello(Ice.Current current)
     {
         System.out.println("Hello World!");
     }
diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice
index 628cc6ef696..77fae054a2e 100644
--- a/java/demo/Ice/nested/Nested.ice
+++ b/java/demo/Ice/nested/Nested.ice
@@ -13,7 +13,7 @@
 
 class Nested
 {
-    void nested(int level, Nested* proxy);
+    void nestedCall(int level, Nested* proxy);
 };
 
 #endif
diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java
index 39709ed9130..d65bb25127f 100644
--- a/java/demo/Ice/nested/NestedClient.java
+++ b/java/demo/Ice/nested/NestedClient.java
@@ -58,7 +58,7 @@ class NestedClient extends Ice.Application
                 int level = Integer.parseInt(s);
                 if(level > 0)
                 {
-                    nested.nested(level, self);
+                    nested.nestedCall(level, self);
                 }
             }
             catch(NumberFormatException ex)
diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java
index 1ef3cdaf0f9..9d7291eb7a2 100644
--- a/java/demo/Ice/nested/NestedI.java
+++ b/java/demo/Ice/nested/NestedI.java
@@ -16,12 +16,12 @@ class NestedI extends Nested
     }
 
     public void
-    nested(int level, NestedPrx proxy, Ice.Current current)
+    nestedCall(int level, NestedPrx proxy, Ice.Current current)
     {
         System.out.println("" + level);
         if(--level > 0)
         {
-            proxy.nested(level, _self, current.ctx);
+            proxy.nestedCall(level, _self, current.ctx);
         }
     }
 
diff --git a/java/demo/IceBox/hello/Client.java b/java/demo/IceBox/hello/Client.java
index a52896027b7..50a5cd0e245 100644
--- a/java/demo/IceBox/hello/Client.java
+++ b/java/demo/IceBox/hello/Client.java
@@ -72,23 +72,23 @@ public class Client
                 }
                 if(line.equals("t"))
                 {
-                    twoway.hello();
+                    twoway.sayHello();
                 }
                 else if(line.equals("o"))
                 {
-                    oneway.hello();
+                    oneway.sayHello();
                 }
                 else if(line.equals("O"))
                 {
-                    batchOneway.hello();
+                    batchOneway.sayHello();
                 }
                 else if(line.equals("d"))
                 {
-                    datagram.hello();
+                    datagram.sayHello();
                 }
                 else if(line.equals("D"))
                 {
-                    batchDatagram.hello();
+                    batchDatagram.sayHello();
                 }
                 else if(line.equals("f"))
                 {
diff --git a/java/demo/IceBox/hello/Hello.ice b/java/demo/IceBox/hello/Hello.ice
index c753e2cdce8..c84da211ef8 100644
--- a/java/demo/IceBox/hello/Hello.ice
+++ b/java/demo/IceBox/hello/Hello.ice
@@ -13,7 +13,7 @@
 
 class Hello
 {
-    void hello();
+    void sayHello();
     void shutdown();
 };
 
diff --git a/java/demo/IceBox/hello/HelloI.java b/java/demo/IceBox/hello/HelloI.java
index 8f20e96d9d6..e40b8dd42d0 100644
--- a/java/demo/IceBox/hello/HelloI.java
+++ b/java/demo/IceBox/hello/HelloI.java
@@ -17,7 +17,7 @@ public class HelloI extends Hello
     }
 
     public void
-    hello(Ice.Current current)
+    sayHello(Ice.Current current)
     {
         System.out.println("Hello World!");
     }