This commit is contained in:
Alexey Kudravtsev
2016-10-17 15:35:53 +03:00
parent fafb9d1efe
commit c1ba655f17
2 changed files with 6 additions and 6 deletions
@@ -28,7 +28,8 @@ public class SimpleModificationTracker implements ModificationTracker {
private static final AtomicIntegerFieldUpdater<SimpleModificationTracker> UPDATER =
AtomicIntegerFieldUpdater.newUpdater(SimpleModificationTracker.class, "myCounter");
@SuppressWarnings("unused") private volatile int myCounter;
@SuppressWarnings("unused")
private volatile int myCounter;
@Override
public long getModificationCount() {
@@ -36,7 +37,7 @@ public class SimpleModificationTracker implements ModificationTracker {
}
public void incModificationCount() {
UPDATER.incrementAndGet(this);
incAndGetModificationCount();
}
public long incAndGetModificationCount() {
@@ -19,7 +19,6 @@ import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.CachedSingletonsRegistry;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Getter;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.messages.Topic;
import org.jetbrains.annotations.NonNls;
@@ -36,7 +35,7 @@ import java.util.List;
public abstract class FileTypeManager extends FileTypeRegistry {
static {
FileTypeRegistry.ourInstanceGetter = () -> FileTypeManager.getInstance();
FileTypeRegistry.ourInstanceGetter = () -> getInstance();
}
private static FileTypeManager ourInstance = CachedSingletonsRegistry.markCachedField(FileTypeManager.class);
@@ -59,7 +58,7 @@ public abstract class FileTypeManager extends FileTypeRegistry {
}
/**
* @deprecated use {@link com.intellij.openapi.fileTypes.FileTypeFactory} instead
* @deprecated use {@link FileTypeFactory} instead
*/
public abstract void registerFileType(@NotNull FileType type, @NotNull List<FileNameMatcher> defaultAssociations);
@@ -69,7 +68,7 @@ public abstract class FileTypeManager extends FileTypeRegistry {
* @param type The file type to register.
* @param defaultAssociatedExtensions The list of extensions which cause the file to be
* treated as the specified file type. The extensions should not start with '.'.
* @deprecated use {@link com.intellij.openapi.fileTypes.FileTypeFactory} instead
* @deprecated use {@link FileTypeFactory} instead
*/
public final void registerFileType(@NotNull FileType type, @NonNls @Nullable String... defaultAssociatedExtensions) {
List<FileNameMatcher> matchers = new ArrayList<>();