5 files changed, 7 insertions, 7 deletions
diff --git a/java/demo/Freeze/library/Collocated.java b/java/demo/Freeze/library/Collocated.java
index 7e275e1d229..8629e894d7a 100644
--- a/java/demo/Freeze/library/Collocated.java
+++ b/java/demo/Freeze/library/Collocated.java
@@ -64,7 +64,7 @@ class Collocated extends Ice.Application
         // Create and install a factory and initializer for books.
         //
         Ice.ObjectFactory bookFactory = new BookFactory(library);
-        communicator().addObjectFactory(bookFactory, "::Demo::Book");
+        communicator().addObjectFactory(bookFactory, Demo.Book.ice_staticId());
     
         //
         // Everything ok, let's go.
diff --git a/java/demo/Freeze/library/Server.java b/java/demo/Freeze/library/Server.java
index 2edfb823034..7af7e3a8a61 100644
--- a/java/demo/Freeze/library/Server.java
+++ b/java/demo/Freeze/library/Server.java
@@ -47,7 +47,7 @@ class Server extends Ice.Application
         // Create and install a factory for books.
         //
         Ice.ObjectFactory bookFactory = new BookFactory(library);
-        communicator().addObjectFactory(bookFactory, "::Demo::Book");
+        communicator().addObjectFactory(bookFactory, Demo.Book.ice_staticId());
     
         //
         // Everything ok, let's go.
diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index 47abe391520..9d1b316ddfd 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -41,7 +41,7 @@ class Collocated extends Ice.Application
         // Create and install a factory for contacts.
         //
         ContactFactory contactFactory = new ContactFactory();
-        communicator().addObjectFactory(contactFactory, "::Demo::Contact");
+        communicator().addObjectFactory(contactFactory, Demo.Contact.ice_staticId());
 
         //
         // Create an object adapter
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 3dbf0d0d0d1..692b465da7f 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -24,7 +24,7 @@ class Server extends Ice.Application
         // Create and install a factory for contacts.
         //
         ContactFactory contactFactory = new ContactFactory();
-        communicator().addObjectFactory(contactFactory, "::Demo::Contact");
+        communicator().addObjectFactory(contactFactory, Demo.Contact.ice_staticId());
 
         //
         // Create an object adapter
diff --git a/java/demo/Ice/value/Client.java b/java/demo/Ice/value/Client.java
index dbac804ad37..58ee94fcdbc 100644
--- a/java/demo/Ice/value/Client.java
+++ b/java/demo/Ice/value/Client.java
@@ -104,7 +104,7 @@ public class Client extends Ice.Application
         readline(in);
 
         Ice.ObjectFactory factory = new ObjectFactory();
-        communicator().addObjectFactory(factory, "::Demo::Printer");
+        communicator().addObjectFactory(factory, Demo.Printer.ice_staticId());
 
         initial.getPrinter(printer, printerProxy);
         System.out.println("==> " + printer.value.message);
@@ -136,7 +136,7 @@ public class Client extends Ice.Application
 
         Printer derivedAsBase = initial.getDerivedPrinter();
         System.out.println("==> The type ID of the received object is \"" + derivedAsBase.ice_id() + "\"");
-        assert(derivedAsBase.ice_id().equals("::Demo::Printer"));
+        assert(derivedAsBase.ice_id().equals(Demo.Printer.ice_staticId()));
 
         System.out.println();
         System.out.println("Now we install a factory for the derived class, and try again.");
@@ -145,7 +145,7 @@ public class Client extends Ice.Application
         System.out.println("[press enter]");
         readline(in);
 
-        communicator().addObjectFactory(factory, "::Demo::DerivedPrinter");
+        communicator().addObjectFactory(factory, Demo.DerivedPrinter.ice_staticId());
 
         derivedAsBase = initial.getDerivedPrinter();
         DerivedPrinter derived = (Demo.DerivedPrinter)derivedAsBase;