MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs-log] migrate from deprecated TypeSafeDataProvider to DataProvider

Browse Source
This commit is contained in:
Julia Beliaeva
2016-01-21 18:38:45 +03:00
parent 808118832f
commit 53b615a375
2 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/MainFrame.java
+26 -24
View File
@@ -36,7 +36,7 @@ import com.intellij.vcs.log.ui.VcsLogActionPlaces;
import com.intellij.vcs.log.ui.VcsLogUiImpl;
import com.intellij.vcs.log.ui.actions.IntelliSortChooserPopupAction;
import com.intellij.vcs.log.ui.filter.VcsLogClassicFilterUi;
import com.intellij.vcs.log.ui.tables.GraphTableModel;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -50,7 +50,7 @@ import java.util.List;
import static com.intellij.util.ObjectUtils.assertNotNull;
import static com.intellij.util.containers.ContainerUtil.getFirstItem;
public class MainFrame extends JPanel implements TypeSafeDataProvider {
public class MainFrame extends JPanel implements DataProvider {
@NotNull private final VcsLogDataHolder myLogDataHolder;
@NotNull private final VcsLogUiImpl myUI;
@@ -231,24 +231,25 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider {
}
}
@Nullable
@Override
public void calcData(DataKey key, DataSink sink) {
if (VcsLogDataKeys.VCS_LOG == key) {
sink.put(key, myLog);
public Object getData(@NonNls String dataId) {
if (VcsLogDataKeys.VCS_LOG.is(dataId)) {
return myLog;
}
else if (VcsLogDataKeys.VCS_LOG_UI == key) {
sink.put(key, myUI);
else if (VcsLogDataKeys.VCS_LOG_UI.is(dataId)) {
return myUI;
}
else if (VcsLogDataKeys.VCS_LOG_DATA_PROVIDER == key) {
sink.put(key, myLogDataHolder);
else if (VcsLogDataKeys.VCS_LOG_DATA_PROVIDER.is(dataId)) {
return myLogDataHolder;
}
else if (VcsDataKeys.CHANGES == key || VcsDataKeys.SELECTED_CHANGES == key) {
sink.put(key, ArrayUtil.toObjectArray(myChangesBrowser.getCurrentDisplayedChanges(), Change.class));
else if (VcsDataKeys.CHANGES.is(dataId) || VcsDataKeys.SELECTED_CHANGES.is(dataId)) {
return ArrayUtil.toObjectArray(myChangesBrowser.getCurrentDisplayedChanges(), Change.class);
}
else if (VcsDataKeys.CHANGE_LISTS == key) {
else if (VcsDataKeys.CHANGE_LISTS.is(dataId)) {
List<VcsFullCommitDetails> details = myUI.getVcsLog().getSelectedDetails();
if (details.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return;
sink.put(key, ContainerUtil
if (details.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return null;
return ContainerUtil
.map2Array(details, CommittedChangeListForRevision.class, new Function<VcsFullCommitDetails, CommittedChangeListForRevision>() {
@Override
public CommittedChangeListForRevision fun(@NotNull VcsFullCommitDetails details) {
@@ -256,28 +257,28 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider {
new Date(details.getCommitTime()), details.getChanges(),
convertToRevisionNumber(details.getId()));
}
}));
});
}
else if (VcsDataKeys.VCS_REVISION_NUMBERS == key) {
else if (VcsDataKeys.VCS_REVISION_NUMBERS.is(dataId)) {
List<CommitId> hashes = myUI.getVcsLog().getSelectedCommits();
if (hashes.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return;
sink.put(key, ArrayUtil.toObjectArray(ContainerUtil.map(hashes, new Function<CommitId, VcsRevisionNumber>() {
if (hashes.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return null;
return ArrayUtil.toObjectArray(ContainerUtil.map(hashes, new Function<CommitId, VcsRevisionNumber>() {
@Override
public VcsRevisionNumber fun(CommitId commitId) {
return convertToRevisionNumber(commitId.getHash());
}
}), VcsRevisionNumber.class));
}), VcsRevisionNumber.class);
}
else if (VcsDataKeys.VCS == key) {
else if (VcsDataKeys.VCS.is(dataId)) {
List<CommitId> commits = myUI.getVcsLog().getSelectedCommits();
Collection<VcsLogProvider> logProviders = myUI.getVcsLog().getLogProviders();
if (logProviders.size() == 1) {
if (!commits.isEmpty()) {
sink.put(key, myLogDataHolder.getLogProvider(assertNotNull(getFirstItem(commits)).getRoot()).getSupportedVcs());
return myLogDataHolder.getLogProvider(assertNotNull(getFirstItem(commits)).getRoot()).getSupportedVcs();
}
return;
return null;
}
if (commits.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return;
if (commits.size() > VcsLogUtil.MAX_SELECTED_COMMITS) return null;
Set<VirtualFile> roots = ContainerUtil.map2Set(commits, new Function<CommitId, VirtualFile>() {
@Override
@@ -286,9 +287,10 @@ public class MainFrame extends JPanel implements TypeSafeDataProvider {
}
});
if (roots.size() == 1) {
sink.put(key, myLogDataHolder.getLogProvider(assertNotNull(getFirstItem(roots))).getSupportedVcs());
return myLogDataHolder.getLogProvider(assertNotNull(getFirstItem(roots))).getSupportedVcs();
}
}
return null;
}
@NotNull
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
+14 -8
View File
@@ -23,8 +23,6 @@ import com.intellij.openapi.ide.CopyPasteManager;
import com.intellij.openapi.util.Couple;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.committed.CommittedChangesTreeBrowser;
import com.intellij.openapi.vcs.changes.issueLinks.TableLinkMouseListener;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.ui.*;
@@ -56,21 +54,27 @@ import com.intellij.vcs.log.ui.render.GraphCommitCellRender;
import com.intellij.vcs.log.ui.tables.GraphTableModel;
import gnu.trove.TIntHashSet;
import gnu.trove.TIntProcedure;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import sun.swing.table.DefaultTableCellHeaderRenderer;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.event.CellEditorListener;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.TableModelEvent;
import javax.swing.table.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.*;
import java.util.Collection;
import java.util.Date;
import java.util.EventObject;
import java.util.List;
public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, CopyProvider {
public class VcsLogGraphTable extends JBTable implements DataProvider, CopyProvider {
private static final Logger LOG = Logger.getInstance(VcsLogGraphTable.class);
public static final int ROOT_INDICATOR_COLORED_WIDTH = 8;
@@ -241,11 +245,13 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
}
}
@Nullable
@Override
public void calcData(DataKey key, DataSink sink) {
if (PlatformDataKeys.COPY_PROVIDER == key) {
sink.put(key, this);
public Object getData(@NonNls String dataId) {
if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
return this;
}
return null;
}
@Override