From 67114f7cd01202c1878d563f0fd444d3a58630da Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Wed, 30 Oct 2013 17:06:30 +0100 Subject: [PATCH] remove color from more file template descriptions to get them to display nicely under Darcula --- .../code/Catch Statement Body.java.html | 16 ++++---- .../code/I18nized Concatenation.java.html | 37 +++++++++-------- .../code/I18nized Expression.java.html | 29 +++++++------- .../code/I18nized JSP Expression.jsp.html | 40 +++++++------------ .../code/Implemented Method Body.java.html | 32 +++++++-------- .../code/New Method Body.java.html | 30 +++++++++----- .../code/Overridden Method Body.java.html | 35 ++++++++-------- 7 files changed, 109 insertions(+), 110 deletions(-) diff --git a/resources-en/src/fileTemplates/code/Catch Statement Body.java.html b/resources-en/src/fileTemplates/code/Catch Statement Body.java.html index c6c4b27a6c83..d1c5a3b03d99 100644 --- a/resources-en/src/fileTemplates/code/Catch Statement Body.java.html +++ b/resources-en/src/fileTemplates/code/Catch Statement Body.java.html @@ -1,23 +1,23 @@ - +
-
This is a built-in template used for filling the body of a - catch statement each time it is generated by the program, e.g. when using the - Code | Surround with... function (Ctrl+Alt+T).
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables + 		This is a built-in template used for filling the body of a + catch block when it is generated, e.g. when using the + Code | Surround with... function.
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - +
Predefined variables will take the following values:
${EXCEPTION}${EXCEPTION}  name of the Exception variable specified as a catch parametername of the Exception variable specified as a catch parameter
diff --git a/resources-en/src/fileTemplates/code/I18nized Concatenation.java.html b/resources-en/src/fileTemplates/code/I18nized Concatenation.java.html index 1f37d53d87a5..5eac1093e7e0 100644 --- a/resources-en/src/fileTemplates/code/I18nized Concatenation.java.html +++ b/resources-en/src/fileTemplates/code/I18nized Concatenation.java.html @@ -1,41 +1,44 @@ - +
-
- This is a built-in template used for replace string concatenation (e.g. String s = "Hello " + name;) - with internationalized Java code expression, - e.g. String s = MessageFormat.format(myResourceBundle.getString("hello.0"), name);.
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables that + 		+ This is a built-in template used for replacing a string concatenation (e.g. String s = "Hello " + name;) + with an internationalized Java code expression (e.g. + String s = MessageFormat.format(​myResourceBundle.getString(​"hello.0"), name);).
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - + - - + - + + + + + - + - -
Predefined variables will take the following values:
${RESOURCE_BUNDLE}${RESOURCE_BUNDLE}  Expression of type java.util.ResourceBundle, instance of which is available in this contextExpression of type java.util.ResourceBundle, instance of which is available in this context.
${PROPERTY_KEY}${PARAMETERS}${PARAMETERS}  Property key name which is specified in the corresponding properties file. - Typically it is the value that is used for ResourceBundle.getString() method parameter. + Variables used in the string concatenation, usually passed as arguments to the internationalized expression.
${PROPERTY_KEY} Property key name which is defined in the corresponding properties file. + Typically it is the value that is used for ResourceBundle.getString() method parameter.
${PROPERTY_VALUE}${PROPERTY_VALUE}  Property value which is specified in the corresponding properties file. - This is an original Java string literal value. + Property value which is defined in the corresponding properties file. + This is the original Java string literal value.
\ No newline at end of file diff --git a/resources-en/src/fileTemplates/code/I18nized Expression.java.html b/resources-en/src/fileTemplates/code/I18nized Expression.java.html index 02683570d623..9b6decffb14e 100644 --- a/resources-en/src/fileTemplates/code/I18nized Expression.java.html +++ b/resources-en/src/fileTemplates/code/I18nized Expression.java.html @@ -1,40 +1,39 @@ - +
-
- This is a built-in template used for replace string literal expression (e.g. String s = "Hello";) - with internationalized Java code expression, - e.g. String s = myResourceBundle.getString("hello");.
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables that + 		+ This is a built-in template used for replacing a string literal expression (e.g. String s = "Hello";) + with an internationalized Java code expression + (e.g. String s = myResourceBundle.getString("hello");).
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - + - + - + - -
Predefined variables will take the following values:
${RESOURCE_BUNDLE}${RESOURCE_BUNDLE}  Expression of type java.util.ResourceBundle, instance of which is available in this contextExpression of type java.util.ResourceBundle, instance of which is available in this context.
${PROPERTY_KEY}${PROPERTY_KEY}   Property key name which is specified in the corresponding properties file. - Typically it is the value that is used for ResourceBundle.getString() method parameter. + Typically it is the value that is used for ResourceBundle.getString() method parameter.
${PROPERTY_VALUE}${PROPERTY_VALUE}  Property value which is specified in the corresponding properties file. - This is an original Java string literal value. + Property value which is defined in the corresponding properties file. + This is the original Java string literal value.
\ No newline at end of file diff --git a/resources-en/src/fileTemplates/code/I18nized JSP Expression.jsp.html b/resources-en/src/fileTemplates/code/I18nized JSP Expression.jsp.html index c4a631ee3ecb..7ee26d1ee527 100644 --- a/resources-en/src/fileTemplates/code/I18nized JSP Expression.jsp.html +++ b/resources-en/src/fileTemplates/code/I18nized JSP Expression.jsp.html @@ -1,53 +1,43 @@ -
- This is a built-in template used for replace text in JSP, - e.g. + This is a built-in template used for replacing text in JSP, + e.g. +
+   <html><body>
+     Hello!
+   </body></html>
-      - <html> - <body> - Hello! - </body> - </html> + with internationalized JSP custom tag usage, e.g.
- with internationalized JSP custom tag usage, - e.g. -
-      - <html> - <body> - <bean:message key="HelloKey"/> - </body> - </html> - . -

