This commit is contained in:
Dmitry Avdeev
2012-01-11 10:57:03 +04:00
parent da6002b3b6
commit bf08bcf3b5
@@ -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;
}
}