remove old file templates and disable inspection

diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
index 0bfd7e0021d57d13031eb93ec199ba841acbb58e..deaebab29b3a8d8b1b7710929b9cff4ec74b9f60 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/DefaultFileTemplateInspectionTest.java
@@ -2,11 +2,15 @@ package com.intellij.codeInspection;
 
 import com.intellij.JavaTestUtil;
 import com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection;
+import com.intellij.idea.Bombed;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.LanguageLevelProjectExtension;
 import com.intellij.pom.java.LanguageLevel;
 import com.intellij.testFramework.InspectionTestCase;
 
+import java.util.Calendar;
+
+@Bombed(year = 2017, month = Calendar.NOVEMBER, day = 17, user = "kb")
 public class DefaultFileTemplateInspectionTest extends InspectionTestCase {
   @Override
   protected Sdk getTestProjectSdk() {

diff --git a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
index a028baf02ca158ca24825d2bae366978841e8974..33a25af923e48287d8c43399060ffc86a938374d 100644 (file)
--- a/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/AstLeaksTest.groovy
@@ -22,7 +22,6 @@ import com.intellij.psi.impl.source.tree.java.MethodElement
 import com.intellij.testFramework.LeakHunter
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import com.intellij.util.Processor
-import com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection
 
 /**
  * @author peter
@@ -79,7 +78,7 @@ class AstLeaksTest extends LightCodeInsightFixtureTestCase {
     myFixture.addFileToProject('sup.java', 'class Super { void bar() {} }')
     PsiJavaFile foo = myFixture.addFileToProject('a.java', 'class Foo { void bar() { bar(); } }')
     myFixture.configureFromExistingVirtualFile(foo.virtualFile)
-    myFixture.enableInspections(new DefaultFileTemplateUsageInspection())
+    //myFixture.enableInspections(new DefaultFileTemplateUsageInspection())
     myFixture.doHighlighting()
 
     LeakHunter.checkLeak(foo.classes[0], MethodElement, { MethodElement node -> !node.psi.physical } as Processor<MethodElement>)

diff --git a/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft b/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft
index fea0f59eb14b92c5bc97b6d5cccfbee5ed97d6e7..a6e72093ea344edd8e645e52ce422b5f2749ac1b 100644 (file)
--- a/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft
+++ b/resources-en/src/fileTemplates/code/Catch Statement Body.java.ft
@@ -1 +1 @@
-${EXCEPTION}.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
\ No newline at end of file
+${EXCEPTION}.printStackTrace();
\ No newline at end of file

diff --git a/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft b/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft
index 3f770be61fca3076b94685a0fda184452f6b981d..f055c7fd1daddb4a8076ad5953169b71108129f3 100644 (file)
--- a/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft
+++ b/resources-en/src/fileTemplates/code/Implemented Method Body.java.ft
@@ -1 +1 @@
-#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end  //To change body of implemented methods use File | Settings | File Templates.
\ No newline at end of file
+#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end
\ No newline at end of file

diff --git a/resources-en/src/fileTemplates/code/New Method Body.java.ft b/resources-en/src/fileTemplates/code/New Method Body.java.ft
index 5a359cb3acf2a480b9ea3528b94d00082e02b9b6..f055c7fd1daddb4a8076ad5953169b71108129f3 100644 (file)
--- a/resources-en/src/fileTemplates/code/New Method Body.java.ft
+++ b/resources-en/src/fileTemplates/code/New Method Body.java.ft
@@ -1 +1 @@
-#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end  //To change body of created methods use File | Settings | File Templates.
\ No newline at end of file
+#if ( $RETURN_TYPE != "void" )return $DEFAULT_RETURN_VALUE;#end
\ No newline at end of file

diff --git a/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft b/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft
index 43116f46f327d1cfcd0de06bd9846f50dd08ebf6..b96e408307f16f8032cbd6525710096d01e8f61f 100644 (file)
--- a/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft
+++ b/resources-en/src/fileTemplates/code/Overridden Method Body.java.ft
@@ -1 +1 @@
-$CALL_SUPER;    //To change body of overridden methods use File | Settings | File Templates.
\ No newline at end of file
+$CALL_SUPER;
\ No newline at end of file

diff --git a/resources-en/src/fileTemplates/includes/File Header.java.ft b/resources-en/src/fileTemplates/includes/File Header.java.ft
index 4b498f0340614be00a472ad179836272bd5c6844..793a2134f94c044c7e259b6171179d7c514cd943 100644 (file)
--- a/resources-en/src/fileTemplates/includes/File Header.java.ft
+++ b/resources-en/src/fileTemplates/includes/File Header.java.ft
@@ -1,7 +1,4 @@
 /**
  * Created with IntelliJ IDEA.
- * User: ${USER}
- * Date: ${DATE}
- * Time: ${TIME}
- * To change this template use File | Settings | File Templates.
+ * @author ${USER}
  */

diff --git a/resources/src/ClassTemplateManager.xml b/resources/src/ClassTemplateManager.xml
index 659fd192400ce4b420b9df74a9c190309b8bee64..6f32b1c4ff363b81842a0f352e8dc98850dfd8c6 100644 (file)
--- a/resources/src/ClassTemplateManager.xml
+++ b/resources/src/ClassTemplateManager.xml
@@ -1,6 +1,6 @@
 <component>
-  <option name="CLASS_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * User: $USER$&#10; * Date: $DATE$&#10; * Time: $TIME$&#10; * To change template for new class use &#10; * Code Style | Class Templates options (Tools | IDE Options).&#10; */&#10;package $PACKAGE_NAME$;&#10;public class $NAME$ { }&#10;" />
-  <option name="INTERFACE_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * User: $USER$&#10; * Date: $DATE$&#10; * Time: $TIME$&#10; * To change template for new interface use &#10; * Code Style | Class Templates options (Tools | IDE Options).&#10; */&#10;package $PACKAGE_NAME$;&#10;public interface $NAME$ { }&#10;" />
+  <option name="CLASS_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * @author $USER$&#10;*/&#10;package $PACKAGE_NAME$;&#10;public class $NAME$ { }&#10;" />
+  <option name="INTERFACE_TEMPLATE" value="/*&#10; * Created by IntelliJ IDEA.&#10; * @author $USER$&#10;*/&#10;package $PACKAGE_NAME$;&#10;public interface $NAME$ { }&#10;" />
   <option name="ADJUST_CLASS_TEMPLATE" value="true" />
   <option name="ADJUST_INTERFACE_TEMPLATE" value="true" />
 </component>

diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 1dfda1b7995630b645baec97141a1f68e3f39f4f..a2a5e0b9d02243c583ba67ed3b9f5b33744107af 100644 (file)
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -471,9 +471,9 @@
     <localInspection language="JAVA" shortName="AccessStaticViaInstance" bundle="messages.InspectionsBundle" key="access.static.via.instance" groupName=""
                      enabledByDefault="true" level="WARNING"
                      implementationClass="com.intellij.codeInspection.accessStaticViaInstance.AccessStaticViaInstance" />
-    <localInspection shortName="DefaultFileTemplate" bundle="messages.InspectionsBundle" key="default.file.template.display.name"
-                     groupName="General" enabledByDefault="true" level="WARNING"
-                     implementationClass="com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection"/>
+    <!--<localInspection shortName="DefaultFileTemplate" bundle="messages.InspectionsBundle" key="default.file.template.display.name"-->
+                     <!--groupName="General" enabledByDefault="true" level="WARNING"-->
+                     <!--implementationClass="com.intellij.codeInspection.defaultFileTemplateUsage.DefaultFileTemplateUsageInspection"/>-->
     <globalInspection shortName="UnnecessaryModuleDependencyInspection" bundle="messages.InspectionsBundle"
                       key="unnecessary.module.dependency.display.name" groupName="Declaration redundancy" enabledByDefault="true"
                       level="WARNING"