diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java index d4f14a3e0cda..b4d29cf25692 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcsHelper.java @@ -45,7 +45,7 @@ import java.util.List; */ public abstract class AbstractVcsHelper { - protected final Project myProject; + @NotNull protected final Project myProject; protected AbstractVcsHelper(@NotNull Project project) { myProject = project; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java index c4d8a2bb36dc..f554a8e01485 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java @@ -70,7 +70,7 @@ import java.util.List; public abstract class ChangesTreeList extends JPanel implements TypeSafeDataProvider { private final MyTree myTree; private final JScrollPane myTreeScrollPane; - protected final Project myProject; + @NotNull protected final Project myProject; private final boolean myShowCheckboxes; private final boolean myHighlightProblems; private boolean myShowFlatten; @@ -92,7 +92,7 @@ public abstract class ChangesTreeList extends JPanel implements TypeSafeDataP @NotNull private final CopyProvider myTreeCopyProvider; private TreeState myNonFlatTreeState; - public ChangesTreeList(@NotNull final Project project, + public ChangesTreeList(@NotNull Project project, @NotNull Collection initiallyIncluded, final boolean showCheckboxes, final boolean highlightProblems, diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java index 142adb4fae0f..10bd1128d72b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/SelectFilesDialog.java @@ -106,12 +106,11 @@ public class SelectFilesDialog extends AbstractSelectFilesDialog { } public static class VirtualFileList extends ChangesTreeList { - private final Project myProject; + @Nullable private final DeleteProvider myDeleteProvider; public VirtualFileList(Project project, List originalFiles, boolean selectableFiles, boolean deletableFiles) { super(project, originalFiles, selectableFiles, true, null, null); - myProject = project; myDeleteProvider = (deletableFiles ? new VirtualFileDeleteProvider() : null); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java index c3331f355758..c9869dc85865 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/TreeModelBuilder.java @@ -44,7 +44,7 @@ public class TreeModelBuilder { @NonNls public static final String ROOT_NODE_VALUE = "root"; public static final String LOCALLY_DELETED_NODE = VcsBundle.message("changes.nodetitle.locally.deleted.files"); - private final Project myProject; + @NotNull private final Project myProject; private final boolean showFlatten; @NotNull private DefaultTreeModel model; @NotNull private final ChangesBrowserNode root; @@ -52,7 +52,7 @@ public class TreeModelBuilder { @Nullable private ChangesGroupingPolicy myPolicy; @NotNull private HashMap myFoldersCache; - public TreeModelBuilder(final Project project, final boolean showFlatten) { + public TreeModelBuilder(@NotNull Project project, final boolean showFlatten) { myProject = project; this.showFlatten = showFlatten; root = ChangesBrowserNode.create(myProject, ROOT_NODE_VALUE);