From 91deb1d7dad01a805ab1ee9ca044ddd10fc0f81b Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 29 Apr 2013 10:08:36 +0000 Subject: [PATCH] apply template to existing components do not mess up selection on right click popup menu improvements --- .../diylc-core/library/main.jar | Bin 279731 -> 283073 bytes .../org/diylc/common/ITemplateProcessor.java | 4 ++ .../diylc/presenter/InstantiationManager.java | 33 ++++++--- .../src/org/diylc/presenter/Presenter.java | 63 +++++++++++++++++- 4 files changed, 87 insertions(+), 13 deletions(-) diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/diylc-core/library/main.jar index 7eafb229d6c5851dcc62745512b3389659f2dca7..4a95af99c48b540f564c3890f7d67604548aaf96 100644 GIT binary patch delta 16832 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 Kf*DwZ(f%LAxzW@B delta 13469 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 diff --git a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/ITemplateProcessor.java b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/ITemplateProcessor.java index 98d8f06b..1cf825a6 100644 --- a/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/ITemplateProcessor.java +++ b/ diy-layout-creator --username bancika@gmail.com/diylc-core/src/org/diylc/common/ITemplateProcessor.java @@ -12,6 +12,10 @@ public interface ITemplateProcessor { List