summaryrefslogtreecommitdiff
path: root/java/demo/Ice/nested
diff options
context:
space:
mode:
authorMichi Henning <michi@zeroc.com>2004-08-31 04:36:28 +0000
committerMichi Henning <michi@zeroc.com>2004-08-31 04:36:28 +0000
commitb48723e3d4ba8b7d3626c052ff398697731370a2 (patch)
treec038aa8cea773a7ae45dc511ea5548730801884b /java/demo/Ice/nested
parentinitial check-in (diff)
downloadice-b48723e3d4ba8b7d3626c052ff398697731370a2.tar.bz2
ice-b48723e3d4ba8b7d3626c052ff398697731370a2.tar.xz
ice-b48723e3d4ba8b7d3626c052ff398697731370a2.zip
Deprecation of global Slice definitions.
Diffstat (limited to 'java/demo/Ice/nested')
-rw-r--r--java/demo/Ice/nested/Nested.ice5
-rw-r--r--java/demo/Ice/nested/NestedClient.java2
-rw-r--r--java/demo/Ice/nested/NestedI.java4
-rw-r--r--java/demo/Ice/nested/NestedServer.java2
4 files changed, 12 insertions, 1 deletions
diff --git a/java/demo/Ice/nested/Nested.ice b/java/demo/Ice/nested/Nested.ice
index 916d80d0a12..4216d412f11 100644
--- a/java/demo/Ice/nested/Nested.ice
+++ b/java/demo/Ice/nested/Nested.ice
@@ -10,9 +10,14 @@
#ifndef NESTED_ICE
#define NESTED_ICE
+module Demo
+{
+
interface Nested
{
void nestedCall(int level, Nested* proxy);
};
+};
+
#endif
diff --git a/java/demo/Ice/nested/NestedClient.java b/java/demo/Ice/nested/NestedClient.java
index 48e277e0bbe..7bfc0266f44 100644
--- a/java/demo/Ice/nested/NestedClient.java
+++ b/java/demo/Ice/nested/NestedClient.java
@@ -7,6 +7,8 @@
//
// **********************************************************************
+import Demo.*;
+
class NestedClient extends Ice.Application
{
public int
diff --git a/java/demo/Ice/nested/NestedI.java b/java/demo/Ice/nested/NestedI.java
index 8f45576a92d..ff624b419d4 100644
--- a/java/demo/Ice/nested/NestedI.java
+++ b/java/demo/Ice/nested/NestedI.java
@@ -7,7 +7,9 @@
//
// **********************************************************************
-class NestedI extends Nested
+import Demo.*;
+
+class NestedI extends _NestedDisp
{
NestedI(NestedPrx self)
{
diff --git a/java/demo/Ice/nested/NestedServer.java b/java/demo/Ice/nested/NestedServer.java
index 3606a1a83eb..337a812cbf1 100644
--- a/java/demo/Ice/nested/NestedServer.java
+++ b/java/demo/Ice/nested/NestedServer.java
@@ -7,6 +7,8 @@
//
// **********************************************************************
+import Demo.*;
+
class NestedServer extends Ice.Application
{
public int