summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--java/demo/Ice/hello/Client.java10
-rw-r--r--java/demo/Ice/hello/Hello.ice2
-rw-r--r--java/demo/Ice/hello/HelloI.java2
-rw-r--r--java/demo/Ice/nested/Nested.ice2
-rw-r--r--java/demo/Ice/nested/NestedClient.java2
-rw-r--r--java/demo/Ice/nested/NestedI.java4
-rw-r--r--java/demo/IceBox/hello/Client.java10
-rw-r--r--java/demo/IceBox/hello/Hello.ice2
-rw-r--r--java/demo/IceBox/hello/HelloI.java2
-rw-r--r--java/test/Ice/exceptions/AllTests.java38
-rw-r--r--java/test/Ice/exceptions/Test.ice8
-rw-r--r--java/test/Ice/exceptions/ThrowerI.java16
12 files changed, 49 insertions, 49 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!");
}
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index ec4211ba9c8..f9df6c6ef25 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -78,7 +78,7 @@ public class AllTests
}
catch(A ex)
{
- test(ex.a == 1);
+ test(ex.aMem == 1);
}
catch(Exception ex)
{
@@ -92,7 +92,7 @@ public class AllTests
}
catch(A ex)
{
- test(ex.a == 1);
+ test(ex.aMem == 1);
}
catch(Exception ex)
{
@@ -106,7 +106,7 @@ public class AllTests
}
catch(D ex)
{
- test(ex.d == -1);
+ test(ex.dMem == -1);
}
catch(Exception ex)
{
@@ -120,8 +120,8 @@ public class AllTests
}
catch(B ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
}
catch(Exception ex)
{
@@ -135,9 +135,9 @@ public class AllTests
}
catch(C ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
- test(ex.c == 3);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
+ test(ex.cMem == 3);
}
catch(Exception ex)
{
@@ -156,7 +156,7 @@ public class AllTests
}
catch(A ex)
{
- test(ex.a == 1);
+ test(ex.aMem == 1);
}
catch(Exception ex)
{
@@ -170,8 +170,8 @@ public class AllTests
}
catch(B ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
}
catch(Exception ex)
{
@@ -254,8 +254,8 @@ public class AllTests
}
catch(B ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
}
catch(Exception ex)
{
@@ -269,9 +269,9 @@ public class AllTests
}
catch(C ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
- test(ex.c == 3);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
+ test(ex.cMem == 3);
}
catch(Exception ex)
{
@@ -285,9 +285,9 @@ public class AllTests
}
catch(C ex)
{
- test(ex.a == 1);
- test(ex.b == 2);
- test(ex.c == 3);
+ test(ex.aMem == 1);
+ test(ex.bMem == 2);
+ test(ex.cMem == 3);
}
catch(Exception ex)
{
diff --git a/java/test/Ice/exceptions/Test.ice b/java/test/Ice/exceptions/Test.ice
index b48333b1b75..ffc5fc673ff 100644
--- a/java/test/Ice/exceptions/Test.ice
+++ b/java/test/Ice/exceptions/Test.ice
@@ -15,22 +15,22 @@ interface Thrower;
exception A
{
- int a;
+ int aMem;
};
exception B extends A
{
- int b;
+ int bMem;
};
exception C extends B
{
- int c;
+ int cMem;
};
exception D
{
- int d;
+ int dMem;
};
interface Thrower
diff --git a/java/test/Ice/exceptions/ThrowerI.java b/java/test/Ice/exceptions/ThrowerI.java
index 5eb8868f254..1abf04d7727 100644
--- a/java/test/Ice/exceptions/ThrowerI.java
+++ b/java/test/Ice/exceptions/ThrowerI.java
@@ -35,7 +35,7 @@ public final class ThrowerI extends _ThrowerDisp
throws A
{
A ex = new A();
- ex.a = a;
+ ex.aMem = a;
throw ex;
}
@@ -47,13 +47,13 @@ public final class ThrowerI extends _ThrowerDisp
if(a > 0)
{
A ex = new A();
- ex.a = a;
+ ex.aMem = a;
throw ex;
}
else
{
D ex = new D();
- ex.d = a;
+ ex.dMem = a;
throw ex;
}
}
@@ -70,8 +70,8 @@ public final class ThrowerI extends _ThrowerDisp
throws B
{
B ex = new B();
- ex.a = a;
- ex.b = b;
+ ex.aMem = a;
+ ex.bMem = b;
throw ex;
}
@@ -94,9 +94,9 @@ public final class ThrowerI extends _ThrowerDisp
throws C
{
C ex = new C();
- ex.a = a;
- ex.b = b;
- ex.c = c;
+ ex.aMem = a;
+ ex.bMem = b;
+ ex.cMem = c;
throw ex;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:38:22 +0000