diff --git a/models/designPattern/Command.Json b/models/designPattern/Command.Json index dcc37e7..2df7977 100644 --- a/models/designPattern/Command.Json +++ b/models/designPattern/Command.Json @@ -25,7 +25,7 @@ "data": { "name": "data" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "1:1" } } diff --git a/models/designPattern/FactoryMethod.Json b/models/designPattern/FactoryMethod.Json index 582c1d4..a424636 100644 --- a/models/designPattern/FactoryMethod.Json +++ b/models/designPattern/FactoryMethod.Json @@ -9,7 +9,7 @@ "data": { "name": "weapon" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "*:1" } } diff --git a/models/designPattern/Flyweight.Json b/models/designPattern/Flyweight.Json index 9eeb987..d72e38d 100644 --- a/models/designPattern/Flyweight.Json +++ b/models/designPattern/Flyweight.Json @@ -9,7 +9,7 @@ "data": { "name": "potion" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "*:*" } }, diff --git a/models/designPattern/Flyweight2.Json b/models/designPattern/Flyweight2.Json deleted file mode 100644 index ac948d6..0000000 --- a/models/designPattern/Flyweight2.Json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "Flyweight", - "contexts": [ - { - "relations": [], - "transfer": { - "src": "AlchemistShop", - "dst": "Main", - "data": { - "type": "Data", - "name": "data" - }, - "style": "PULL", - "multiplicity": "1:1" - } - }, - { - "relations": [], - "transfer": { - "src": "AlchemistShop.{Potion}", - "dst": "AlchemistShop", - "data": { - "type": "Data", - "name": "data" - }, - "style": "PULL", - "multiplicity": "1:1" - } - } - ] -} \ No newline at end of file diff --git a/models/designPattern/Iterator.Json b/models/designPattern/Iterator.Json index 26afd82..1ba4cbd 100644 --- a/models/designPattern/Iterator.Json +++ b/models/designPattern/Iterator.Json @@ -17,7 +17,7 @@ "src": "App.TreasureChest.Iterator", "dst": "App.Iterator", "data": { "name": "iterator" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "1:1" } } diff --git a/models/designPattern/Memento.Json b/models/designPattern/Memento.Json index 2aa7b91..c661efd 100644 --- a/models/designPattern/Memento.Json +++ b/models/designPattern/Memento.Json @@ -7,7 +7,7 @@ "src": "Main.Star.StarMementoInternal", "dst": "Main.States.StarMementoInternal", "data": {"name": "memento"}, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "1:1" } }, @@ -17,7 +17,7 @@ "src": "Main.States.StarMementoInternal", "dst": "Main.Star.StarMementoInternal", "data": {"name": "memento"}, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "1:1" } } diff --git a/models/designPattern/Observer.Json b/models/designPattern/Observer.Json index 68ddeaa..f6e756e 100644 --- a/models/designPattern/Observer.Json +++ b/models/designPattern/Observer.Json @@ -21,7 +21,7 @@ "data": { "name": "observers" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "*:*" } } diff --git a/models/designPattern/Visitor.Json b/models/designPattern/Visitor.Json index acff773..f7e9c70 100644 --- a/models/designPattern/Visitor.Json +++ b/models/designPattern/Visitor.Json @@ -9,7 +9,7 @@ "data": { "name": "visitor" }, - "style": "PLAIN", + "style": "HIERARCHICAL", "multiplicity": "1:*" } } diff --git a/src/main/java/Main.java b/src/main/java/Main.java index 44e00cb..ca2c911 100644 --- a/src/main/java/Main.java +++ b/src/main/java/Main.java @@ -47,7 +47,7 @@ // DependencyInversion di = new DependencyInversion(company, new InterfaceNode(company, "ICompany"), customer); // design.addDependencyInversion(di); - design = new Iterator().create(); + design = new Flyweight().create(); System.out.println(design.getDeltaComplex()); System.out.println(ASTGenerator.generate(design)); diff --git a/src/main/java/models/dataSynchronizationModel/DataSynchronizationContext.java b/src/main/java/models/dataSynchronizationModel/DataSynchronizationContext.java index 1f22ccf..393031b 100644 --- a/src/main/java/models/dataSynchronizationModel/DataSynchronizationContext.java +++ b/src/main/java/models/dataSynchronizationModel/DataSynchronizationContext.java @@ -24,7 +24,7 @@ private List intermediateRelations; private Relation syncronizationRelation; private String dataName; - private TransferStyle transferStyle = TransferStyle.PLAIN; + private TransferStyle transferStyle = TransferStyle.HIERARCHICAL; private Map objectNodeMap = new HashMap<>(); public DataSynchronizationContext(Value jsonValue) { @@ -169,8 +169,8 @@ private void setTransferStyle(StringValue stringValue){ String style = stringValue.getStringValue(); - if (style.equals("PLAIN")) { - transferStyle = TransferStyle.PLAIN; + if (style.equals("HIERARCHICAL")) { + transferStyle = TransferStyle.HIERARCHICAL; } else if (style.equals("PUSH")) { transferStyle = TransferStyle.PUSH; } else if (style.equals("PULL")) { diff --git a/src/main/java/models/dataSynchronizationModel/DataSynchronizationDesign.java b/src/main/java/models/dataSynchronizationModel/DataSynchronizationDesign.java index 11564a3..6adbf0a 100644 --- a/src/main/java/models/dataSynchronizationModel/DataSynchronizationDesign.java +++ b/src/main/java/models/dataSynchronizationModel/DataSynchronizationDesign.java @@ -108,7 +108,7 @@ // Transfer style is PULL or PLAIN srcObj = synchronizationContext.getDstTopObject(); dstObj = synchronizationContext.getSrcTopObject(); - if (transferStyle == TransferStyle.PLAIN) { + if (transferStyle == TransferStyle.HIERARCHICAL) { useShortcut = false; } } @@ -129,7 +129,7 @@ if (useShortcut) { allRelations.add(synchronizationContext.getSyncronizationRelation().getPrevRelation()); } else { - if (transferStyle == TransferStyle.PLAIN) { + if (transferStyle == TransferStyle.HIERARCHICAL) { allRelations.add(synchronizationContext.getSyncronizationRelation()); } else { Relation lastRelation = allRelations.getLast(); diff --git a/src/main/java/models/dataSynchronizationModel/TransferStyle.java b/src/main/java/models/dataSynchronizationModel/TransferStyle.java index d4d3f90..f028d04 100644 --- a/src/main/java/models/dataSynchronizationModel/TransferStyle.java +++ b/src/main/java/models/dataSynchronizationModel/TransferStyle.java @@ -1,14 +1,14 @@ package models.dataSynchronizationModel; public enum TransferStyle { + HIERARCHICAL, PULL, - PLAIN, PUSH; public String toString() { switch (this) { - case PLAIN: - return "PLAIN"; + case HIERARCHICAL: + return "HIERARCHICAL"; case PUSH: return "PUSH"; case PULL: