CopyOnWriteScheme rerooted on top of MPWMappingStore

mpw · May 30, 2018 · cc46338 · cc46338
1 parent 2947480
commit cc46338
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/S3Scheme/MPWS3Scheme.h b/S3Scheme/MPWS3Scheme.h
@@ -6,9 +6,9 @@
 //
 //
 
-#import <ObjectiveSmalltalk/MPWGenericScheme.h>
+#import <ObjectiveSmalltalk/MPWScheme.h>
 
-@interface MPWS3Scheme : MPWGenericScheme
+@interface MPWS3Scheme : MPWScheme
 
 @property NSTimeInterval timeout;
 

diff --git a/Schemes/MPWCopyOnWriteScheme.h b/Schemes/MPWCopyOnWriteScheme.h
@@ -6,22 +6,21 @@
 //  Copyright (c) 2012 metaobject ltd. All rights reserved.
 //
 
-#import "MPWFilterScheme.h"
 #import <MPWFoundation/MPWFoundation.h>
 
-@interface MPWCopyOnWriteScheme : MPWFilterScheme
+@interface MPWCopyOnWriteScheme : MPWMappingStore
 {
-    MPWScheme *readWrite;
+    MPWAbstractStore *readWrite;
     BOOL cacheReads;
 }
 
--initWithBase:(MPWScheme*)newBase cache:(MPWScheme*)newCache;
-+cacheWithBase:(MPWScheme*)newBase cache:(MPWScheme*)newCache;
+-initWithBase:(MPWAbstractStore*)newBase cache:(MPWAbstractStore*)newCache;
++cacheWithBase:(MPWAbstractStore*)newBase cache:(MPWAbstractStore*)newCache;
 +cache:cacheScheme;
 +memoryCache;
 
 
 boolAccessor_h(cacheReads, setCacheReads)
-objectAccessor_h(MPWScheme, readWrite, setReadWrite)
+objectAccessor_h(MPWAbstractStore, readWrite, setReadWrite)
 
 @end
diff --git a/Schemes/MPWCopyOnWriteScheme.m b/Schemes/MPWCopyOnWriteScheme.m
@@ -13,13 +13,16 @@
 
 @implementation MPWCopyOnWriteScheme
 
-objectAccessor(MPWScheme, readWrite, setReadWrite)
+objectAccessor(MPWAbstractStore, readWrite, setReadWrite)
 boolAccessor(cacheReads, setCacheReads)
 
+// legacy
++scheme
+{
+    return [[[self alloc] init] autorelease];
+}
 
-
-
--initWithBase:(MPWScheme*)newBase cache:(MPWScheme*)newCache
+-initWithBase:(MPWAbstractStore*)newBase cache:(MPWAbstractStore*)newCache
 {
     self=[super init];
     [self setSource:newBase];
@@ -28,7 +31,7 @@ @implementation MPWCopyOnWriteScheme
 
 }
 
-+cacheWithBase:(MPWScheme*)newBase cache:(MPWScheme*)newCache
++cacheWithBase:(MPWAbstractStore*)newBase cache:(MPWAbstractStore*)newCache
 {
     MPWCopyOnWriteScheme *newScheme=[[[self alloc] initWithBase:newBase cache:newCache] autorelease];
     [newScheme setCacheReads:YES];

diff --git a/X11Scheme/x11fs.h b/X11Scheme/x11fs.h
@@ -2,8 +2,8 @@
 #define WID_STRING_LENGTH 11
 typedef enum {X11FS_SUCCESS, X11FS_FAILURE} X11FS_STATUS;
 
-#import <ObjectiveSmalltalk/MPWGenericScheme.h>
+#import <ObjectiveSmalltalk/MPWScheme.h>
 
 
-@interface X11Scheme:MPWGenericScheme
+@interface X11Scheme:MPWScheme
 @end
diff --git a/X11Scheme/x11fs.m b/X11Scheme/x11fs.m
@@ -14,7 +14,6 @@
 #include "win_oper.h"
 #include <sys/stat.h>
 #import <MPWFoundation/MPWFoundation.h>
-#import <ObjectiveSmalltalk/MPWGenericScheme.h>
 #import <ObjectiveSmalltalk/MPWStCompiler.h>