refactor: PartialInterpretation adapter naming

10 files changed, 97 insertions, 68 deletions

diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
index 7d367937..331fa294 100644
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretation.java
@@ -2,17 +2,18 @@ package tools.refinery.store.partial;
 
 import tools.refinery.store.adapter.ModelAdapterBuilderFactory;
 import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.partial.internal.PartialInterpretationBuilderImpl;
 
-public final class PartialInterpretation extends ModelAdapterBuilderFactory<PartialModelAdapter,
-                PartialModelStoreAdapter, PartialModelAdapterBuilder> {
+public final class PartialInterpretation extends ModelAdapterBuilderFactory<PartialInterpretationAdapter,
+                PartialInterpretationStoreAdapter, PartialInterpretationBuilder> {
         public static final PartialInterpretation ADAPTER = new PartialInterpretation();
 
         private PartialInterpretation() {
-                super(PartialModelAdapter.class, PartialModelStoreAdapter.class, PartialModelAdapterBuilder.class);
+                super(PartialInterpretationAdapter.class, PartialInterpretationStoreAdapter.class, PartialInterpretationBuilder.class);
         }
 
         @Override
-        public PartialModelAdapterBuilder createBuilder(ModelStoreBuilder storeBuilder) {
-                return new PartialModelAdapterBuilder(storeBuilder);
+        public PartialInterpretationBuilder createBuilder(ModelStoreBuilder storeBuilder) {
+                return new PartialInterpretationBuilderImpl(storeBuilder);
         }
 }
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
new file mode 100644
index 00000000..2c83a200
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationAdapter.java
@@ -0,0 +1,9 @@
+package tools.refinery.store.partial;
+
+import tools.refinery.store.adapter.ModelAdapter;
+
+public interface PartialInterpretationAdapter extends ModelAdapter {
+        @Override
+        PartialInterpretationStoreAdapter getStoreAdapter();
+}
+
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
new file mode 100644
index 00000000..0ec13836
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationBuilder.java
@@ -0,0 +1,9 @@
+package tools.refinery.store.partial;
+
+import tools.refinery.store.adapter.ModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+
+public interface PartialInterpretationBuilder extends ModelAdapterBuilder {
+        @Override
+        PartialInterpretationStoreAdapter createStoreAdapter(ModelStore store);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java
new file mode 100644
index 00000000..d4eb770d
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialInterpretationStoreAdapter.java
@@ -0,0 +1,9 @@
+package tools.refinery.store.partial;
+
+import tools.refinery.store.adapter.ModelStoreAdapter;
+import tools.refinery.store.model.Model;
+
+public interface PartialInterpretationStoreAdapter extends ModelStoreAdapter {
+        @Override
+        PartialInterpretationAdapter createModelAdapter(Model model);
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapter.java
deleted file mode 100644
index cdab5606..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelAdapter;
-import tools.refinery.store.model.Model;
-
-public class PartialModelAdapter implements ModelAdapter {
-        private final Model model;
-        private final PartialModelStoreAdapter storeAdapter;
-
-        PartialModelAdapter(Model model, PartialModelStoreAdapter storeAdapter) {
-                this.model = model;
-                this.storeAdapter = storeAdapter;
-        }
-
-        @Override
-        public Model getModel() {
-                return model;
-        }
-
-        @Override
-        public PartialModelStoreAdapter getStoreAdapter() {
-                return storeAdapter;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapterBuilder.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapterBuilder.java
deleted file mode 100644
index 0d4a32b9..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelAdapterBuilder.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
-import tools.refinery.store.model.ModelStore;
-import tools.refinery.store.model.ModelStoreBuilder;
-
-public class PartialModelAdapterBuilder extends AbstractModelAdapterBuilder {
-        PartialModelAdapterBuilder(ModelStoreBuilder storeBuilder) {
-                super(storeBuilder);
-        }
-
-        @Override
-        public PartialModelStoreAdapter createStoreAdapter(ModelStore store) {
-                return null;
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelStoreAdapter.java b/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelStoreAdapter.java
deleted file mode 100644
index d9432a7d..00000000
--- a/subprojects/store/src/main/java/tools/refinery/store/partial/PartialModelStoreAdapter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package tools.refinery.store.partial;
-
-import tools.refinery.store.adapter.ModelStoreAdapter;
-import tools.refinery.store.model.Model;
-import tools.refinery.store.model.ModelStore;
-
-public class PartialModelStoreAdapter implements ModelStoreAdapter {
-        private final ModelStore store;
-
-        PartialModelStoreAdapter(ModelStore store) {
-                this.store = store;
-        }
-
-        @Override
-        public ModelStore getStore() {
-                return store;
-        }
-
-        @Override
-        public PartialModelAdapter createModelAdapter(Model model) {
-                return new PartialModelAdapter(model, this);
-        }
-}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
new file mode 100644
index 00000000..4b3977c0
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationAdapterImpl.java
@@ -0,0 +1,24 @@
+package tools.refinery.store.partial.internal;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.partial.PartialInterpretationAdapter;
+
+public class PartialInterpretationAdapterImpl implements PartialInterpretationAdapter {
+        private final Model model;
+        private final PartialInterpretationStoreAdapterImpl storeAdapter;
+
+        PartialInterpretationAdapterImpl(Model model, PartialInterpretationStoreAdapterImpl storeAdapter) {
+                this.model = model;
+                this.storeAdapter = storeAdapter;
+        }
+
+        @Override
+        public Model getModel() {
+                return model;
+        }
+
+        @Override
+        public PartialInterpretationStoreAdapterImpl getStoreAdapter() {
+                return storeAdapter;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
new file mode 100644
index 00000000..4609dc32
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationBuilderImpl.java
@@ -0,0 +1,17 @@
+package tools.refinery.store.partial.internal;
+
+import tools.refinery.store.adapter.AbstractModelAdapterBuilder;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.model.ModelStoreBuilder;
+import tools.refinery.store.partial.PartialInterpretationBuilder;
+
+public class PartialInterpretationBuilderImpl extends AbstractModelAdapterBuilder implements PartialInterpretationBuilder {
+        public PartialInterpretationBuilderImpl(ModelStoreBuilder storeBuilder) {
+                super(storeBuilder);
+        }
+
+        @Override
+        public PartialInterpretationStoreAdapterImpl createStoreAdapter(ModelStore store) {
+                return null;
+        }
+}
diff --git a/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
new file mode 100644
index 00000000..970b802b
--- /dev/null
+++ b/subprojects/store/src/main/java/tools/refinery/store/partial/internal/PartialInterpretationStoreAdapterImpl.java
@@ -0,0 +1,23 @@
+package tools.refinery.store.partial.internal;
+
+import tools.refinery.store.model.Model;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.partial.PartialInterpretationStoreAdapter;
+
+public class PartialInterpretationStoreAdapterImpl implements PartialInterpretationStoreAdapter {
+        private final ModelStore store;
+
+        PartialInterpretationStoreAdapterImpl(ModelStore store) {
+                this.store = store;
+        }
+
+        @Override
+        public ModelStore getStore() {
+                return store;
+        }
+
+        @Override
+        public PartialInterpretationAdapterImpl createModelAdapter(Model model) {
+                return new PartialInterpretationAdapterImpl(model, this);
+        }
+}