- The template is editable. Along with expressions allowed in JSP context, you can also use the predefined variables that +   <html><body>
+     <bean:message key="HelloKey"/>
+   </body></html> +
+ The template is editable. Along with expressions allowed in a JSP context, you can also use predefined variables that will be then expanded into the corresponding values.

- +
- + - + -
Predefined variables will take the following values:
${PROPERTY_KEY}${PROPERTY_KEY}   Property key name which is specified in the corresponding properties file.
${PROPERTY_VALUE}${PROPERTY_VALUE}   Property value which is specified in the corresponding properties file. This is an original JSP text selection value.
\ No newline at end of file diff --git a/resources-en/src/fileTemplates/code/Implemented Method Body.java.html b/resources-en/src/fileTemplates/code/Implemented Method Body.java.html index c80a394c253a..6b46bab9b0f7 100644 --- a/resources-en/src/fileTemplates/code/Implemented Method Body.java.html +++ b/resources-en/src/fileTemplates/code/Implemented Method Body.java.html @@ -1,50 +1,50 @@ - +
- This is a built-in template used for filling the body of an implemented method each time it is generated by the program, - e.g. when using the Implement Abstract Class/Implement Abstract Method intention actions or -calling the Code | Implement Method... function (Ctrl+I).
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables that + This is a built-in template used for filling the body of an implemented method when it is generated, + e.g. when using the Implement Abstract Class or Implement Abstract Method intention actions or + calling the Code | Implement Method... function.
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - + - + - + - + - + - + - diff --git a/resources-en/src/fileTemplates/code/New Method Body.java.html b/resources-en/src/fileTemplates/code/New Method Body.java.html index 9880e6f8458b..a5ddc83749ed 100644 --- a/resources-en/src/fileTemplates/code/New Method Body.java.html +++ b/resources-en/src/fileTemplates/code/New Method Body.java.html @@ -1,43 +1,51 @@ -
Predefined variables will take the following values:
${RETURN_TYPE}${RETURN_TYPE}  a return type of a created methodreturn type of a created method
${DEFAULT_RETURN_VALUE}${DEFAULT_RETURN_VALUE}  a value returned by the method by defaultvalue returned by the method by default
${METHOD_NAME}${METHOD_NAME}   name of the method that is implemented
${CLASS_NAME}${CLASS_NAME}   qualified name of the class where method is implemented
${SIMPLE_CLASS_NAME}${SIMPLE_CLASS_NAME}   non-qualified name of the class where method is implemented
All the predefined variables from "File Header" Include template are also available + All the predefined variables from the File Header template (Includes tab)are also available (e.g. - ${USER}, - ${DATE}, + ${USER}, + ${DATE}, etc)
+
This is a built-in template used for filling the body of a method - each time it is generated by the program, e.g. when using the Create Method from Usage intention action.
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables + when it is generated, e.g. when using the Create Method from Usage intention action.
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - + - + - + - + - + - + + + +
Predefined variables will take the following values:
${RETURN_TYPE}${RETURN_TYPE}  a return type of a created methodreturn type of a created method
${DEFAULT_RETURN_VALUE}${DEFAULT_RETURN_VALUE}  a value returned by the method by defaultvalue returned by the method by default
${METHOD_NAME}${METHOD_NAME}   name of the created method
${CLASS_NAME}${CLASS_NAME}   qualified name of the class where method is created
${SIMPLE_CLASS_NAME}${SIMPLE_CLASS_NAME}   non-qualified name of the class where method is implemented
All the predefined variables from the File Header template (Includes tab)are also available + (e.g. + ${USER}, + ${DATE}, + etc) +
\ No newline at end of file diff --git a/resources-en/src/fileTemplates/code/Overridden Method Body.java.html b/resources-en/src/fileTemplates/code/Overridden Method Body.java.html index 0139f4297df1..c3b42e36a312 100644 --- a/resources-en/src/fileTemplates/code/Overridden Method Body.java.html +++ b/resources-en/src/fileTemplates/code/Overridden Method Body.java.html @@ -1,60 +1,59 @@ - +
This is a built-in template used for filling the body of an overridden method each time it is generated by the program, - e.g. when calling the Code | Override Method... function (Ctrl+O).
- The template is editable. Along with Java expressions and comments, you can also use the predefined variables that + e.g. when calling the Code | Override Method... function.
+ The template is editable. Along with Java expressions and comments, you can also use predefined variables that will be then expanded into the corresponding values.
- +
- + - - + - + - + - + - + - + - + - -
Predefined variables will take the following values:
${CALL_SUPER}${CALL_SUPER}  a super method call, for void methods - super(); with or without parameters; - for other methods - return super(); with or without parameters + a super method call, for void methods - super.method_name(); with or without parameters; + for other methods - return super.method_name(); with or without parameters
${RETURN_TYPE}${RETURN_TYPE}  a return type of a created methodreturn type of a created method
${DEFAULT_RETURN_VALUE}${DEFAULT_RETURN_VALUE}  a value returned by the method by defaultvalue returned by the method by default
${METHOD_NAME}${METHOD_NAME}   name of the method that is overridden
${CLASS_NAME}${CLASS_NAME}   qualified name of the class where method is overridden
${SIMPLE_CLASS_NAME}${SIMPLE_CLASS_NAME}   non-qualified name of the class where method is implemented
All the predefined variables from "File Header" Include template are also available + All the predefined variables from the File Header template (Includes tab)are also available (e.g. - ${USER}, - ${DATE}, + ${USER}, + ${DATE}, etc)
\ No newline at end of file