diff options
| author | Benjamin Culkin <scorpress@gmail.com> | 2024-07-05 12:43:13 -0400 |
|---|---|---|
| committer | Benjamin Culkin <scorpress@gmail.com> | 2024-07-05 12:43:13 -0400 |
| commit | 6d46c473d41c6c47e6b8bd8c676d925e544bd378 (patch) | |
| tree | 796d51bfff52f8f3fa383b2d26847b7c8160677b /projects/net.wotonomy.persistence | |
| parent | 02bc52037e9ccccca672d6156d9c325c74fe28b3 (diff) | |
More cleanup
Diffstat (limited to 'projects/net.wotonomy.persistence')
| -rw-r--r-- | projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOModel.java | 6 | ||||
| -rw-r--r-- | projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOModel.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOModel.java index 9c77d45..3d39fc0 100644 --- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOModel.java +++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/access/EOModel.java @@ -44,8 +44,8 @@ public class EOModel { // This array contains dictionaries with "className" and "name" protected NSMutableArray _entities = new NSMutableArray(); - protected NSMutableDictionary _entitiesByName = new NSMutableDictionary(); - protected NSMutableDictionary _entitiesByClass = new NSMutableDictionary(); + protected NSMutableDictionary<String, EOEntity> _entitiesByName = new NSMutableDictionary<>(); + protected NSMutableDictionary<String, EOEntity> _entitiesByClass = new NSMutableDictionary<>(); protected NSDictionary _connectionDictionary = NSDictionary.EmptyDictionary; protected String _adaptorName = "JDBC"; protected NSMutableDictionary _prototypesByName = new NSMutableDictionary(); @@ -85,7 +85,7 @@ public class EOModel { } catch (IOException e) { throw new IllegalArgumentException("Cannot read index.eomodeld"); } - NSDictionary d = NSPropertyListSerialization.dictionaryForString(x); + NSDictionary<Object, Object> d = NSPropertyListSerialization.dictionaryForString(x); String version = (String) d.objectForKey("EOModelVersion"); if (version == null || !version.startsWith("2.")) throw new IllegalArgumentException("Invalid eomodel version: " + version); diff --git a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java index 8342722..defacb1 100644 --- a/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java +++ b/projects/net.wotonomy.persistence/src/main/java/net/wotonomy/control/EOEditingContext.java @@ -1490,7 +1490,8 @@ public class EOEditingContext extends EOObjectStore implements EOObserving { NSNotificationCenter.defaultCenter() .postNotification(new NSNotification(InvalidatedAllObjectsInStoreNotification, this)); } else if (EOGlobalID.GlobalIDChangedNotification.equals(aNotification.name())) { - NSDictionary<EOGlobalID, ?> userInfo = aNotification.userInfo(); + @SuppressWarnings("unchecked") + NSDictionary<EOGlobalID, ?> userInfo = (NSDictionary<EOGlobalID, ?>) aNotification.userInfo(); // if any keys in userInfo are registered ids, // re-register with new permanent values. |