diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-05-08 15:46:07 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2013-05-08 15:46:07 -0700 |
| commit | a6eac331b3d9f0d4168b12356ea256c83f4e9c05 (patch) | |
| tree | 923ceb497c43ea183351321bb4b9e388851a7854 /resources-en | |
| parent | 934b9431b0b827a132df794e307fe5a2b70de00b (diff) | |
| download | idea-a6eac331b3d9f0d4168b12356ea256c83f4e9c05.tar.gz | |
Snapshot f5ae6e3be7e12e1ef9e12f48fe3a674266288e4e from master branch of git://git.jetbrains.org/idea/community.git
Change-Id: I756af70fb2910aa2687e94e28338fb9727bce518
Diffstat (limited to 'resources-en')
5 files changed, 9 insertions, 19 deletions
diff --git a/resources-en/src/fileTemplates/includes/File Header.java.ft b/resources-en/src/fileTemplates/includes/File Header.java.ft index c6b8d6685050..206b6b25b3a6 100644 --- a/resources-en/src/fileTemplates/includes/File Header.java.ft +++ b/resources-en/src/fileTemplates/includes/File Header.java.ft @@ -1,6 +1,3 @@ /** - * Created with IntelliJ IDEA. - * User: ${USER} - * Date: ${DATE} - * Time: ${TIME} + * Created by ${USER} on ${DATE}. */ diff --git a/resources-en/src/inspectionDescriptions/DefaultFileTemplate.html b/resources-en/src/inspectionDescriptions/DefaultFileTemplate.html index 0e869e6cef27..e7c6cd2748d7 100644 --- a/resources-en/src/inspectionDescriptions/DefaultFileTemplate.html +++ b/resources-en/src/inspectionDescriptions/DefaultFileTemplate.html @@ -1,11 +1,6 @@ <html> <body> -This inspections reports usages of the default file templates for - <ul> - <li>File Header,</li> - <li>Overridden/implemented ot created method body, and</li> - <li>Generated Catch block section.</li> - </ul> +This inspections reports usage of the default file template for File Header. <p> Also, the inspection proposes to change default file template and its usage. </body> diff --git a/resources-en/src/intentionDescriptions/CreateSubclassAction/after.java.template b/resources-en/src/intentionDescriptions/CreateSubclassAction/after.java.template index 8bac27269e55..b2447150d1fe 100644 --- a/resources-en/src/intentionDescriptions/CreateSubclassAction/after.java.template +++ b/resources-en/src/intentionDescriptions/CreateSubclassAction/after.java.template @@ -1,8 +1,7 @@ public abstract class X { protected abstract void f(); } -public class XImpl extends X { +<spot>public class XImpl extends X { protected void f() { - //To change body of implemented methods use File | Settings | File Templates. } -} +}</spot> diff --git a/resources-en/src/intentionDescriptions/CreateTestAction/after.java.template b/resources-en/src/intentionDescriptions/CreateTestAction/after.java.template index 4556d16c82d4..3fe4194217c9 100644 --- a/resources-en/src/intentionDescriptions/CreateTestAction/after.java.template +++ b/resources-en/src/intentionDescriptions/CreateTestAction/after.java.template @@ -2,8 +2,8 @@ public class Foo { public void doSomething() { } } -public class FooTest extends TestCase { +<spot>public class FooTest extends TestCase { public void testDoSomething() { - <spot>//To change body of implemented methods use File | Settings | File Templates.</spot> + } -} +}</spot> diff --git a/resources-en/src/intentionDescriptions/ImplementAbstractMethodAction/after.java.template b/resources-en/src/intentionDescriptions/ImplementAbstractMethodAction/after.java.template index a89864246d8d..20f0e88b3104 100644 --- a/resources-en/src/intentionDescriptions/ImplementAbstractMethodAction/after.java.template +++ b/resources-en/src/intentionDescriptions/ImplementAbstractMethodAction/after.java.template @@ -2,7 +2,6 @@ public abstract class X { abstract void f(); } abstract class Y extends X { - void f() { - //To change body of implemented methods use File | Settings | File Templates. - } + <spot>void f() { + }</spot> } |