From 58b6dbee77197634a8c263fcc36875cbc3275103 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Sat, 27 Aug 2016 15:13:21 +0300 Subject: [PATCH] vcs: Removed unused "VcsChangeDetailsProvider", implementations and extension point --- .../src/META-INF/VcsExtensionPoints.xml | 1 - .../vcs/changes/VcsChangeDetailsProvider.java | 41 ---------- plugins/svn4idea/src/META-INF/plugin.xml | 2 - .../svn/SvnPhantomChangeDetailsProvider.java | 80 ------------------- .../TreeConflictDetailsProvider.java | 55 ------------- 5 files changed, 179 deletions(-) delete mode 100644 platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsChangeDetailsProvider.java delete mode 100644 plugins/svn4idea/src/org/jetbrains/idea/svn/SvnPhantomChangeDetailsProvider.java delete mode 100644 plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictDetailsProvider.java diff --git a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml index 2696b500ed66..410d0391aba0 100644 --- a/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml +++ b/platform/platform-resources/src/META-INF/VcsExtensionPoints.xml @@ -60,7 +60,6 @@ - diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsChangeDetailsProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsChangeDetailsProvider.java deleted file mode 100644 index cc619bed7a74..000000000000 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/VcsChangeDetailsProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2011 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; - -import com.intellij.openapi.Disposable; -import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.openapi.progress.BackgroundTaskQueue; -import com.intellij.openapi.util.Pair; -import org.jetbrains.annotations.CalledInAwt; -import org.jetbrains.annotations.CalledInBackground; - -import javax.swing.*; - -/** - * @author irengrig - * Date: 7/5/11 - * Time: 2:49 PM - */ -public interface VcsChangeDetailsProvider { - ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.vcschangedetails"); - - String getName(); - - @CalledInAwt - boolean canComment(final Change change); - @CalledInAwt - RefreshablePanel comment(final Change change, JComponent parent, BackgroundTaskQueue queue); -} diff --git a/plugins/svn4idea/src/META-INF/plugin.xml b/plugins/svn4idea/src/META-INF/plugin.xml index 03e501a7199c..ec8278d42098 100644 --- a/plugins/svn4idea/src/META-INF/plugin.xml +++ b/plugins/svn4idea/src/META-INF/plugin.xml @@ -118,8 +118,6 @@ - - diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnPhantomChangeDetailsProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnPhantomChangeDetailsProvider.java deleted file mode 100644 index 124d4f0692ff..000000000000 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnPhantomChangeDetailsProvider.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2000-2012 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 org.jetbrains.idea.svn; - -import com.intellij.openapi.progress.BackgroundTaskQueue; -import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.ChangesUtil; -import com.intellij.openapi.vcs.changes.RefreshablePanel; -import com.intellij.openapi.vcs.changes.VcsChangeDetailsProvider; -import com.intellij.vcsUtil.UIVcsUtil; -import com.intellij.vcsUtil.VcsUtil; - -import javax.swing.*; - -/** - * Created with IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 5/17/12 - * Time: 12:19 PM - */ -public class SvnPhantomChangeDetailsProvider implements VcsChangeDetailsProvider { - @Override - public String getName() { - return "Phantom Change"; - } - - @Override - public boolean canComment(Change change) { - return change.isPhantom(); - } - - @Override - public RefreshablePanel comment(Change change, JComponent parent, BackgroundTaskQueue queue) { - return new RefreshablePanel() { - @Override - public boolean refreshDataSynch() { - return true; - } - - @Override - public void dataChanged() { - } - - @Override - public void refresh() { - } - - @Override - public JPanel getPanel() { - return UIVcsUtil.infoPanel("Technical record", "This change is recorded because its target file was deleted,\nand some parent directory was copied (or moved) into the new place."); - } - - @Override - public void away() { - } - - @Override - public boolean isStillValid(Object o) { - return ((Change) o).isPhantom(); - } - - @Override - public void dispose() { - } - }; - } -} diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictDetailsProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictDetailsProvider.java deleted file mode 100644 index 24167e5f1bb8..000000000000 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictDetailsProvider.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2000-2012 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 org.jetbrains.idea.svn.treeConflict; - -import com.intellij.openapi.progress.BackgroundTaskQueue; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.vcs.changes.Change; -import com.intellij.openapi.vcs.changes.RefreshablePanel; -import com.intellij.openapi.vcs.changes.VcsChangeDetailsProvider; -import org.jetbrains.idea.svn.ConflictedSvnChange; - -import javax.swing.*; - -/** - * Created with IntelliJ IDEA. - * User: Irina.Chernushina - * Date: 4/25/12 - * Time: 5:04 PM - */ -public class TreeConflictDetailsProvider implements VcsChangeDetailsProvider { - private final Project myProject; - - public TreeConflictDetailsProvider(Project project) { - myProject = project; - } - - @Override - public String getName() { - return "Subversion Tree Conflict"; - } - - @Override - public boolean canComment(Change change) { - if (change instanceof ConflictedSvnChange && ((ConflictedSvnChange)change).getConflictState().isTree()) return true; - return false; - } - - @Override - public RefreshablePanel comment(Change change, JComponent parent, BackgroundTaskQueue queue) { - return new TreeConflictRefreshablePanel(myProject, "Loading tree conflict details", queue, change); - } -}