Rename DefaultObjectImpl to ObjectI

6 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp
index ceaacf73b9f..a55c58a810c 100644
--- a/cpp/src/slice2swift/Gen.cpp
+++ b/cpp/src/slice2swift/Gen.cpp
@@ -1563,7 +1563,7 @@ Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
     out << sb;
     out << nl << "public let servant: " << servant;
 
-    out << nl << "private static let defaultObjectImpl = " << getUnqualified("Ice.DefaultObjectImpl", swiftModule)
+    out << nl << "private static let defaultObject = " << getUnqualified("Ice.ObjectI", swiftModule)
         << "<" << traits << ">()";
 
     out << sp;
@@ -1604,7 +1604,7 @@ Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
         out.inc();
         if(opName == "ice_id" || opName == "ice_ids" || opName == "ice_isA" || opName == "ice_ping")
         {
-            out << nl << "try (servant as? Object ?? " << disp << ".defaultObjectImpl)._iceD_"
+            out << nl << "try (servant as? Object ?? " << disp << ".defaultObject)._iceD_"
                 << opName << "(incoming: inS, current: current)";
         }
         else
diff --git a/swift/src/Ice/Object.swift b/swift/src/Ice/Object.swift
index 158cb663c29..c7fa5c92b39 100644
--- a/swift/src/Ice/Object.swift
+++ b/swift/src/Ice/Object.swift
@@ -98,9 +98,9 @@ public struct ObjectTraits: SliceTraits {
     public static let staticId = "::Ice::Object"
 }
 
-/// class DefaultObjectImpl provides the default implementation of Object operations (ice_id,
+/// class ObjectI provides the default implementation of Object operations (ice_id,
 /// ice_ping etc.) for a given Slice interface.
-open class DefaultObjectImpl<T: SliceTraits>: Object {
+open class ObjectI<T: SliceTraits>: Object {
     public init() {}
 
     open func ice_id(current _: Current) throws -> String {
diff --git a/swift/test/Ice/defaultServant/AllTests.swift b/swift/test/Ice/defaultServant/AllTests.swift
index a93039679f4..7ef588056c1 100644
--- a/swift/test/Ice/defaultServant/AllTests.swift
+++ b/swift/test/Ice/defaultServant/AllTests.swift
@@ -5,7 +5,7 @@
 import Ice
 import TestCommon
 
-final class MyObjectI: DefaultObjectImpl<MyObjectTraits>, MyObject {
+final class MyObjectI: ObjectI<MyObjectTraits>, MyObject {
     override func ice_ping(current: Ice.Current) throws {
         if current.id.name == "ObjectNotExist" {
             throw Ice.ObjectNotExistException(id: current.id, facet: "", operation: "ice_ping")
diff --git a/swift/test/Ice/operations/TestI.swift b/swift/test/Ice/operations/TestI.swift
index 5bfd0abfdf1..8bc95f8c279 100644
--- a/swift/test/Ice/operations/TestI.swift
+++ b/swift/test/Ice/operations/TestI.swift
@@ -12,7 +12,7 @@ class BI: MBOperations {
     func opIntf(current _: Ice.Current) throws {}
 }
 
-class MyDerivedClassI: DefaultObjectImpl<MyDerivedClassTraits>, MyDerivedClass {
+class MyDerivedClassI: ObjectI<MyDerivedClassTraits>, MyDerivedClass {
     var _helper: TestHelper
     var _opByteSOnewayCallCount: Int32 = 0
     var _lock = os_unfair_lock()
diff --git a/swift/test/Ice/proxy/TestAMDI.swift b/swift/test/Ice/proxy/TestAMDI.swift
index 201577db052..90ca5b29c51 100644
--- a/swift/test/Ice/proxy/TestAMDI.swift
+++ b/swift/test/Ice/proxy/TestAMDI.swift
@@ -4,7 +4,7 @@
 import Ice
 import PromiseKit
 
-final class MyDerivedClassI: DefaultObjectImpl<MyDerivedClassTraits>, MyDerivedClass {
+final class MyDerivedClassI: ObjectI<MyDerivedClassTraits>, MyDerivedClass {
     var _ctx: [String: String]
 
     override init() {
diff --git a/swift/test/Ice/proxy/TestI.swift b/swift/test/Ice/proxy/TestI.swift
index 9559531c5b4..dd7c17a573c 100644
--- a/swift/test/Ice/proxy/TestI.swift
+++ b/swift/test/Ice/proxy/TestI.swift
@@ -3,7 +3,7 @@
 //
 import Ice
 
-final class MyDerivedClassI: DefaultObjectImpl<MyDerivedClassTraits>, MyDerivedClass {
+final class MyDerivedClassI: ObjectI<MyDerivedClassTraits>, MyDerivedClass {
     var _ctx: [String: String]
 
     override init() {