Changed Slice parser to disallow leading underscore for identifiers.

    Changed Slice parser to reject identifiers beginning with "Ice", unless
    the --ice option is used. Changed Slice parser to disallow identifiers
    that have a trailing "Operations", "Holder", "Helper", "Prx", or "Ptr",
    to avoid clashes with language mappings. Fixed tests and remaining code
    base to work correctly with the changed rules.

1 files changed, 4 insertions, 4 deletions

diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index f522f246d65..c5400db0aae 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -53,7 +53,7 @@ public class Client
         readline(in);
 
         Simple simple = initial.getSimple();
-        System.out.println("==> " + simple._message);
+        System.out.println("==> " + simple.message);
 
         System.out.println();
         System.out.println("Ok, this worked. Now let's try to transfer an object for a class");
@@ -84,7 +84,7 @@ public class Client
         communicator.addObjectFactory(factory, "::Printer");
 
         initial.getPrinter(printer, printerProxy);
-        System.out.println("==> " + printer.value._message);
+        System.out.println("==> " + printer.value.message);
 
         System.out.println();
         System.out.println("Cool, it worked! Let's try calling the printBackwards() method");
@@ -143,7 +143,7 @@ public class Client
         System.out.println("[press enter]");
         readline(in);
 
-        System.out.println("==> " + derived._derivedMessage);
+        System.out.println("==> " + derived.derivedMessage);
         System.out.print("==> ");
         derived.printUppercase(null);
 
@@ -164,7 +164,7 @@ public class Client
             assert(derived != null);
         }
 
-        System.out.println("==> " + derived._derivedMessage);
+        System.out.println("==> " + derived.derivedMessage);
         System.out.print("==> ");
         derived.printUppercase(null);