diff --git a/models/designPattern/Adapter.Json b/models/designPattern/Adapter.Json index 9cb8afd..54a16e8 100644 --- a/models/designPattern/Adapter.Json +++ b/models/designPattern/Adapter.Json @@ -1,10 +1,18 @@ { - "relations": [], - "transfer": { - "src": "FishingBoat", - "dst": "Captain", - "data": { "type": "String", "name": "data" }, - "style": "PULL", - "multiplicity": "1:1" - } + "name": "Adapter", + "contexts": [ + { + "relations": [], + "transfer": { + "src": "Captain", + "dst": "FishingBoat", + "data": { + "type": "Data", + "name": "data" + }, + "style": "PUSH", + "multiplicity": "1:1" + } + } + ] } \ No newline at end of file diff --git a/models/designPattern/Command.Json b/models/designPattern/Command.Json index f0641c9..8e20601 100644 --- a/models/designPattern/Command.Json +++ b/models/designPattern/Command.Json @@ -1,10 +1,22 @@ { - "relations": [], - "transfer": { - "src": "Wizard.{Stack}", - "dst": "Goblin.Size", - "data": { "type": "String", "name": "data" }, - "style": "PUSH", - "multiplicity": "1:1" - } + "name": "Command", + "contexts": [ + { + "relations": [{ + "src": "main", + "dst": "main.{goblin}", + "multiplicity": "1:1" + }], + "transfer": { + "src": "main.wizard", + "dst": "main.{goblin}", + "data": { + "type": "Data", + "name": "data" + }, + "style": "PUSH", + "multiplicity": "1:1" + } + } + ] } \ No newline at end of file diff --git a/models/designPattern/Proxy.Json b/models/designPattern/Proxy.Json index 5b9af0b..229e379 100644 --- a/models/designPattern/Proxy.Json +++ b/models/designPattern/Proxy.Json @@ -1,10 +1,18 @@ { - "relations": [], - "transfer": { - "src": "Client", - "dst": "IvoryTower", - "data": { "type": "Wizard", "name": "wizard" }, - "style": "PUSH", - "multiplicity": "1:1" - } + "name": "Proxy", + "contexts": [ + { + "relations": [], + "transfer": { + "src": "Client", + "dst": "IvoryTower", + "data": { + "type": "Wizard", + "name": "wizard" + }, + "style": "PUSH", + "multiplicity": "1:1" + } + } + ] } \ No newline at end of file diff --git a/src/main/java/designPatternExtensions/designPattern/Adapter.java b/src/main/java/designPatternExtensions/designPattern/Adapter.java index fc9b1a1..d867853 100644 --- a/src/main/java/designPatternExtensions/designPattern/Adapter.java +++ b/src/main/java/designPatternExtensions/designPattern/Adapter.java @@ -9,11 +9,11 @@ public DataTransferDesign create() throws IllegalRelationException { DataTransferDesign design = ModelLoader.load("models/designPattern/Adapter.Json"); DataTransferContext dtc = design.getTransferContexts().getFirst(); - ObjectNode fishingBoat = dtc.getSrcFirstResource(); - ObjectNode captain = dtc.getDstFirstResource(); + ObjectNode captain = dtc.getSrcFirstResource(); + ObjectNode fishingBoat = dtc.getDstFirstResource(); ObjectNode adapter = new ObjectNode("FishingBoatAdapter"); - MediatorInsertion mi = new MediatorInsertion(captain, fishingBoat, adapter, dtc); + MediatorInsertion mi = new MediatorInsertion(captain, fishingBoat, adapter, PushPullValue.PUSH); design.addMediatorInsertion(mi); DependencyInversion di = new DependencyInversion( diff --git a/src/main/java/generators/ASTGenerator.java b/src/main/java/generators/ASTGenerator.java index 0613207..6050c9a 100644 --- a/src/main/java/generators/ASTGenerator.java +++ b/src/main/java/generators/ASTGenerator.java @@ -53,7 +53,10 @@ if (primitiveDeltas.size() == 1) { return weavePrimitiveDelta(codebase, primitiveDeltas.getFirst()); } else { - // To do. + // To do: Temporary implementation to be replaced with the actual implementation. + for (PrimitiveDelta primDelta: primitiveDeltas) { + weavePrimitiveDelta(codebase, primDelta); + } return codebase; } }