From 662eb803d603ec9a13acc516a49d451650a4c454 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 8 Oct 2013 17:55:11 +0400 Subject: [PATCH] cleanup --- .../varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java | 6 +++--- .../intellij/codeInsight/hint/ParameterInfoController.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java b/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java index 1862d7edc0ef..2b2ea1634dfb 100644 --- a/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java +++ b/java/java-impl/src/com/intellij/codeInspection/varScopeCanBeNarrowed/BaseConvertToLocalQuickFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -15,7 +15,7 @@ */ package com.intellij.codeInspection.varScopeCanBeNarrowed; -import com.intellij.codeInsight.CodeInsightUtil; +import com.intellij.codeInsight.FileModificationService; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; @@ -99,7 +99,7 @@ public abstract class BaseConvertToLocalQuickFix implemen protected PsiElement moveDeclaration(Project project, V variable, final Collection references, boolean delete) { final PsiCodeBlock anchorBlock = findAnchorBlock(references); if (anchorBlock == null) return null; //was assert, but need to fix the case when obsolete inspection highlighting is left - if (!CodeInsightUtil.preparePsiElementsForWrite(anchorBlock)) return null; + if (!FileModificationService.getInstance().preparePsiElementsForWrite(anchorBlock)) return null; final PsiElement firstElement = getLowestOffsetElement(references); final String localName = suggestLocalName(project, variable, anchorBlock); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java index 966c935b0698..a4d94da42c4c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ParameterInfoController.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -34,7 +34,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import com.intellij.psi.util.PsiUtilBase; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.ui.LightweightHint; import com.intellij.util.Alarm; import com.intellij.util.ArrayUtil; @@ -317,7 +317,7 @@ public class ParameterInfoController implements Disposable { @Nullable public static E findArgumentList(PsiFile file, int offset, int lbraceOffset){ if (file == null) return null; - ParameterInfoHandler[] handlers = ShowParameterInfoHandler.getHandlers(file.getProject(), PsiUtilBase.getLanguageAtOffset(file, offset), file.getViewProvider().getBaseLanguage()); + ParameterInfoHandler[] handlers = ShowParameterInfoHandler.getHandlers(file.getProject(), PsiUtilCore.getLanguageAtOffset(file, offset), file.getViewProvider().getBaseLanguage()); if (handlers != null) { for(ParameterInfoHandler handler:handlers) {