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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
peter
2015-01-09 12:58:25 +01:00
parent d954669a0d cbd9748c8e
commit 5ba904ddf8
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/EqualsHashCodeTemplatesManager.java
+2 -5
View File
@@ -41,11 +41,8 @@ public class EqualsHashCodeTemplatesManager extends TemplatesManager {
return ServiceManager.getService(EqualsHashCodeTemplatesManager.class);
}
public EqualsHashCodeTemplatesManager() {
super(getDefaultTemplates());
}
private static TemplateResource[] getDefaultTemplates() {
@Override
public TemplateResource[] getDefaultTemplates() {
try {
return new TemplateResource[] {
new TemplateResource("Default equals", readFile(DEFAULT_EQUALS), true),
platform/lang-impl/src/com/intellij/ui/StringComboboxEditor.java
+1 -2
View File
@@ -18,7 +18,6 @@ package com.intellij.ui;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.command.undo.UndoConstants;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -58,7 +57,7 @@ public class StringComboboxEditor extends EditorComboBoxEditor {
if (usePlainMatcher) {
document.putUserData(USE_PLAIN_PREFIX_MATCHER, true);
}
document.putUserData(UndoConstants.DONT_RECORD_UNDO, true);
super.setItem(document);
}
plugins/generate-tostring/src/org/jetbrains/java/generate/template/TemplatesManager.java
+3 -8
View File
@@ -32,14 +32,9 @@ import java.util.*;
public abstract class TemplatesManager implements PersistentStateComponent<TemplatesState> {
private TemplatesState myState = new TemplatesState();
public TemplatesManager(TemplateResource[] resources) {
for (TemplateResource o : resources) {
addTemplate(o);
}
}
private TemplatesState myState = new TemplatesState();
public abstract TemplateResource[] getDefaultTemplates();
/**
* Reads the content of the resource and return it as a String.
* <p/>Uses the class loader that loaded this class to find the resource in its classpath.
@@ -77,7 +72,7 @@ public abstract class TemplatesManager implements PersistentStateComponent<Templ
public Collection<TemplateResource> getAllTemplates() {
HashSet<String> names = new HashSet<String>();
Collection<TemplateResource> templates = new LinkedHashSet<TemplateResource>();
Collection<TemplateResource> templates = new LinkedHashSet<TemplateResource>(Arrays.asList(getDefaultTemplates()));
for (TemplateResource template : myState.templates) {
if (names.add(template.getFileName())) {
templates.add(template);
plugins/generate-tostring/src/org/jetbrains/java/generate/template/toString/ToStringTemplatesManager.java
+3 -6
View File
@@ -33,7 +33,7 @@ import java.io.IOException;
)}
)
public class ToStringTemplatesManager extends TemplatesManager {
private static final String DEFAULT_CONCAT = "/org/jetbrains/java/generate/template/toString/DefaultConcatMember.vm";
private static final String DEFAULT_CONCAT = "DefaultConcatMember.vm";
private static final String DEFAULT_CONCAT_GROOVY = "/org/jetbrains/java/generate/template/toString/DefaultConcatMemberGroovy.vm";
private static final String DEFAULT_CONCAT_SUPER = "/org/jetbrains/java/generate/template/toString/DefaultConcatMemberSuper.vm";
private static final String DEFAULT_BUFFER = "/org/jetbrains/java/generate/template/toString/DefaultBuffer.vm";
@@ -46,11 +46,8 @@ public class ToStringTemplatesManager extends TemplatesManager {
return ServiceManager.getService(ToStringTemplatesManager.class);
}
public ToStringTemplatesManager() {
super(getDefaultTemplates());
}
public static TemplateResource[] getDefaultTemplates() {
@Override
public TemplateResource[] getDefaultTemplates() {
try {
return new TemplateResource[]{
new TemplateResource("String concat (+)", readFile(DEFAULT_CONCAT), true),