cleanup
authorDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Tue, 10 Jan 2012 14:56:44 +0000 (18:56 +0400)
committerDmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Wed, 11 Jan 2012 06:57:03 +0000 (10:57 +0400)
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictHandleTypeFactory.java [deleted file]

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictHandleTypeFactory.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictHandleTypeFactory.java
deleted file mode 100644 (file)
index 10abaef..0000000
+++ /dev/null
@@ -1,47 +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.vcs.changes.conflicts;
-
-import com.intellij.openapi.vcs.readOnlyHandler.HandleTypeFactory;
-import com.intellij.openapi.vcs.readOnlyHandler.HandleType;
-import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
-import com.intellij.openapi.vfs.VirtualFile;
-
-import java.util.Collection;
-
-/**
- * @author Dmitry Avdeev
- */
-public class ChangelistConflictHandleTypeFactory implements HandleTypeFactory {
-
-  private final ChangelistConflictTracker myConflictTracker;
-
-  public ChangelistConflictHandleTypeFactory(ChangeListManagerImpl manager) {
-    myConflictTracker = manager.getConflictTracker();
-  }
-
-  public HandleType createHandleType(VirtualFile file) {
-    if (myConflictTracker.hasConflict(file)) {
-      return new HandleType("using conflict tracker", false) {
-        @Override
-        public void processFiles(Collection<VirtualFile> virtualFiles) {
-
-        }
-      };
-    }
-    return null;
-  }
-}