diff --git a/src/main/java/ui/atd/ATDBlock.java b/src/main/java/ui/atd/ATDBlock.java index 349b1408c2e609801383edf7905f50e81e188a1e..5f0365b3a7f9d7233bc12eb9721d2e0e6e189014 100644 --- a/src/main/java/ui/atd/ATDBlock.java +++ b/src/main/java/ui/atd/ATDBlock.java @@ -294,6 +294,14 @@ public class ATDBlock extends TGCScalableWithInternalComponent implements Swallo return true; } + if (tgc instanceof ATDCountermeasure) { + tgc.setFather(this); + tgc.setDrawingZone(true); + tgc.resizeWithFather(); + addInternalComponent(tgc, 0); + return true; + } + return false; } diff --git a/src/main/java/ui/atd/ATDCountermeasure.java b/src/main/java/ui/atd/ATDCountermeasure.java index 5a55c78baae0ea7245cfe7384a527d5dd5c9467e..42cb90b10118953c489d842a6b9d4c7732ab3dea 100644 --- a/src/main/java/ui/atd/ATDCountermeasure.java +++ b/src/main/java/ui/atd/ATDCountermeasure.java @@ -389,4 +389,10 @@ public class ATDCountermeasure extends TGCScalableWithInternalComponent implemen return new String(sb); } + public void wasUnswallowed() { + setFather(null); + TDiagramPanel tdp = getTDiagramPanel(); + setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY()); + } + } diff --git a/src/main/java/ui/ftd/FTDBlock.java b/src/main/java/ui/ftd/FTDBlock.java index 50a4bb8fff05b3b7a86d08e3e874615aa706bb6e..db749aacee7ab64136a657d600fe7032c3bc59ec 100644 --- a/src/main/java/ui/ftd/FTDBlock.java +++ b/src/main/java/ui/ftd/FTDBlock.java @@ -294,6 +294,14 @@ public class FTDBlock extends TGCScalableWithInternalComponent implements Swallo return true; } + if (tgc instanceof FTDCountermeasure) { + tgc.setFather(this); + tgc.setDrawingZone(true); + tgc.resizeWithFather(); + addInternalComponent(tgc, 0); + return true; + } + return false; } diff --git a/src/main/java/ui/ftd/FTDCountermeasure.java b/src/main/java/ui/ftd/FTDCountermeasure.java index c97b3b9f2e665647617571e3e01f65d332577aa5..8bee69defccfb34611b5f42f2e8516a38e6990fe 100644 --- a/src/main/java/ui/ftd/FTDCountermeasure.java +++ b/src/main/java/ui/ftd/FTDCountermeasure.java @@ -375,6 +375,12 @@ public class FTDCountermeasure extends TGCScalableWithInternalComponent implemen makeValue(); } + public void wasUnswallowed() { + setFather(null); + TDiagramPanel tdp = getTDiagramPanel(); + setCdRectangle(tdp.getMinX(), tdp.getMaxX(), tdp.getMinY(), tdp.getMaxY()); + } + protected String translateExtraParam() { StringBuffer sb = new StringBuffer("<extraparam>\n");