diff --git a/models/designPattern/AbstractFactory.Json b/models/designPattern/AbstractFactory.Json index 356768e..210d380 100644 --- a/models/designPattern/AbstractFactory.Json +++ b/models/designPattern/AbstractFactory.Json @@ -1,10 +1,31 @@ { - "relations": [], - "transfer": { - "src": "ConcreteCastle.String", - "dst": "App.String", - "data": { "name": "description" }, - "style": "PULL", - "multiplicity": "1:1" - } + "name": "Abstract-Factory", + "contexts": [ + { + "relations": [], + "transfer": { + "src": "Kingdom.FactoryMaker.{KingdomFactory}", + "dst": "App.KingdomFactory", + "data": { "name": "kingdomFactory" }, + "style": "PULL", + "multiplicity": "1:1" + } + }, + { + "relations": [ + { + "src": "App.KingdomFactory.King", + "dst": "App", + "multiplicity": "1:1" + } + ], + "transfer": { + "src": "App.KingdomFactory.King", + "dst": "App.Kingdom.King", + "data": { "name": "king" }, + "style": "PULL", + "multiplicity": "1:1" + } + } + ] } \ No newline at end of file diff --git a/models/designPattern/Visitor.Json b/models/designPattern/Visitor.Json index e2c297d..9c89347 100644 --- a/models/designPattern/Visitor.Json +++ b/models/designPattern/Visitor.Json @@ -4,14 +4,13 @@ { "relations": [], "transfer": { - "src": "Commander.{Sergent}.{Soldier}", - "dst": "Main.Client", + "src": "Main.SoldierVisitor", + "dst": "Commander.{Sergent}.{Soldier}.SoldierVisitor", "data": { - "type": "SoldierVisitor", "name": "visitor" }, - "style": "PULL", - "multiplicity": "1:1" + "style": "PUSH", + "multiplicity": "1:*" } } ] diff --git a/src/main/java/designPatternExtensions/designPattern/AbstractFactory.java b/src/main/java/designPatternExtensions/designPattern/AbstractFactory.java index 00d1d30..2dc4349 100644 --- a/src/main/java/designPatternExtensions/designPattern/AbstractFactory.java +++ b/src/main/java/designPatternExtensions/designPattern/AbstractFactory.java @@ -16,17 +16,17 @@ ObjectNode concreteCastle = dtc.getSrcTopObject(); ObjectNode app = dtc.getDstTopObject(); - ObjectNode concreteKingdomFactory = new ObjectNode("ConcreteKingdomFactory"); - MediatorInsertion mi = new MediatorInsertion(app, concreteCastle, concreteKingdomFactory, dtc); - design.addMediatorInsertion(mi); - - DependencyInversion di1 = new DependencyInversion( - concreteKingdomFactory, new InterfaceNode(concreteKingdomFactory, "KingdomFactory")); - design.addDependencyInversion(di1); - - DependencyInversion di2 = new DependencyInversion( - concreteCastle, new InterfaceNode(concreteCastle, "Castle")); - design.addDependencyInversion(di2); +// ObjectNode concreteKingdomFactory = new ObjectNode("ConcreteKingdomFactory"); +// MediatorInsertion mi = new MediatorInsertion(app, concreteCastle, concreteKingdomFactory, dtc); +// design.addMediatorInsertion(mi); +// +// DependencyInversion di1 = new DependencyInversion( +// concreteKingdomFactory, new InterfaceNode(concreteKingdomFactory, "KingdomFactory")); +// design.addDependencyInversion(di1); +// +// DependencyInversion di2 = new DependencyInversion( +// concreteCastle, new InterfaceNode(concreteCastle, "Castle")); +// design.addDependencyInversion(di2); return design; }