refactoring, removed interface

This commit is contained in:
Yaroslav Lepenkin
2015-02-18 16:08:47 +03:00
parent d772251a3f
commit 1cd91e1af2
4 changed files with 9 additions and 12 deletions
@@ -16,8 +16,7 @@
package com.intellij.lang.java;
import com.intellij.lang.ImportOptimizer;
import com.intellij.notification.UserNotificationInfoProvider;
import com.intellij.lang.InfoCollectingImportOptimizer;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.project.Project;
@@ -34,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
/**
* @author max
*/
public class JavaImportOptimizer implements ImportOptimizer, UserNotificationInfoProvider {
public class JavaImportOptimizer implements InfoCollectingImportOptimizer {
private static final Logger LOG = Logger.getInstance("#com.intellij.lang.java.JavaImportOptimizer");
private int myImportListLengthDiff;
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.notification;
package com.intellij.lang;
import org.jetbrains.annotations.Nullable;
public interface UserNotificationInfoProvider {
public interface InfoCollectingImportOptimizer extends ImportOptimizer {
@Nullable
String getUserNotificationInfo();
}
}
@@ -18,8 +18,8 @@ package com.intellij.codeInsight.actions;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.lang.ImportOptimizer;
import com.intellij.lang.InfoCollectingImportOptimizer;
import com.intellij.lang.LanguageImportStatements;
import com.intellij.notification.UserNotificationInfoProvider;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.EmptyRunnable;
@@ -108,8 +108,8 @@ public class OptimizeImportsProcessor extends AbstractLayoutCodeProcessor {
private static String retrieveMessage(@NotNull ImportOptimizer optimizer) {
String info = "imports optimized";
if (optimizer instanceof UserNotificationInfoProvider) {
info = ((UserNotificationInfoProvider)optimizer).getUserNotificationInfo();
if (optimizer instanceof InfoCollectingImportOptimizer) {
info = ((InfoCollectingImportOptimizer)optimizer).getUserNotificationInfo();
}
return info;
}
@@ -15,7 +15,6 @@
*/
package com.intellij.psi.codeStyle.arrangement.engine;
import com.intellij.notification.UserNotificationInfoProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -57,11 +56,10 @@ import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Se
* @author Denis Zhdanov
* @since 7/20/12 1:56 PM
*/
public class ArrangementEngine implements UserNotificationInfoProvider {
public class ArrangementEngine {
private boolean myCodeChanged;
@Nullable
@Override
public String getUserNotificationInfo() {
if (myCodeChanged) {
return "rearranged code";