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

diff viewer: allow passing custom DirDiffSettings

Browse Source 
This is needed for example to disable file choosers in a particular DiffRequestPanel.
This commit is contained in:
nik
2017-07-27 16:29:42 +03:00
parent 6c1ed6101f
commit 5a78ddad8d
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java
+3
View File
@@ -16,6 +16,7 @@
package com.intellij.ide.diff;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.PatternUtil;
import org.jetbrains.annotations.NotNull;
@@ -30,6 +31,8 @@ import java.util.regex.Pattern;
* @author Konstantin Bulenkov
*/
public class DirDiffSettings {
public static final Key<DirDiffSettings> KEY = Key.create("Diff.DirDiffSettings");
public boolean showSize = true;
public boolean showDate = true;
platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
+3 -1
View File
@@ -40,6 +40,7 @@ import com.intellij.openapi.diff.impl.dir.DirDiffWindow;
import com.intellij.openapi.project.DefaultProjectFactory;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.ObjectUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -69,7 +70,8 @@ class DirDiffViewer implements FrameDiffTool.DiffViewer {
Project project = context.getProject();
if (project == null) project = DefaultProjectFactory.getInstance().getDefaultProject();
DirDiffTableModel model = new DirDiffTableModel(project, element1, element2, new DirDiffSettings());
DirDiffSettings settings = ObjectUtils.notNull(context.getUserData(DirDiffSettings.KEY), new DirDiffSettings());
DirDiffTableModel model = new DirDiffTableModel(project, element1, element2, settings);
myDirDiffPanel = new DirDiffPanel(model, new DirDiffWindow((DirDiffFrame)null) {
@Override