Fix incomplete null analysis configuration

JGit annotations were configured in the projects properties, but the
dependency was unresolvable in the IDE. Hence null analysis was
effectively disabled.

Also fix potential null access that was revealed after the null analysis
configuration has been fixed.

Change-Id: I1f1e98ae14dbd1973e9fffe34475f072f460b728
Signed-off-by: Max Hohenegger <[email protected]>

Author: Max Hohenegger

org.eclipse.egit.gitflow.ui/META-INF/MANIFEST.MF

@@ -35,7 +35,6 @@ Import-Package: org.eclipse.egit.core;version="[4.6.0,4.7.0)",
 Require-Bundle: org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional,
  org.eclipse.team.ui;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
@@ -44,7 +43,8 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.core.databinding.beans;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.core.databinding;bundle-version="[1.4.0,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)"
+ org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.jgit;bundle-version="[4.6.0,4.7.0)";resolution:=optional
 Export-Package: org.eclipse.egit.gitflow.ui;version="4.6.0";x-friends:="org.eclipse.egit.ui.test",
  org.eclipse.egit.gitflow.ui.internal;version="4.6.0";x-friends:="org.eclipse.egit.ui.test",
  org.eclipse.egit.gitflow.ui.internal.actions;version="4.6.0";x-friends:="org.eclipse.egit.ui.test",

org.eclipse.egit.gitflow.ui/build.properties

@@ -5,5 +5,5 @@ bin.includes = META-INF/,\
                plugin.properties,\
                about.html,\
                icons/
-additional.bundles = org.eclipse.jdt.annotation
+additional.bundles = org.eclipse.jgit
 src.includes = about.html

org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/DevelopCheckoutHandler.java

@@ -8,10 +8,13 @@
  *******************************************************************************/
 package org.eclipse.egit.gitflow.ui.internal.actions;
 
+import static org.eclipse.egit.gitflow.ui.Activator.error;
+
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.egit.gitflow.GitFlowRepository;
+import org.eclipse.egit.gitflow.ui.internal.UIText;
 import org.eclipse.egit.ui.internal.branch.BranchOperationUI;
 
 /**
@@ -22,6 +25,9 @@ public class DevelopCheckoutHandler extends AbstractHandler {
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		final GitFlowRepository gfRepo = GitFlowHandlerUtil.getRepository(event);
+		if (gfRepo == null) {
+			return error(UIText.Handlers_noGitflowRepositoryFound);
+		}
 
 		BranchOperationUI.checkout(gfRepo.getRepository(),
 				gfRepo.getConfig().getDevelopFull()).start();

org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/DevelopCompareHandler.java

@@ -8,6 +8,7 @@
  *******************************************************************************/
 package org.eclipse.egit.gitflow.ui.internal.actions;
 
+import static org.eclipse.egit.gitflow.ui.Activator.error;
 import static org.eclipse.egit.ui.Activator.handleError;
 import static org.eclipse.egit.ui.internal.UIText.CompareWithRefAction_errorOnSynchronize;
 import static org.eclipse.jgit.lib.Constants.HEAD;
@@ -21,6 +22,7 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.egit.gitflow.GitFlowRepository;
+import org.eclipse.egit.gitflow.ui.internal.UIText;
 import org.eclipse.egit.ui.internal.CompareUtils;
 import org.eclipse.ui.IWorkbenchPage;
 
@@ -32,6 +34,9 @@ public class DevelopCompareHandler extends AbstractHandler {
 	@Override
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		final GitFlowRepository gfRepo = GitFlowHandlerUtil.getRepository(event);
+		if (gfRepo == null) {
+			return error(UIText.Handlers_noGitflowRepositoryFound);
+		}
 
 		IResource[] selectedResources = GitFlowHandlerUtil.gatherResourceToOperateOn(event);
 		String revision;

org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/actions/GitFlowHandlerUtil.java

@@ -15,10 +15,10 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.egit.gitflow.GitFlowRepository;
 import org.eclipse.egit.ui.internal.selection.SelectionUtils;
-import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.ui.handlers.HandlerUtil;
@@ -68,6 +68,11 @@ static IStructuredSelection getSelection(ExecutionEvent event) {
 	static String gatherRevision(ExecutionEvent event) throws IOException {
 		final GitFlowRepository gfRepo = GitFlowHandlerUtil
 				.getRepository(event);
+		if (gfRepo == null) {
+			throw new IllegalStateException(
+					"Gitflow command called with no Gitflow repository present"); //$NON-NLS-1$
+		}
+
 		Ref develop = gfRepo.getRepository()
 				.exactRef(gfRepo.getConfig().getDevelopFull());
 		if (develop == null) {

org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/decorators/GitFlowLightweightDecorator.java

@@ -15,11 +15,11 @@
 import org.eclipse.egit.gitflow.ui.Activator;
 import org.eclipse.egit.gitflow.ui.internal.UIIcons;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryNode;
-import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.ui.PlatformUI;

org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/dialogs/InitDialog.java

@@ -55,13 +55,13 @@
 import org.eclipse.egit.gitflow.GitFlowRepository;
 import org.eclipse.egit.gitflow.InitParameters;
 import org.eclipse.egit.gitflow.WrongGitFlowStateException;
-import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jface.databinding.dialog.TitleAreaDialogSupport;
 import org.eclipse.jface.databinding.dialog.ValidationMessageProvider;
 import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
 import org.eclipse.jface.dialogs.TitleAreaDialog;
 import org.eclipse.jface.layout.GridDataFactory;
 import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jgit.annotations.NonNull;
 import org.eclipse.jgit.lib.Ref;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.revwalk.RevCommit;

org.eclipse.egit.gitflow/META-INF/MANIFEST.MF

@@ -10,7 +10,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional
+ org.eclipse.jgit;bundle-version="[4.6.0,4.7.0)";resolution:=optional
 Export-Package: org.eclipse.egit.gitflow;version="4.6.0";
   uses:="org.osgi.framework,
    org.eclipse.jgit.transport,

org.eclipse.egit.gitflow/build.properties

@@ -4,5 +4,5 @@ bin.includes = META-INF/,\
                build.properties,\
                about.html,\
                plugin.properties
-additional.bundles = org.eclipse.jdt.annotation
+additional.bundles = org.eclipse.jgit
 src.includes = about.html

org.eclipse.egit.gitflow/src/org/eclipse/egit/gitflow/GitFlowRepository.java

@@ -17,8 +17,8 @@
 import java.util.List;
 
 import org.eclipse.egit.gitflow.internal.CoreText;
-import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jgit.annotations.NonNull;
+import org.eclipse.jgit.annotations.Nullable;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;