SSR: cleanup java predefined templates for methods
authorBas Leijdekkers <basleijdekkers@gmail.com>
Tue, 15 Nov 2016 14:43:37 +0000 (15:43 +0100)
committerBas Leijdekkers <basleijdekkers@gmail.com>
Wed, 16 Nov 2016 20:21:43 +0000 (21:21 +0100)
java/structuralsearch-java/src/com/intellij/structuralsearch/JavaPredefinedConfigurations.java

index a065b81ffc4f89a6bc6ad3abd9f4cb2ba0adc247..0add4f6684a65ddacc4336064effaa1949b00835 100644 (file)
@@ -172,7 +172,7 @@ class JavaPredefinedConfigurations {
       // Add comments and metadata
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.comments"),"/* 'CommentContent */", METADATA_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.javadoc.annotated.class"),"/** @'_Tag+ '_TagValue* */\nclass '_Class {\n}", METADATA_TYPE),
-      createSearchTemplateInfo(SSRBundle.message("predefined.configuration.javadoc.annotated.methods"),"/** @'_Tag+ '_TagValue* */\n'_Type+ '_Method+('_ParameterType '_Parameter*);", METADATA_TYPE),
+      createSearchTemplateInfo(SSRBundle.message("predefined.configuration.javadoc.annotated.methods"),"/** @'_Tag+ '_TagValue* */\n'_Type '_Method('_ParameterType '_Parameter*);", METADATA_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.javadoc.annotated.fields"),"class '_Class {\n  /** @'_Tag+ '_TagValue* */\n  '_Type+ 'Field+ = '_Init*;\n}", METADATA_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.javadoc.tags"),"/** @'Tag+ '_TagValue* */", METADATA_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.xdoclet.metadata"),"/** @'Tag \n  '_Property+\n*/", METADATA_TYPE),
@@ -187,10 +187,10 @@ class JavaPredefinedConfigurations {
                                "  '_FieldType 'Field+ = '_Init?;\n" +
                                "}", METADATA_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.annotated.methods"),
-                               "@'_Annotation+( )\n'_MethodType '_Method+('_ParameterType '_Parameter*);", METADATA_TYPE),
+                               "@'_Annotation+( )\n'_MethodType '_Method('_ParameterType '_Parameter*);", METADATA_TYPE),
 
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.not.annotated.methods"),
-                               "@'_Annotation{0,0}\n'_MethodType '_Method+('_ParameterType '_Parameter*);", METADATA_TYPE),
+                               "@'_Annotation{0,0}\n'_MethodType '_Method('_ParameterType '_Parameter*);", METADATA_TYPE),
 
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.annotation.declarations"),
                                "@interface 'Interface {}", METADATA_TYPE),
@@ -264,7 +264,7 @@ class JavaPredefinedConfigurations {
                                                                                         "  }\n"+
                                                                                         "}",MISC_TYPE),
       createSearchTemplateInfo(SSRBundle.message("predefined.configuration.similar.methods.structure"),
-                               "'_RetType '_Method+('_ParameterType '_Parameter) throws 'ExceptionType {\n" +
+                               "'_RetType '_Method('_ParameterType '_Parameter*) throws 'ExceptionType {\n" +
                                "  try {\n" +
                                "    '_OtherStatements+;\n" +
                                "  } catch('_SomeException '_Exception) {\n" +