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

cleanup

Browse Source
This commit is contained in:
Vladimir Krivosheev
2014-11-18 17:56:51 +01:00
parent f0dc8e967d
commit 670f81064c
7 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSchemes.java
-1
View File
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.Nullable;
* Date: Jul 19, 2002
*/
public abstract class CodeStyleSchemes {
public static CodeStyleSchemes getInstance(){
CodeStyleSchemes schemes = ServiceManager.getService(CodeStyleSchemes.class);
if (!schemes.isLoaded()) {
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateSettings.java
+1 -2
View File
@@ -186,8 +186,8 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
public TemplateSettings(SchemesManagerFactory schemesManagerFactory) {
mySchemesManager = schemesManagerFactory.createSchemesManager(TEMPLATES_DIR_PATH, new BaseSchemeProcessor<TemplateGroup>() {
@Override
@Nullable
@Override
public TemplateGroup readScheme(@NotNull Element element) throws InvalidDataException {
return readTemplateFile(element, element.getAttributeValue("group"), false, false,
getClass().getClassLoader());
@@ -523,7 +523,6 @@ public class TemplateSettings implements PersistentStateComponent<TemplateSettin
}
return result.isEmpty() ? null : result;
}
private TemplateImpl readTemplateFromElement(final boolean isDefault,
platform/lang-impl/src/com/intellij/profile/codeInspection/InspectionProfileManagerImpl.java
+1
View File
@@ -83,6 +83,7 @@ public class InspectionProfileManagerImpl extends InspectionProfileManager imple
registerProvidedSeverities();
SchemeProcessor<InspectionProfileImpl> processor = new BaseSchemeProcessor<InspectionProfileImpl>() {
@NotNull
@Override
public InspectionProfileImpl readScheme(@NotNull Element element) {
InspectionProfileImpl profile = new InspectionProfileImpl(InspectionProfileLoadUtil.getProfileName(element), myRegistrar, InspectionProfileManagerImpl.this);
platform/lang-impl/src/com/intellij/tools/ToolsProcessor.java
+1
View File
@@ -54,6 +54,7 @@ abstract public class ToolsProcessor<T extends Tool> extends BaseSchemeProcessor
@NonNls private static final String ELEMENT_OPTION = "option";
@NonNls private static final String ATTRIBUTE_VALUE = "value";
@NotNull
@Override
public ToolsGroup<T> readScheme(@NotNull Element root) throws InvalidDataException, IOException, JDOMException {
if (!TOOL_SET.equals(root.getName())) {
platform/platform-impl/src/com/intellij/openapi/actionSystem/ex/QuickListsManager.java
+2
View File
@@ -62,6 +62,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ
myActionManager = actionManagerEx;
mySchemesManager = schemesManagerFactory.createSchemesManager(StoragePathMacros.ROOT_CONFIG + "/quicklists",
new BaseSchemeProcessor<QuickList>() {
@NotNull
@Override
public QuickList readScheme(@NotNull Element element) {
return loadListFromDocument(element);
@@ -86,6 +87,7 @@ public class QuickListsManager implements ExportableApplicationComponent, NamedJ
registerActions();
}
@NotNull
private static QuickList loadListFromDocument(@NotNull Element element) {
QuickList list = new QuickList();
list.readExternal(element);
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+4 -4
View File
@@ -54,6 +54,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
public class EditorColorsManagerImpl extends EditorColorsManager implements NamedJDOMExternalizable, ExportableComponent, NamedComponent {
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl");
@@ -213,7 +214,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
@NotNull
@Override
public EditorColorsScheme[] getAllSchemes() {
ArrayList<EditorColorsScheme> schemes = new ArrayList<EditorColorsScheme>(mySchemesManager.getAllSchemes());
List<EditorColorsScheme> schemes = new ArrayList<EditorColorsScheme>(mySchemesManager.getAllSchemes());
Collections.sort(schemes, new Comparator<EditorColorsScheme>() {
@Override
public int compare(@NotNull EditorColorsScheme s1, @NotNull EditorColorsScheme s2) {
@@ -370,10 +371,9 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
}
private final class MySchemeProcessor extends BaseSchemeProcessor<EditorColorsSchemeImpl> implements SchemeExtensionProvider {
@NotNull
@Override
public EditorColorsSchemeImpl readScheme(@NotNull Element element)
throws InvalidDataException {
public EditorColorsSchemeImpl readScheme(@NotNull Element element) throws InvalidDataException {
return loadSchemeFromDocument(element, true);
}
platform/platform-impl/src/com/intellij/openapi/fileTypes/impl/AbstractFileType.java
+23 -10
View File
@@ -93,10 +93,12 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
mySyntaxTable = syntaxTable;
}
@Override
public AbstractFileType clone() {
return (AbstractFileType)super.clone();
}
@Override
public void copyFrom(UserFileType newType) {
super.copyFrom(newType);
if (newType instanceof AbstractFileType) {
@@ -105,10 +107,12 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
}
}
@Override
public boolean isBinary() {
return false;
}
@Override
public void readExternal(final Element typeElement) throws InvalidDataException {
Element element = typeElement.getChild(ELEMENT_HIGHLIGHTING);
if (element != null) {
@@ -119,12 +123,11 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
}
}
public static SyntaxTable readSyntaxTable(Element root) {
@NotNull
public static SyntaxTable readSyntaxTable(@NotNull Element root) {
SyntaxTable table = new SyntaxTable();
for (final Object o : root.getChildren()) {
Element element = (Element)o;
for (Element element : root.getChildren()) {
if (ELEMENT_OPTIONS.equals(element.getName())) {
for (final Object o1 : element.getChildren(ELEMENT_OPTION)) {
Element e = (Element)o1;
@@ -156,7 +159,8 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
}
else if (VALUE_HAS_PARENS.equals(name)) {
table.setHasParens(Boolean.valueOf(value).booleanValue());
} else if (VALUE_HAS_STRING_ESCAPES.equals(name)) {
}
else if (VALUE_HAS_STRING_ESCAPES.equals(name)) {
table.setHasStringEscapes(Boolean.valueOf(value).booleanValue());
}
}
@@ -184,7 +188,9 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
XMLOutputter outputter = JDOMUtil.createOutputter("\n");
try {
outputter.output((Element)element.getContent().get(0), System.out);
} catch (IOException ex) {}
}
catch (IOException ignored) {
}
}
return table;
}
@@ -203,9 +209,9 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
}
}
@Override
public void writeExternal(final Element element) throws WriteExternalException {
SyntaxTable table = getSyntaxTable();
writeTable(element, table);
writeTable(element, getSyntaxTable());
}
private static void writeTable(Element element, SyntaxTable table) {
@@ -270,10 +276,13 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
}
private static void addElementOption(final Element optionsElement, final String valueHasParens, final boolean hasParens) {
if (!hasParens) return;
if (!hasParens) {
return;
}
Element supportParens = new Element(ELEMENT_OPTION);
supportParens.setAttribute(ATTRIBUTE_NAME, valueHasParens);
supportParens.setAttribute(ATTRIBUTE_VALUE, String.valueOf(hasParens));
supportParens.setAttribute(ATTRIBUTE_VALUE, String.valueOf(true));
optionsElement.addContent(supportParens);
}
@@ -301,10 +310,12 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
return keywordsElement;
}
@Override
public void markDefaultSettings() {
myDefaultSyntaxTable = mySyntaxTable;
}
@Override
public boolean isModified() {
return !Comparing.equal(myDefaultSyntaxTable, getSyntaxTable());
}
@@ -399,6 +410,7 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
return mapping;
}
@Override
public SettingsEditor<AbstractFileType> getEditor() {
return new CustomFileTypeEditor();
}
@@ -407,6 +419,7 @@ public class AbstractFileType extends UserFileType<AbstractFileType> implements
myCommenter = commenter;
}
@Override
@NotNull
public ExternalInfo getExternalInfo() {
return myExternalInfo;