Replaced invalid struct name Struct with Structure.

3 files changed, 9 insertions, 9 deletions

diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 476480b7594..60336713564 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -316,8 +316,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         return r;
     }
 
-    public Test.Struct
-    opStruct(Test.Struct p1, Test.Struct p2, Test.StructHolder p3,
+    public Test.Structure
+    opStruct(Test.Structure p1, Test.Structure p2, Test.StructureHolder p3,
              Ice.Current current)
     {
         p3.value = p1;
diff --git a/java/test/Ice/operations/Test.ice b/java/test/Ice/operations/Test.ice
index 14c444246cd..9e470079525 100644
--- a/java/test/Ice/operations/Test.ice
+++ b/java/test/Ice/operations/Test.ice
@@ -28,7 +28,7 @@ struct AnotherStruct
     string s;
 };
 
-struct Struct
+struct Structure
 {
     MyClass* p;
     MyEnum e;
@@ -90,8 +90,8 @@ class MyClass
 
     MyClass* opMyClass(MyClass* p1, out MyClass* p2, out MyClass* p3);
 
-    Struct opStruct(Struct p1, Struct p2,
-		    out Struct p3);
+    Structure opStruct(Structure p1, Structure p2,
+		       out Structure p3);
 
     ByteS opByteS(ByteS p1, ByteS p2,
 		  out ByteS p3);
diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java
index b8dfe31212a..21a0f2bd7b3 100644
--- a/java/test/Ice/operations/Twoways.java
+++ b/java/test/Ice/operations/Twoways.java
@@ -142,19 +142,19 @@ class Twoways
 
 
         {
-            Test.Struct si1 = new Test.Struct();
+            Test.Structure si1 = new Test.Structure();
             si1.p = p;
             si1.e = Test.MyEnum.enum3;
             si1.s = new Test.AnotherStruct();
             si1.s.s = "abc";
-            Test.Struct si2 = new Test.Struct();
+            Test.Structure si2 = new Test.Structure();
             si2.p = null;
             si2.e = Test.MyEnum.enum2;
             si2.s = new Test.AnotherStruct();
             si2.s.s = "def";
 
-            Test.StructHolder so = new Test.StructHolder();
-            Test.Struct rso = p.opStruct(si1, si2, so);
+            Test.StructureHolder so = new Test.StructureHolder();
+            Test.Structure rso = p.opStruct(si1, si2, so);
             test(rso.p == null);
             test(rso.e == Test.MyEnum.enum2);
             test(rso.s.s.equals("def"));