From e304fa5c18eaaf2acd2ea80a7d305c11fd24ac05 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 31 Aug 2017 14:27:39 +0200
Subject: [PATCH] add NotNull

---
 .../impl/run/BuildArtifactsBeforeRunTaskBase.java      |  6 +++---
 .../service/execution/ExternalSystemBeforeRunTask.java |  6 +++---
 .../src/com/intellij/execution/BeforeRunTask.java      | 10 ++++------
 .../impl/RunConfigurationBeforeRunProvider.java        |  4 ++--
 .../execution/impl/UnknownBeforeRunTaskProvider.java   |  4 ++--
 .../com/intellij/tools/AbstractToolBeforeRunTask.java  |  6 +++---
 .../lang/ant/config/impl/AntBeforeRunTask.java         |  7 ++++---
 .../jetbrains/idea/maven/tasks/MavenBeforeRunTask.java |  7 ++++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java
index ad73ef77b92d..8d86241f2ec3 100644
--- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java
+++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2016 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public abstract class BuildArtifactsBeforeRunTaskBase<Self extends BuildArtifact
   }
 
   @Override
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     final List<Element> children = element.getChildren(myElementName);
     final ArtifactPointerManager pointerManager = ArtifactPointerManager.getInstance(myProject);
@@ -62,7 +62,7 @@ public abstract class BuildArtifactsBeforeRunTaskBase<Self extends BuildArtifact
   }
 
   @Override
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     super.writeExternal(element);
     for (ArtifactPointer pointer : myArtifactPointers) {
       element.addContent(new Element(myElementName).setAttribute(NAME_ATTRIBUTE, pointer.getArtifactName()));
diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java
index 2cf934cc24ad..69d757084e5f 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/execution/ExternalSystemBeforeRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class ExternalSystemBeforeRunTask extends BeforeRunTask<ExternalSystemBef
   }
 
   @Override
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     super.writeExternal(element);
 
     element.setAttribute("tasks", StringUtil.join(myTaskExecutionSettings.getTaskNames(), " "));
@@ -58,7 +58,7 @@ public class ExternalSystemBeforeRunTask extends BeforeRunTask<ExternalSystemBef
   }
 
   @Override
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     myTaskExecutionSettings.setTaskNames(StringUtil.split(StringUtil.notNullize(element.getAttributeValue("tasks")), " "));
     myTaskExecutionSettings.setExternalProjectPath(element.getAttributeValue("externalProjectPath"));
diff --git a/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java b/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java
index 08d3e4408c07..fcff2ca565df 100644
--- a/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java
+++ b/platform/lang-api/src/com/intellij/execution/BeforeRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,18 +46,16 @@ public abstract class BeforeRunTask<T extends BeforeRunTask> implements Cloneabl
     myIsEnabled = isEnabled;
   }
 
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     element.setAttribute("enabled", String.valueOf(myIsEnabled));
   }
 
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     String attribValue = element.getAttributeValue("enabled");
     if (attribValue == null) {
       attribValue = element.getAttributeValue("value"); // maintain compatibility with old format
     }
-    if (attribValue == null)
-      attribValue = "true";
-    myIsEnabled = Boolean.valueOf(attribValue).booleanValue();
+    myIsEnabled = attribValue == null || Boolean.parseBoolean(attribValue);
   }
 
   //Task may aggregate several items or targets to do (e.g. BuildArtifactsBeforeRunTask)
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
index 4b4e1b13848d..35e93ca20651 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
@@ -291,7 +291,7 @@ extends BeforeRunTaskProvider<RunConfigurationBeforeRunProvider.RunConfigurableB
     }
 
     @Override
-    public void writeExternal(Element element) {
+    public void writeExternal(@NotNull Element element) {
       super.writeExternal(element);
       if (myConfigurationName != null && myConfigurationType != null) {
         element.setAttribute("run_configuration_name", myConfigurationName);
@@ -304,7 +304,7 @@ extends BeforeRunTaskProvider<RunConfigurationBeforeRunProvider.RunConfigurableB
     }
 
     @Override
-    public void readExternal(Element element) {
+    public void readExternal(@NotNull Element element) {
       super.readExternal(element);
 
       myConfigurationName = element.getAttributeValue("run_configuration_name");
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java b/platform/lang-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java
index 316b594f701f..0d0328e44a7a 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/UnknownBeforeRunTaskProvider.java
@@ -84,12 +84,12 @@ public class UnknownBeforeRunTaskProvider extends BeforeRunTaskProvider<UnknownB
     }
 
     @Override
-    public void readExternal(Element element) {
+    public void readExternal(@NotNull Element element) {
       myConfig = element;
     }
 
     @Override
-    public void writeExternal(Element element) {
+    public void writeExternal(@NotNull Element element) {
       if (myConfig != null) {
         element.removeContent();
         final List attributes = myConfig.getAttributes();
diff --git a/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTask.java b/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTask.java
index a5cc185fa125..7953ed78ed0f 100644
--- a/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTask.java
+++ b/platform/lang-impl/src/com/intellij/tools/AbstractToolBeforeRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ public abstract class AbstractToolBeforeRunTask<ToolBeforeRunTask extends Abstra
   }
 
   @Override
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     super.writeExternal(element);
     if (myToolActionId != null) {
       element.setAttribute(ACTION_ID_ATTRIBUTE, myToolActionId);
@@ -59,7 +59,7 @@ public abstract class AbstractToolBeforeRunTask<ToolBeforeRunTask extends Abstra
   }
 
   @Override
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     myToolActionId = element.getAttributeValue(ACTION_ID_ATTRIBUTE);
   }
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java
index 9612ca7417f2..21e09f677b17 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Eugene Zhuravlev
@@ -50,7 +51,7 @@ public class AntBeforeRunTask extends BeforeRunTask<AntBeforeRunTask>{
     myTargetName = targetName;
   }
 
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     super.writeExternal(element);
     if (myAntFileUrl != null && myTargetName != null) {
       element.setAttribute("antfile", myAntFileUrl);
@@ -58,7 +59,7 @@ public class AntBeforeRunTask extends BeforeRunTask<AntBeforeRunTask>{
     }
   }
 
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     final String url = element.getAttributeValue("antfile");
     final String targetName = element.getAttributeValue("target");
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTask.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTask.java
index 8a77eb8ac382..0fe12ae70385 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTask.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/MavenBeforeRunTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.jetbrains.idea.maven.tasks;
 import com.intellij.execution.BeforeRunTask;
 import com.intellij.openapi.util.io.FileUtil;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.project.MavenProject;
 
 public class MavenBeforeRunTask extends BeforeRunTask<MavenBeforeRunTask> {
@@ -50,14 +51,14 @@ public class MavenBeforeRunTask extends BeforeRunTask<MavenBeforeRunTask> {
   }
 
   @Override
-  public void writeExternal(Element element) {
+  public void writeExternal(@NotNull Element element) {
     super.writeExternal(element);
     if (myProjectPath != null) element.setAttribute("file", myProjectPath);
     if (myGoal != null) element.setAttribute("goal", myGoal);
   }
 
   @Override
-  public void readExternal(Element element) {
+  public void readExternal(@NotNull Element element) {
     super.readExternal(element);
     myProjectPath = element.getAttributeValue("file");
     myGoal = element.getAttributeValue("goal");