From a2b4013d495f83faf7ef3220f96c7d7940638265 Mon Sep 17 00:00:00 2001 From: David Avendasora Date: Wed, 8 Jan 2014 10:40:07 -0500 Subject: [PATCH] Fix prototype class names to match the naming convention that we changed to, oh, say 5 or 6 years ago. Always good to catch these things early! --- .../er/extensions/foundation/ERXMappingObjectStream.java | 2 +- .../erprototypes.eomodeld/EOJDBCAccessPrototypes.plist | 2 +- .../erprototypes.eomodeld/EOJDBCDB2Prototypes.plist | 2 +- .../erprototypes.eomodeld/EOJDBCDBasePrototypes.plist | 2 +- .../erprototypes.eomodeld/EOJDBCFirebirdPrototypes.plist | 6 +++--- .../erprototypes.eomodeld/EOJDBCInterbasePrototypes.plist | 2 +- .../erprototypes.eomodeld/EOJDBCSQLServerPrototypes.plist | 2 +- .../Resources/erprototypes.eomodeld/EORESTPrototypes.plist | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMappingObjectStream.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMappingObjectStream.java index 6d5624679bd..9dfd314423c 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMappingObjectStream.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/foundation/ERXMappingObjectStream.java @@ -22,7 +22,7 @@ public ERXMappingObjectStream(InputStream inputstream) throws IOException { @Override protected Class resolveClass(ObjectStreamClass objectstreamclass) throws IOException, ClassNotFoundException { Class result = null; - if(objectstreamclass.getName().equals("er.extensions.ERXMutableArray")) { + if(objectstreamclass.getName().equals("er.extensions.foundation.ERXMutableArray")) { return ERXMutableArray.class; } if(objectstreamclass.getName().equals("er.extensions.ERXMutableDictionary")) { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCAccessPrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCAccessPrototypes.plist index f0fa4ccdf94..87dc5ecad62 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCAccessPrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCAccessPrototypes.plist @@ -226,7 +226,7 @@ columnName = mutableDictionary; externalType = "OLE Object"; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDB2Prototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDB2Prototypes.plist index 9708554172d..7e4da4c26f7 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDB2Prototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDB2Prototypes.plist @@ -230,7 +230,7 @@ columnName = mutableDictionary; externalType = BLOB; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDBasePrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDBasePrototypes.plist index f0fb77c26c5..e12c73620e7 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDBasePrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCDBasePrototypes.plist @@ -231,7 +231,7 @@ columnName = mutableDictionary; externalType = MEMO; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCFirebirdPrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCFirebirdPrototypes.plist index fb184b2880e..f1a69fcac8a 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCFirebirdPrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCFirebirdPrototypes.plist @@ -102,7 +102,7 @@ externalType = VARCHAR; factoryMethodArgumentType = EOFactoryMethodArgumentIsNSString; name = globalID; - valueClassName = "er.extensions.ERXKeyGlobalID"; + valueClassName = "er.extensions.eof.ERXKeyGlobalID"; valueFactoryMethodName = fromString; valueType = c; width = 255; @@ -217,7 +217,7 @@ columnName = mutableArray; externalType = "BLOB SUB_TYPE 0"; name = mutableArray; - valueClassName = "er.extensions.ERXMutableArray"; + valueClassName = "er.extensions.foundation.ERXMutableArray"; valueFactoryMethodName = fromBlob; }, { @@ -225,7 +225,7 @@ columnName = mutableDictionary; externalType = "BLOB SUB_TYPE 0"; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCInterbasePrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCInterbasePrototypes.plist index d9691caafea..917c061a976 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCInterbasePrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCInterbasePrototypes.plist @@ -231,7 +231,7 @@ columnName = mutableDictionary; externalType = BLOB; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCSQLServerPrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCSQLServerPrototypes.plist index 6baa50b296d..94b52381ba8 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCSQLServerPrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EOJDBCSQLServerPrototypes.plist @@ -231,7 +231,7 @@ columnName = mutableDictionary; externalType = binary; name = mutableDictionary; - valueClassName = "er.extensions.ERXMutableDictionary"; + valueClassName = "er.extensions.foundation.ERXMutableDictionary"; valueFactoryMethodName = fromBlob; }, { diff --git a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EORESTPrototypes.plist b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EORESTPrototypes.plist index a7471e3db79..13d792c9650 100644 --- a/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EORESTPrototypes.plist +++ b/Frameworks/Core/ERPrototypes/Resources/erprototypes.eomodeld/EORESTPrototypes.plist @@ -93,7 +93,7 @@ externalType = VARCHAR; factoryMethodArgumentType = EOFactoryMethodArgumentIsNSString; name = globalID; - valueClassName = "er.extensions.foundation.ERXKeyGlobalID"; + valueClassName = "er.extensions.eof.ERXKeyGlobalID"; valueFactoryMethodName = fromString; width = 255; },