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:
Vladimir.Orlov
2015-02-18 10:52:43 +03:00
parent 7fe80671a9 30c34a2342
commit 1b3c2b0254
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/options/SchemesManager.java
+1 -1
View File
@@ -94,7 +94,7 @@ public interface SchemesManager <T extends Scheme, E extends ExternalizableSchem
void save();
void setCurrentSchemeName(final String schemeName);
void setCurrentSchemeName(@Nullable String schemeName);
@Nullable
T getCurrentScheme();
platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java
+7 -6
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,15 +55,16 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
checkCurrentScheme(scheme);
}
protected void checkCurrentScheme(final Scheme scheme) {
if (myCurrentScheme == null && myCurrentSchemeName != null && myCurrentSchemeName.equals(scheme.getName())) {
protected void checkCurrentScheme(@NotNull Scheme scheme) {
if (myCurrentScheme == null && scheme.getName().equals(myCurrentSchemeName)) {
//noinspection unchecked
myCurrentScheme = (T)scheme;
}
}
private Collection<String> collectExistingNames(final Collection<T> schemes) {
Set<String> result = new THashSet<String>();
@NotNull
private Collection<String> collectExistingNames(@NotNull Collection<T> schemes) {
Set<String> result = new THashSet<String>(schemes.size());
for (T scheme : schemes) {
result.add(scheme.getName());
}
@@ -96,7 +97,7 @@ public abstract class AbstractSchemesManager<T extends Scheme, E extends Externa
}
@Override
public void setCurrentSchemeName(final String schemeName) {
public void setCurrentSchemeName(@Nullable String schemeName) {
myCurrentSchemeName = schemeName;
myCurrentScheme = schemeName == null ? null : findSchemeByName(schemeName);
}
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.java
+2 -2
View File
@@ -69,6 +69,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
private final SchemesManager<EditorColorsScheme, EditorColorsSchemeImpl> mySchemesManager;
@NonNls private static final String NAME_ATTR = "name";
private static final String FILE_SPEC = StoragePathMacros.ROOT_CONFIG + "/colors";
@NonNls
private static final String FILE_EXT = ".icls";
public EditorColorsManagerImpl(DefaultColorSchemesManager defaultColorSchemesManager, SchemesManagerFactory schemesManagerFactory) {
@@ -237,8 +238,7 @@ public class EditorColorsManagerImpl extends EditorColorsManager implements Name
}
private void setGlobalSchemeInner(@Nullable EditorColorsScheme scheme) {
String newValue = scheme == null ? getDefaultScheme().getName() : scheme.getName();
mySchemesManager.setCurrentSchemeName(newValue);
mySchemesManager.setCurrentSchemeName(scheme == null ? getDefaultScheme().getName() : scheme.getName());
}
@NotNull