This commit is contained in:
Vladimir Krivosheev
2014-08-31 10:49:48 +02:00
parent c5aed093c3
commit cf9baaba76
3 changed files with 5 additions and 9 deletions
@@ -31,7 +31,6 @@ import org.jdom.Element;
}
)
public class LegacyCodeStyleSettingsManager implements PersistentStateComponent<Element> {
private Element myState;
@Override
@@ -58,8 +58,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
public class CodeStyleManagerImpl extends CodeStyleManager {
private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.CodeStyleManagerImpl");
private static final Logger LOG = Logger.getInstance(CodeStyleManagerImpl.class);
private static final ThreadLocal<ProcessingUnderProgressInfo> SEQUENTIAL_PROCESSING_ALLOWED
= new ThreadLocal<ProcessingUnderProgressInfo>()
{
@@ -41,8 +41,7 @@ import java.util.*;
@SuppressWarnings({"deprecation"})
public abstract class ComponentStoreImpl implements IComponentStore {
private static final Logger LOG = Logger.getInstance("#com.intellij.components.ComponentStoreImpl");
private static final Logger LOG = Logger.getInstance(ComponentStoreImpl.class);
private final Map<String, Object> myComponents = Collections.synchronizedMap(new THashMap<String, Object>());
private final List<SettingsSavingComponent> mySettingsSavingComponents = Collections.synchronizedList(new ArrayList<SettingsSavingComponent>());
@Nullable private SaveSessionImpl mySession;
@@ -274,13 +273,12 @@ public abstract class ComponentStoreImpl implements IComponentStore {
@NotNull
private static <T> Class<T> getComponentStateClass(@NotNull final PersistentStateComponent<T> persistentStateComponent) {
final Class persistentStateComponentClass = PersistentStateComponent.class;
Class componentClass = persistentStateComponent.getClass();
nextSuperClass:
while (true) {
final Class[] interfaces = componentClass.getInterfaces();
for (Class anInterface : interfaces) {
for (Class anInterface : componentClass.getInterfaces()) {
if (anInterface.equals(persistentStateComponentClass)) {
break nextSuperClass;
}
@@ -290,7 +288,7 @@ public abstract class ComponentStoreImpl implements IComponentStore {
}
final Type type = ReflectionUtil.resolveVariable(persistentStateComponentClass.getTypeParameters()[0], componentClass);
assert type != null;
//noinspection unchecked
return (Class<T>)ReflectionUtil.getRawType(type);
}