From bf08bcf3b571f3d2bb8a98dfd3f43c243c491ed4 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 10 Jan 2012 18:56:44 +0400 Subject: [PATCH] cleanup --- .../ChangelistConflictHandleTypeFactory.java | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictHandleTypeFactory.java 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 index 10abaef4c378..000000000000 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictHandleTypeFactory.java +++ /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 virtualFiles) { - - } - }; - } - return null; - } -}