From fbd8efa67df23c73de548556c883cd885d8f2039 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 19 Aug 2011 13:06:42 +0400 Subject: [PATCH] dead code --- .../openapi/vfs/ModificationAttemptEvent.java | 40 ------------------- .../vfs/ModificationAttemptListener.java | 22 ---------- .../openapi/vfs/VirtualFileManager.java | 5 --- .../openapi/command/impl/UndoRedo.java | 2 - .../impl/FileDocumentManagerImpl.java | 11 ----- .../openapi/vfs/ex/VirtualFileManagerEx.java | 4 -- .../vfs/impl/VirtualFileManagerImpl.java | 16 -------- .../intellij/mock/MockVirtualFileManager.java | 32 --------------- 8 files changed, 132 deletions(-) delete mode 100644 platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptEvent.java delete mode 100644 platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptListener.java diff --git a/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptEvent.java b/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptEvent.java deleted file mode 100644 index 87469a402fb5..000000000000 --- a/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptEvent.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2000-2009 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.vfs; - -import java.util.EventObject; - -public class ModificationAttemptEvent extends EventObject{ - private final VirtualFile[] myFiles; - private boolean myConsumed = false; - - public ModificationAttemptEvent(VirtualFileManager manager, VirtualFile[] files) { - super(manager); - myFiles = files; - } - - public VirtualFile[] getFiles() { - return myFiles; - } - - public void consume(){ - myConsumed = true; - } - - public boolean isConsumed() { - return myConsumed; - } -} diff --git a/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptListener.java b/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptListener.java deleted file mode 100644 index 7675eca959ea..000000000000 --- a/platform/core-api/src/com/intellij/openapi/vfs/ModificationAttemptListener.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2009 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.openapi.vfs; - -import java.util.EventListener; - -public interface ModificationAttemptListener extends EventListener{ - void readOnlyModificationAttempt(ModificationAttemptEvent event); -} diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileManager.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileManager.java index de9f883cf93a..5bef2cda67b0 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileManager.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFileManager.java @@ -123,11 +123,6 @@ public abstract class VirtualFileManager implements ModificationTracker{ */ public abstract void removeVirtualFileListener(@NotNull VirtualFileListener listener); - public abstract void addModificationAttemptListener(@NotNull ModificationAttemptListener listener); - public abstract void removeModificationAttemptListener(@NotNull ModificationAttemptListener listener); - - public abstract void fireReadOnlyModificationAttempt(@NotNull VirtualFile... files); - /** * Constructs URL by specified protocol and path. URL is a string which uniquely identifies file in all * file systems. diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java index c52f89586ecc..013879e11efe 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedo.java @@ -29,7 +29,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileManager; import java.util.ArrayList; import java.util.Collection; @@ -119,7 +118,6 @@ abstract class UndoRedo { final VirtualFile[] files = VfsUtil.toVirtualFileArray(readOnlyFiles); if (project == null) { - VirtualFileManager.getInstance().fireReadOnlyModificationAttempt(files); return false; } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java index 5bd278624af7..4dceb618cdf0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java @@ -33,7 +33,6 @@ import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.editor.event.DocumentAdapter; import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.editor.ex.DocumentEx; -import com.intellij.openapi.editor.ex.EditReadOnlyListener; import com.intellij.openapi.fileEditor.*; import com.intellij.openapi.fileTypes.BinaryFileTypeDecompilers; import com.intellij.openapi.fileTypes.FileType; @@ -78,7 +77,6 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl private static final Key FILE_KEY = Key.create("FILE_KEY"); private final Set myUnsavedDocuments = new ConcurrentHashSet(); - private final EditReadOnlyListener myReadOnlyListener = new MyEditReadOnlyListener(); private final EventDispatcher myVetoDispatcher = EventDispatcher.create(FileDocumentSynchronizationVetoListener.class); @@ -142,7 +140,6 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl } } ); - document.addEditReadOnlyListener(myReadOnlyListener); } } @@ -616,14 +613,6 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl public void beforeFileMovement(VirtualFileMoveEvent event) { } - private final class MyEditReadOnlyListener implements EditReadOnlyListener { - public void readOnlyModificationAttempt(Document document) { - VirtualFile file = getFile(document); - if (file == null) return; - myVirtualFileManager.fireReadOnlyModificationAttempt(file); - } - } - private void fireFileContentReloaded(final VirtualFile file, final Document document) { myBus.syncPublisher(AppTopics.FILE_DOCUMENT_SYNC).fileContentReloaded(file, document); for (FileDocumentManagerListener listener : getListeners()) { diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerEx.java index ebda7c47ed0b..174f859f487f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/ex/VirtualFileManagerEx.java @@ -17,12 +17,8 @@ package com.intellij.openapi.vfs.ex; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.openapi.vfs.VirtualFileSystem; public abstract class VirtualFileManagerEx extends VirtualFileManager { - public abstract void registerFileSystem(VirtualFileSystem fileSystem); - public abstract void unregisterFileSystem(VirtualFileSystem fileSystem); - public abstract void fireBeforeRefreshStart(boolean asynchronous); public abstract void fireAfterRefreshFinish(boolean asynchronous); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java index 66e79d719bc8..81ac98e52091 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFileManagerImpl.java @@ -56,7 +56,6 @@ public class VirtualFileManagerImpl extends VirtualFileManagerEx implements Appl private final EventDispatcher myVirtualFileListenerMulticaster = EventDispatcher.create(VirtualFileListener.class); private final List myVirtualFileManagerListeners = ContainerUtil.createEmptyCOWList(); - private final EventDispatcher myModificationAttemptListenerMulticaster = EventDispatcher.create(ModificationAttemptListener.class); private int myRefreshCount = 0; private final ManagingFS myPersistence; @@ -188,21 +187,6 @@ public class VirtualFileManagerImpl extends VirtualFileManagerEx implements Appl myVirtualFileListenerMulticaster.removeListener(listener); } - public void addModificationAttemptListener(@NotNull ModificationAttemptListener listener) { - myModificationAttemptListenerMulticaster.addListener(listener); - } - - public void removeModificationAttemptListener(@NotNull ModificationAttemptListener listener) { - myModificationAttemptListenerMulticaster.removeListener(listener); - } - - public void fireReadOnlyModificationAttempt(@NotNull VirtualFile... files) { - ApplicationManager.getApplication().assertIsDispatchThread(); - - final ModificationAttemptEvent event = new ModificationAttemptEvent(this, files); - myModificationAttemptListenerMulticaster.getMulticaster().readOnlyModificationAttempt(event); - } - public void addVirtualFileManagerListener(@NotNull VirtualFileManagerListener listener) { myVirtualFileManagerListeners.add(listener); } diff --git a/platform/testFramework/src/com/intellij/mock/MockVirtualFileManager.java b/platform/testFramework/src/com/intellij/mock/MockVirtualFileManager.java index e6e98affadfd..006d56698142 100644 --- a/platform/testFramework/src/com/intellij/mock/MockVirtualFileManager.java +++ b/platform/testFramework/src/com/intellij/mock/MockVirtualFileManager.java @@ -15,7 +15,6 @@ */ package com.intellij.mock; -import com.intellij.ide.caches.CacheUpdater; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.util.ModificationTracker; @@ -73,18 +72,6 @@ public class MockVirtualFileManager extends VirtualFileManagerEx { public void removeVirtualFileListener(@NotNull VirtualFileListener listener) { } - @Override - public void addModificationAttemptListener(@NotNull ModificationAttemptListener listener) { - } - - @Override - public void removeModificationAttemptListener(@NotNull ModificationAttemptListener listener) { - } - - @Override - public void fireReadOnlyModificationAttempt(@NotNull VirtualFile... files) { - } - @Override public void addVirtualFileManagerListener(@NotNull VirtualFileManagerListener listener) { } @@ -97,25 +84,6 @@ public class MockVirtualFileManager extends VirtualFileManagerEx { public void removeVirtualFileManagerListener(@NotNull VirtualFileManagerListener listener) { } - public void beforeRefreshStart(boolean asynchronous, ModalityState modalityState, Runnable postAction) { - } - - public void afterRefreshFinish(boolean asynchronous, ModalityState modalityState) { - } - - public void registerRefreshUpdater(CacheUpdater updater) { - } - - public void unregisterRefreshUpdater(CacheUpdater updater) { - } - - @Override - public void registerFileSystem(VirtualFileSystem fileSystem) { - } - - @Override - public void unregisterFileSystem(VirtualFileSystem fileSystem) { - } @Override public void fireAfterRefreshFinish(final boolean asynchronous) {