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

EA-66474: diff: Project should be NotNull

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-03-20 19:38:54 +03:00
parent 524d0278fb
commit e9e28e9787
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
+7 -1
View File
@@ -38,6 +38,8 @@ import com.intellij.openapi.diff.impl.dir.DirDiffFrame;
import com.intellij.openapi.diff.impl.dir.DirDiffPanel;
import com.intellij.openapi.diff.impl.dir.DirDiffTableModel;
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 org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -63,7 +65,11 @@ class DirDiffViewer implements FrameDiffTool.DiffViewer {
List<DiffContent> contents = request.getContents();
DiffElement element1 = createDiffElement(contents.get(0));
DiffElement element2 = createDiffElement(contents.get(1));
DirDiffTableModel model = new DirDiffTableModel(context.getProject(), element1, element2, new DirDiffSettings());
Project project = context.getProject();
if (project == null) project = DefaultProjectFactory.getInstance().getDefaultProject();
DirDiffTableModel model = new DirDiffTableModel(project, element1, element2, new DirDiffSettings());
myDirDiffPanel = new DirDiffPanel(model, new DirDiffWindow((DirDiffFrame)null) {
@Override
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
public static final String EMPTY_STRING = " ";
private DirDiffPanel myPanel;
public DirDiffTableModel(Project project, DiffElement src, DiffElement trg, DirDiffSettings settings) {
public DirDiffTableModel(@NotNull Project project, DiffElement src, DiffElement trg, DirDiffSettings settings) {
myProject = project;
mySettings = settings;
mySrc = src;