This commit is contained in:
Alexey Kudravtsev
2014-04-03 13:34:21 +04:00
parent 4e0ca1cbe8
commit 2831129850
9 changed files with 23 additions and 18 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -43,6 +43,7 @@ import com.intellij.ui.content.ContentManager;
import com.intellij.util.messages.MessageBusConnection;
import org.jdom.Element;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
import javax.swing.tree.DefaultTreeModel;
@@ -300,7 +301,7 @@ public class TodoView implements PersistentStateComponent<Element>, Disposable {
private final class MyFileTypeListener extends FileTypeListener.Adapter {
@Override
public void fileTypesChanged(FileTypeEvent e){
public void fileTypesChanged(@NotNull FileTypeEvent e){
// this invokeLater guaranties that this code will be invoked after
// PSI gets the same event.
DumbService.getInstance(myProject).smartInvokeLater(new Runnable() {
@@ -149,7 +149,7 @@ public class DirectoryIndexImpl extends DirectoryIndex {
private void subscribeToFileChanges() {
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
@Override
public void fileTypesChanged(FileTypeEvent event) {
public void fileTypesChanged(@NotNull FileTypeEvent event) {
doInitialize();
}
});
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -75,12 +75,12 @@ public class ProjectRootManagerComponent extends ProjectRootManagerImpl {
myConnection = project.getMessageBus().connect(project);
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener() {
@Override
public void beforeFileTypesChanged(FileTypeEvent event) {
public void beforeFileTypesChanged(@NotNull FileTypeEvent event) {
beforeRootsChange(true);
}
@Override
public void fileTypesChanged(FileTypeEvent event) {
public void fileTypesChanged(@NotNull FileTypeEvent event) {
rootsChanged(true);
}
});
@@ -72,7 +72,7 @@ public class PsiVFSListener extends VirtualFileAdapter {
myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new MyModuleRootListener());
myConnection.subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
@Override
public void fileTypesChanged(FileTypeEvent e) {
public void fileTypesChanged(@NotNull FileTypeEvent e) {
myFileManager.processFileTypesChanged();
}
});
@@ -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.
@@ -15,10 +15,12 @@
*/
package com.intellij.openapi.fileTypes;
import org.jetbrains.annotations.NotNull;
import java.util.EventObject;
public class FileTypeEvent extends EventObject {
public FileTypeEvent(Object source) {
public FileTypeEvent(@NotNull Object source) {
super(source);
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -15,14 +15,16 @@
*/
package com.intellij.openapi.fileTypes;
import org.jetbrains.annotations.NotNull;
import java.util.EventListener;
public interface FileTypeListener extends EventListener {
class Adapter implements FileTypeListener {
@Override public void beforeFileTypesChanged(FileTypeEvent event) { }
@Override public void fileTypesChanged(FileTypeEvent event) { }
@Override public void beforeFileTypesChanged(@NotNull FileTypeEvent event) { }
@Override public void fileTypesChanged(@NotNull FileTypeEvent event) { }
}
void beforeFileTypesChanged(FileTypeEvent event);
void fileTypesChanged(FileTypeEvent event);
void beforeFileTypesChanged(@NotNull FileTypeEvent event);
void fileTypesChanged(@NotNull FileTypeEvent event);
}
@@ -1772,7 +1772,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec
*/
private final class MyFileTypeListener extends FileTypeListener.Adapter {
@Override
public void fileTypesChanged(final FileTypeEvent event) {
public void fileTypesChanged(@NotNull final FileTypeEvent event) {
assertDispatchThread();
final VirtualFile[] openFiles = getOpenFiles();
for (int i = openFiles.length - 1; i >= 0; i--) {
@@ -342,7 +342,7 @@ class TextEditorComponent extends JBLoadingPanel implements DataProvider {
*/
private final class MyFileTypeListener extends FileTypeListener.Adapter {
@Override
public void fileTypesChanged(final FileTypeEvent event) {
public void fileTypesChanged(@NotNull final FileTypeEvent event) {
assertThread();
// File can be invalid after file type changing. The editor should be removed
// by the FileEditorManager if it's invalid.
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2012 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.
@@ -42,7 +42,7 @@ public class FileTypeUtil {
createMappings();
bus.connect().subscribe(FileTypeManager.TOPIC, new FileTypeListener.Adapter() {
@Override
public void fileTypesChanged(FileTypeEvent event) {
public void fileTypesChanged(@NotNull FileTypeEvent event) {
types = null;
}
});