diff options
Diffstat (limited to 'platform/core-impl/src/com/intellij/openapi')
3 files changed, 6 insertions, 4 deletions
diff --git a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java index bf84725f7910..90506c071f35 100644 --- a/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java +++ b/platform/core-impl/src/com/intellij/openapi/application/ex/ApplicationEx.java @@ -38,7 +38,8 @@ public interface ApplicationEx extends Application { * @throws IOException * @throws InvalidDataException */ - void load(String optionsPath) throws IOException, InvalidDataException; + void load(@Nullable String optionsPath) throws IOException; + boolean isLoaded(); @NotNull diff --git a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java index d1ed93f3a2be..ebb2896d2a8e 100644 --- a/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java +++ b/platform/core-impl/src/com/intellij/openapi/options/AbstractSchemesManager.java @@ -29,8 +29,7 @@ import java.util.*; public abstract class AbstractSchemesManager<T extends Scheme, E extends ExternalizableScheme> implements SchemesManager<T,E> { - - private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.options.AbstractSchemesManager"); + private static final Logger LOG = Logger.getInstance(AbstractSchemesManager.class); protected final List<T> mySchemes = new ArrayList<T>(); private volatile T myCurrentScheme; diff --git a/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorBase.java b/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorBase.java index d548fd2412b2..132dd5b30ee4 100644 --- a/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorBase.java +++ b/platform/core-impl/src/com/intellij/openapi/progress/util/AbstractProgressIndicatorBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -21,6 +21,7 @@ import com.intellij.openapi.application.impl.ModalityStateEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; +import com.intellij.openapi.progress.ProgressIndicatorProvider; import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.util.containers.ConcurrentHashSet; import com.intellij.util.containers.DoubleArrayList; @@ -89,6 +90,7 @@ public class AbstractProgressIndicatorBase extends UserDataHolderBase implements @Override public void cancel() { myCanceled = true; + ProgressIndicatorProvider.canceled(); } @Override |