MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

move getter/setter name suggestion to velocity

Browse Source
This commit is contained in:
Anna Kozlova
2015-01-28 17:07:22 +03:00
parent a7bbe94e22
commit b784b6165b
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/builderSetter.vm
+1 -1
View File
@@ -5,7 +5,7 @@ static void ##
#else
$classname ##
#end
$helper.suggestSetterName($field, $project)($field.type $paramName) {
set$StringUtil.capitalizeWithJavaBeanConvention($StringUtil.sanitizeJavaIdentifier($field.name))($field.type $paramName) {
#if ($field.name == $paramName)
#if (!$field.modifierStatic)
this.##
java/java-impl/src/com/intellij/codeInsight/generation/defaultGetter.vm
+12 -1
View File
@@ -2,6 +2,17 @@ public ##
#if($field.modifierStatic)
static ##
#end
$field.type $helper.suggestGetterName($field, $project)() {
$field.type ##
#set($name = $StringUtil.capitalizeWithJavaBeanConvention($StringUtil.sanitizeJavaIdentifier($field.name)))
#if ($field.boolean)
#if ($StringUtil.startsWithIgnoreCase($name, 'is'))
#set($name = $StringUtil.decapitalize($name))
#else
is##
#end
#else
get##
#end
${name}() {
return $field.name;
}
java/java-impl/src/com/intellij/codeInsight/generation/defaultSetter.vm
+1 -1
View File
@@ -3,7 +3,7 @@ public ##
#if($field.modifierStatic)
static ##
#end
void $helper.suggestSetterName($field, $project)($field.type $paramName) {
void set$StringUtil.capitalizeWithJavaBeanConvention($StringUtil.sanitizeJavaIdentifier($field.name))($field.type $paramName) {
#if ($field.name == $paramName)
#if (!$field.modifierStatic)
this.##
plugins/generate-tostring/src/org/jetbrains/java/generate/GenerationUtil.java
+1
View File
@@ -205,6 +205,7 @@ public class GenerationUtil {
vc.put("FQClassname", ce.getQualifiedName());
vc.put("settings", CodeStyleSettingsManager.getSettings(clazz.getProject()));
vc.put("helper", GenerationHelper.class);
vc.put("StringUtil", StringUtil.class);
vc.put("project", clazz.getProject());
for (String paramName : contextMap.keySet()) {
plugins/generate-tostring/src/org/jetbrains/java/generate/element/GenerationHelper.java
-14
View File
@@ -57,18 +57,4 @@ public class GenerationHelper {
String propertyName = codeStyleManager.variableNameToPropertyName(name, VariableKind.FIELD);
return codeStyleManager.propertyNameToVariableName(propertyName, VariableKind.PARAMETER);
}
public static String suggestGetterName(FieldElement fieldElement, Project project) {
String text = fieldElement.isModifierStatic() ? "static " : "";
text += fieldElement.getType() + " " + fieldElement.getName();
final PsiField field = JavaPsiFacade.getElementFactory(project).createFieldFromText(text, null);
return PropertyUtil.suggestGetterName(field);
}
public static String suggestSetterName(FieldElement fieldElement, Project project) {
String text = fieldElement.isModifierStatic() ? "static " : "";
text += fieldElement.getType() + " " + fieldElement.getName();
final PsiField field = JavaPsiFacade.getElementFactory(project).createFieldFromText(text, null);
return PropertyUtil.suggestSetterName(field);
}
}
plugins/generate-tostring/src/org/jetbrains/java/generate/view/GenerateTemplateConfigurable.java
+4 -1
View File
@@ -98,7 +98,10 @@ public class GenerateTemplateConfigurable implements UnnamedConfigurable{
}
final JPanel panel = new JPanel(new BorderLayout());
panel.add(component, BorderLayout.CENTER);
panel.add(new MultiLineLabel("Available implicit variables:\n" + StringUtil.join(availableImplicits, ", ")), BorderLayout.SOUTH);
MultiLineLabel label =
new MultiLineLabel("<html>Available implicit variables:\n" + StringUtil.join(availableImplicits, ", ") + "</html>");
label.setPreferredSize(new Dimension(250, 30));
panel.add(label, BorderLayout.SOUTH);
return panel;
}