[maven-release] 03/04: Reorganize if/then/else -statements to reduce nesting

[rfscholte]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git

commit bb16d94e7ec12b0ee00e1c803789c8594523c195
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Tue Feb 20 20:51:13 2018 +0100

    Reorganize if/then/else -statements to reduce nesting
---
 .../shared/release/phase/MapVersionsPhase.java     | 51 +++++++++-------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index 1b585ab..8f4517d 100644
--- 
a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
+++ 
b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -117,21 +117,18 @@ public class MapVersionsPhase
 
             String nextVersion = resolveNextVersion( project, projectId, 
releaseDescriptor, result );
 
-            if ( convertToSnapshot )
+            if ( !convertToSnapshot )
             {
-                if ( releaseDescriptor.isBranchCreation() && convertToBranch )
-                {
-                    releaseDescriptor.addReleaseVersion( projectId, 
nextVersion );
-                }
-                else
-                {
-                    releaseDescriptor.addDevelopmentVersion( projectId, 
nextVersion );
-                }
+                releaseDescriptor.addReleaseVersion( projectId, nextVersion );
             }
-            else
+            else if ( releaseDescriptor.isBranchCreation() && convertToBranch )
             {
                 releaseDescriptor.addReleaseVersion( projectId, nextVersion );
             }
+            else
+            {
+                releaseDescriptor.addDevelopmentVersion( projectId, 
nextVersion );
+            }
 
             for ( MavenProject subProject : reactorProjects )
             {
@@ -173,21 +170,18 @@ public class MapVersionsPhase
 
                 String nextVersion = resolveNextVersion( project, projectId, 
releaseDescriptor, result );
 
-                if ( convertToSnapshot )
+                if ( !convertToSnapshot )
                 {
-                    if ( releaseDescriptor.isBranchCreation() && 
convertToBranch )
-                    {
-                        releaseDescriptor.addReleaseVersion( projectId, 
nextVersion );
-                    }
-                    else
-                    {
-                        releaseDescriptor.addDevelopmentVersion( projectId, 
nextVersion );
-                    }
+                    releaseDescriptor.addReleaseVersion( projectId, 
nextVersion );
                 }
-                else
+                else if ( releaseDescriptor.isBranchCreation() && 
convertToBranch )
                 {
                     releaseDescriptor.addReleaseVersion( projectId, 
nextVersion );
                 }
+                else
+                {
+                    releaseDescriptor.addDevelopmentVersion( projectId, 
nextVersion );
+                }
             }
         }
 
@@ -356,20 +350,17 @@ public class MapVersionsPhase
         {
             messageKey = "mapversion.branch.prompt";
         }
-        else if ( convertToSnapshot )
+        else if ( !convertToSnapshot )
         {
-            if ( releaseDescriptor.isBranchCreation() )
-            {
-                messageKey = "mapversion.workingcopy.prompt";
-            }
-            else
-            {
-                messageKey = "mapversion.development.prompt";
-            }
+            messageKey = "mapversion.release.prompt";
+        }
+        else if ( releaseDescriptor.isBranchCreation() )
+        {
+            messageKey = "mapversion.workingcopy.prompt";
         }
         else
         {
-            messageKey = "mapversion.release.prompt";
+            messageKey = "mapversion.development.prompt";
         }
         return messageKey;
     }

-- 
To stop receiving notification emails like this one, please contact
rfscho...@apache.org.