diff options
Diffstat (limited to 'xml/dom-impl/src/com/intellij/util')
5 files changed, 15 insertions, 29 deletions
diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java index 19c4f06b1744..aec3931e6a45 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementAnnotationsManagerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 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. @@ -24,12 +24,10 @@ import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.ex.InspectionToolWrapper; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.Disposable; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.ModificationTracker; import com.intellij.profile.Profile; import com.intellij.profile.ProfileChangeAdapter; import com.intellij.profile.codeInspection.InspectionProfileManager; @@ -56,7 +54,6 @@ import java.util.List; public class DomElementAnnotationsManagerImpl extends DomElementAnnotationsManager { public static final Object LOCK = new Object(); - private static final Logger LOG = Logger.getInstance("#com.intellij.util.xml.highlighting.DomElementAnnotationsManagerImpl"); private static final Key<DomElementsProblemsHolderImpl> DOM_PROBLEM_HOLDER_KEY = Key.create("DomProblemHolder"); private static final Key<CachedValue<Boolean>> CACHED_VALUE_KEY = Key.create("DomProblemHolderCachedValue"); private final EventDispatcher<DomHighlightingListener> myDispatcher = EventDispatcher.create(DomHighlightingListener.class); @@ -109,18 +106,10 @@ public class DomElementAnnotationsManagerImpl extends DomElementAnnotationsManag } }; - private final ModificationTracker myModificationTracker; private final Project myProject; - private long myModificationCount; public DomElementAnnotationsManagerImpl(Project project) { myProject = project; - myModificationTracker = new ModificationTracker() { - @Override - public long getModificationCount() { - return myModificationCount; - } - }; final ProfileChangeAdapter profileChangeAdapter = new ProfileChangeAdapter() { @Override public void profileActivated(@NotNull Profile oldProfile, Profile profile) { @@ -145,7 +134,7 @@ public class DomElementAnnotationsManagerImpl extends DomElementAnnotationsManag @Override public void dropAnnotationsCache() { - myModificationCount++; + incModificationCount(); } public final List<DomElementProblemDescriptor> appendProblems(@NotNull DomFileElement element, @NotNull DomElementAnnotationHolder annotationHolder, Class<? extends DomElementsInspection> inspectionClass) { @@ -171,7 +160,7 @@ public class DomElementAnnotationsManagerImpl extends DomElementAnnotationsManag final CachedValue<Boolean> cachedValue = CachedValuesManager.getManager(myProject).createCachedValue(new CachedValueProvider<Boolean>() { @Override public Result<Boolean> compute() { - return new Result<Boolean>(Boolean.FALSE, element, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, myModificationTracker, ProjectRootManager.getInstance(myProject)); + return new Result<Boolean>(Boolean.FALSE, element, PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT, DomElementAnnotationsManagerImpl.this, ProjectRootManager.getInstance(myProject)); } }, false); cachedValue.getValue(); diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java index e0478c90a3d3..63b5d217018c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomCompletionContributor.java @@ -27,6 +27,7 @@ import com.intellij.util.ProcessingContext; import com.intellij.util.containers.HashSet; import com.intellij.xml.XmlAttributeDescriptor; import com.intellij.xml.util.XmlUtil; +import org.jetbrains.annotations.NotNull; /** * @author peter @@ -35,7 +36,7 @@ public class DomCompletionContributor extends CompletionContributor{ private final GenericValueReferenceProvider myProvider = new GenericValueReferenceProvider(); @Override - public void fillCompletionVariants(final CompletionParameters parameters, final CompletionResultSet result) { + public void fillCompletionVariants(@NotNull final CompletionParameters parameters, @NotNull final CompletionResultSet result) { if (parameters.getCompletionType() != CompletionType.BASIC) return; if (domKnowsBetter(parameters, result)) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java index 7614c25ff4ad..591795941d29 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java @@ -83,10 +83,10 @@ public final class DomManagerImpl extends DomManager { private final SemService mySemService; private final DomApplicationComponent myApplicationComponent; - private long myModificationCount; private boolean myChanging; public DomManagerImpl(Project project) { + super(project); myProject = project; mySemService = SemService.getSemService(project); myApplicationComponent = DomApplicationComponent.getInstance(); @@ -221,7 +221,7 @@ public final class DomManagerImpl extends DomManager { final void fireEvent(DomEvent event) { if (mySemService.isInsideAtomicChange()) return; - myModificationCount++; + incModificationCount(); myListeners.getMulticaster().eventOccured(event); } @@ -490,15 +490,10 @@ public final class DomManagerImpl extends DomManager { return myApplicationComponent.getTypeChooserManager(); } - @Override - public long getModificationCount() { - return myModificationCount + PsiManager.getInstance(myProject).getModificationTracker().getOutOfCodeBlockModificationCount(); - } - public void performAtomicChange(@NotNull Runnable change) { mySemService.performAtomicChange(change); if (!mySemService.isInsideAtomicChange()) { - myModificationCount++; + incModificationCount(); } } diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java index f44fe05c92d1..6fe7a0df71a4 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java +++ b/xml/dom-impl/src/com/intellij/util/xml/impl/DomReferenceContributor.java @@ -18,13 +18,14 @@ package com.intellij.util.xml.impl; import com.intellij.psi.PsiReferenceContributor; import com.intellij.psi.PsiReferenceRegistrar; import com.intellij.patterns.XmlPatterns; +import org.jetbrains.annotations.NotNull; /** * @author peter */ public class DomReferenceContributor extends PsiReferenceContributor{ @Override - public void registerReferenceProviders(final PsiReferenceRegistrar registrar) { + public void registerReferenceProviders(@NotNull final PsiReferenceRegistrar registrar) { GenericValueReferenceProvider provider = new GenericValueReferenceProvider(); registrar.registerReferenceProvider(XmlPatterns.xmlTag(), provider); diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java index c293df56af66..9506608eef97 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java @@ -30,6 +30,7 @@ import com.intellij.util.xml.ElementPresentation; import com.intellij.util.xml.tree.BaseDomElementNode; import com.intellij.util.xml.tree.DomFileElementNode; import com.intellij.util.xml.tree.DomModelTreeView; +import org.jetbrains.annotations.NotNull; /** * User: Sergey.Vasiliev @@ -56,12 +57,12 @@ public class DeleteDomElement extends BaseDomTreeAction { final DomElement domElement = ((BaseDomElementNode)selectedNode).getDomElement(); - final int ret = Messages.showOkCancelDialog(getPresentationText(selectedNode) + "?", ApplicationBundle.message("action.remove"), + final int ret = Messages.showOkCancelDialog(getPresentationText(selectedNode, "Remove") + "?", "Remove", Messages.getQuestionIcon()); if (ret == Messages.OK) { new WriteCommandAction(domElement.getManager().getProject(), DomUtil.getFile(domElement)) { @Override - protected void run(final Result result) throws Throwable { + protected void run(@NotNull final Result result) throws Throwable { domElement.undefine(); } }.execute(); @@ -90,7 +91,7 @@ public class DeleteDomElement extends BaseDomTreeAction { if (enabled) { - e.getPresentation().setText(getPresentationText(selectedNode)); + e.getPresentation().setText(getPresentationText(selectedNode, ApplicationBundle.message("action.remove"))); } else { e.getPresentation().setText(ApplicationBundle.message("action.remove")); @@ -99,8 +100,7 @@ public class DeleteDomElement extends BaseDomTreeAction { e.getPresentation().setIcon(AllIcons.General.Remove); } - private static String getPresentationText(final SimpleNode selectedNode) { - String removeString = ApplicationBundle.message("action.remove"); + private static String getPresentationText(final SimpleNode selectedNode, String removeString) { final ElementPresentation presentation = ((BaseDomElementNode)selectedNode).getDomElement().getPresentation(); removeString += " " + presentation.getTypeName() + (presentation.getElementName() == null || presentation.getElementName().trim().length() == 0? "" : ": " + presentation.getElementName()); |