From 05957c80023cfc64598844382820e6b663d926fd Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Mon, 15 Mar 2010 13:41:02 +0000
Subject: [PATCH] Bug 305118: Add include for relative inclusion from different
 folder.

---
 .../editor/AddIncludeOnSelectionAction.java   | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
index 43b775f8b6e..af45480fba1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/AddIncludeOnSelectionAction.java
@@ -548,26 +548,25 @@ public class AddIncludeOnSelectionAction extends TextEditorAction {
 					}
 				}
 			}
-			if (k == 0) {
-				return null;
-			}
-			Arrays.sort(ballotBox, 0, k);
-			String contender = ballotBox[0];
-			int votes = 1;
-			String winner = contender;
-			int winnerVotes = votes;
-			for (int i = 1; i < k; i++) {
-				if (!ballotBox[i].equals(contender)) {
-					contender = ballotBox[i]; 
-					votes = 1;
-				}
-				votes++;
-				if (votes > winnerVotes) {
-					winner = contender;
-					winnerVotes = votes;
+			if (k != 0) {
+				Arrays.sort(ballotBox, 0, k);
+				String contender = ballotBox[0];
+				int votes = 1;
+				String winner = contender;
+				int winnerVotes = votes;
+				for (int i = 1; i < k; i++) {
+					if (!ballotBox[i].equals(contender)) {
+						contender = ballotBox[i]; 
+						votes = 1;
+					}
+					votes++;
+					if (votes > winnerVotes) {
+						winner = contender;
+						winnerVotes = votes;
+					}
 				}
+				return new RequiredInclude(winner, systemIncludeVotes * 2 >= k);
 			}
-			return new RequiredInclude(winner, systemIncludeVotes * 2 >= k);
 		}
 
 		// The file has never been included before.