summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/demo/Glacier2/callback/SessionManagerI.java2
-rwxr-xr-xjava/src/IceGridGUI/Application/ServerTemplates.java6
-rwxr-xr-xjava/src/IceGridGUI/Application/ServiceTemplates.java3
3 files changed, 4 insertions, 7 deletions
diff --git a/java/demo/Glacier2/callback/SessionManagerI.java b/java/demo/Glacier2/callback/SessionManagerI.java
index aabf110e447..9ee348f292c 100644
--- a/java/demo/Glacier2/callback/SessionManagerI.java
+++ b/java/demo/Glacier2/callback/SessionManagerI.java
@@ -10,7 +10,7 @@
public final class SessionManagerI extends Glacier2._SessionManagerDisp
{
public Glacier2.SessionPrx
- create(String userId, Ice.Current current)
+ create(String userId, Glacier2.SessionControlPrx control, Ice.Current current)
{
System.out.println("creating session for user `" + userId + "'");
Glacier2.Session session = new SessionI(userId);
diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/Application/ServerTemplates.java
index 9141a0ae058..735fe38218c 100755
--- a/java/src/IceGridGUI/Application/ServerTemplates.java
+++ b/java/src/IceGridGUI/Application/ServerTemplates.java
@@ -67,16 +67,14 @@ class ServerTemplates extends Templates
newServerTemplate(new TemplateDescriptor(
Server.newServerDescriptor(),
new java.util.LinkedList(),
- new java.util.TreeMap(),
- new java.util.HashMap()));
+ new java.util.TreeMap()));
}
public void newTemplateServerIceBox()
{
newServerTemplate(new TemplateDescriptor(
Server.newIceBoxDescriptor(),
new java.util.LinkedList(),
- new java.util.TreeMap(),
- new java.util.HashMap()));
+ new java.util.TreeMap()));
}
public void paste()
{
diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java
index 4dc9f5d3ac4..eb5511bf547 100755
--- a/java/src/IceGridGUI/Application/ServiceTemplates.java
+++ b/java/src/IceGridGUI/Application/ServiceTemplates.java
@@ -74,8 +74,7 @@ class ServiceTemplates extends Templates
"",
"");
- newServiceTemplate(new TemplateDescriptor(
- sd, new java.util.LinkedList(), new java.util.TreeMap(), new java.util.HashMap()));
+ newServiceTemplate(new TemplateDescriptor(sd, new java.util.LinkedList(), new java.util.TreeMap()));
}
public void paste()