From d0ec72a43cac6f6c7170b60ff9f09929eb90a168 Mon Sep 17 00:00:00 2001
From: Eugene Vigdorchik <no_reply@jetbrains.com>
Date: Fri, 3 Nov 2006 12:53:40 +0300
Subject: [PATCH] IDEADEV-11549

---
 resources/src/liveTemplates/surround.xml           | 29 ++++++++++++++++++++++
 .../src/messages/CodeInsightBundle.properties      |  2 ++
 2 files changed, 31 insertions(+)

diff --git a/resources/src/liveTemplates/surround.xml b/resources/src/liveTemplates/surround.xml
index 9a9d39eec5..a4d03932ba 100644
--- a/resources/src/liveTemplates/surround.xml
+++ b/resources/src/liveTemplates/surround.xml
@@ -60,5 +60,34 @@
       <option name="OTHER" value="false" />
     </context>
   </template>
+  <template name="C" resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.surround.with.callable"
+            value="java.util.concurrent.Callable&lt;$RET$&gt; callable = new java.util.concurrent.Callable&lt;$RET$&gt;() {&#10;  public $RET$ call() throws Exception {&#10;    $SELECTION$&#10;    $END$ &#10;  }&#10;};" description="surround with Callable" toReformat="true" toShortenFQNames="true">
+    <variable name="RET" expression="" defaultValue="&quot;java.lang.Object&quot;" alwaysStopAt="true" />
+    <variable name="SELECTION" expression="" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_CODE" value="true" />
+      <option name="JAVA_COMMENT" value="false" />
+      <option name="JAVA_STRING" value="false" />
+      <option name="XML" value="false" />
+      <option name="HTML" value="false" />
+      <option name="JSP" value="false" />
+      <option name="COMPLETION" value="false" />
+      <option name="OTHER" value="false" />
+    </context>
+  </template>
+  <template name="R" resource-bundle="messages.CodeInsightBundle" key="livetemplate.description.surround.with.runnable"
+            value="java.lang.Runnable runnable = new java.lang.Runnable() {&#10;  public void run() {&#10;    $SELECTION$ &#10;  }&#10;};&#10;$END$" description="surround with Runnable" toReformat="true" toShortenFQNames="true">
+    <variable name="SELECTION" expression="" defaultValue="" alwaysStopAt="false" />
+    <context>
+      <option name="JAVA_CODE" value="true" />
+      <option name="JAVA_COMMENT" value="false" />
+      <option name="JAVA_STRING" value="false" />
+      <option name="XML" value="false" />
+      <option name="HTML" value="false" />
+      <option name="JSP" value="false" />
+      <option name="COMPLETION" value="false" />
+      <option name="OTHER" value="false" />
+    </context>
+  </template>
 </templateSet>
 
diff --git a/resources_eng/src/messages/CodeInsightBundle.properties b/resources_eng/src/messages/CodeInsightBundle.properties
index 43fa7def68..4ce00bf37e 100644
--- a/resources_eng/src/messages/CodeInsightBundle.properties
+++ b/resources_eng/src/messages/CodeInsightBundle.properties
@@ -338,6 +338,8 @@ livetemplate.description.surround.braces=Surround with {}
 livetemplate.description.surround.parens=Surround with ()
 livetemplate.description.surround.tag=Surround with <tag></tag>
 livetemplate.description.surround.tag.in.htmlorjsp=Surround with <tag></tag> in HTML/JSP
+livetemplate.description.surround.with.runnable=Surround with java.lang.Runnable
+livetemplate.description.surround.with.callable=Surround with java.util.concurrent.Callable
 quickfix.add.variable.text=Initialize variable ''{0}''
 quickfix.add.variable.family.name=Initialize variable
 inspection.i18n.quickfix.annotate.as.nonnls=Annotate as @{0}
-- 
2.11.4.GIT