Bug 540373: Cleanup: Format & Remove trailing whitespace

This was done by selecting all projects in Eclipse then
Source -> Clean Up... -> choosing:
- Format source code
- Remove trailing white spaces on all lines
and completing the wizard

Change-Id: I63685372c6bcc67719bcf145123bcb72e5b00394

1 files changed, 118 insertions, 118 deletions

diff --git a/util/org.eclipse.cdt.util/src/org/eclipse/cdt/internal/core/parser/util/DOMSearchUtil.java b/util/org.eclipse.cdt.util/src/org/eclipse/cdt/internal/core/parser/util/DOMSearchUtil.java
index 9911a5a0f96..4a27abe4e55 100644
--- a/util/org.eclipse.cdt.util/src/org/eclipse/cdt/internal/core/parser/util/DOMSearchUtil.java
+++ b/util/org.eclipse.cdt.util/src/org/eclipse/cdt/internal/core/parser/util/DOMSearchUtil.java
@@ -7,7 +7,7 @@
  * https://www.eclipse.org/legal/epl-2.0/
  *
  * SPDX-License-Identifier: EPL-2.0
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Markus Schorn (Wind River Systems)
@@ -38,155 +38,155 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.content.IContentType;
 
 /**
- * Utility class to have commonly used algorithms in one place for searching with the DOM. 
- * 
+ * Utility class to have commonly used algorithms in one place for searching with the DOM.
+ *
  * @author dsteffle
  */
 public class DOMSearchUtil {
-    public static final int DECLARATIONS = 1;
-    public static final int DEFINITIONS = 2;
-    public static final int DECLARATIONS_DEFINITIONS = 3;
-    public static final int REFERENCES = 4;
-    public static final int ALL_OCCURRENCES = 5;
-    
-    /**
-    * Retrieves the ParserLanguage from an IFile.
-    */
-    public static ParserLanguage getLanguageFromFile(IFile file) {
-        IProject project = file.getProject();
-        IContentType contentType = CCorePlugin.getContentType(project, file.getFullPath().lastSegment());
-        if (contentType != null) {
-        	String lid = contentType.getId();
-        	if (CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(lid) || 
-        			CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(lid)) {
-        		return ParserLanguage.CPP;
-        	}
-        }        
-        return ParserLanguage.C;
-    }
-
-    /**
-     * The NameCollector used to get IASTNames from an IASTNode.
-     */
-    static public class NameCollector extends ASTVisitor {
-        {
-            shouldVisitNames = true;
-        }
-        public List<IASTName> nameList = new ArrayList<>();
-
-        @Override
+	public static final int DECLARATIONS = 1;
+	public static final int DEFINITIONS = 2;
+	public static final int DECLARATIONS_DEFINITIONS = 3;
+	public static final int REFERENCES = 4;
+	public static final int ALL_OCCURRENCES = 5;
+
+	/**
+	* Retrieves the ParserLanguage from an IFile.
+	*/
+	public static ParserLanguage getLanguageFromFile(IFile file) {
+		IProject project = file.getProject();
+		IContentType contentType = CCorePlugin.getContentType(project, file.getFullPath().lastSegment());
+		if (contentType != null) {
+			String lid = contentType.getId();
+			if (CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(lid) || CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(lid)) {
+				return ParserLanguage.CPP;
+			}
+		}
+		return ParserLanguage.C;
+	}
+
+	/**
+	 * The NameCollector used to get IASTNames from an IASTNode.
+	 */
+	static public class NameCollector extends ASTVisitor {
+		{
+			shouldVisitNames = true;
+		}
+		public List<IASTName> nameList = new ArrayList<>();
+
+		@Override
 		public int visit(IASTName name) {
-            nameList.add(name);
-            return PROCESS_CONTINUE;
-        }
+			nameList.add(name);
+			return PROCESS_CONTINUE;
+		}
 
-        public IASTName getName(int idx) {
-            if (idx < 0 || idx >= nameList.size())
-                return null;
-            return nameList.get(idx);
-        }
+		public IASTName getName(int idx) {
+			if (idx < 0 || idx >= nameList.size())
+				return null;
+			return nameList.get(idx);
+		}
 
-        public int size() {
-        	return nameList.size();
-        } 
-    }
+		public int size() {
+			return nameList.size();
+		}
+	}
 
 	/**
 	 * Returns the ParserLanguage corresponding to the IPath and IProject.
 	 * Returns ParserLanguage.CPP if the file type is a header.
 	 */
-    public static ParserLanguage getLanguage(IPath path, IProject project) {  
-    	//FIXME: ALAIN, for headers should we assume CPP ??
-    	// The problem is that it really depends on how the header was included.
-    	String id = null;
-    	IContentType contentType = CCorePlugin.getContentType(project, path.lastSegment());
-    	if (contentType != null) {
-    		id = contentType.getId();
-    	}
-    	if (id != null) {
-    		if (CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(id)) {
-    			return ParserLanguage.CPP;
-    		} else if (CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(id)) {
-    			return ParserLanguage.CPP;
-    		} else if (CCorePlugin.CONTENT_TYPE_CHEADER.equals(id)) {
-    			return ParserLanguage.C; 				
-    		} else if (CCorePlugin.CONTENT_TYPE_CSOURCE.equals(id)) {
-    			return ParserLanguage.C;
-    		} else if (CCorePlugin.CONTENT_TYPE_ASMSOURCE.equals(id)) {
-    			// ???
-    			// What do we do here ?
-    		}
-    	}
+	public static ParserLanguage getLanguage(IPath path, IProject project) {
+		//FIXME: ALAIN, for headers should we assume CPP ??
+		// The problem is that it really depends on how the header was included.
+		String id = null;
+		IContentType contentType = CCorePlugin.getContentType(project, path.lastSegment());
+		if (contentType != null) {
+			id = contentType.getId();
+		}
+		if (id != null) {
+			if (CCorePlugin.CONTENT_TYPE_CXXHEADER.equals(id)) {
+				return ParserLanguage.CPP;
+			} else if (CCorePlugin.CONTENT_TYPE_CXXSOURCE.equals(id)) {
+				return ParserLanguage.CPP;
+			} else if (CCorePlugin.CONTENT_TYPE_CHEADER.equals(id)) {
+				return ParserLanguage.C;
+			} else if (CCorePlugin.CONTENT_TYPE_CSOURCE.equals(id)) {
+				return ParserLanguage.C;
+			} else if (CCorePlugin.CONTENT_TYPE_ASMSOURCE.equals(id)) {
+				// ???
+				// What do we do here ?
+			}
+		}
 		return ParserLanguage.CPP;
-    }
-
-    /**
-     * This is used to get the names from the TU that the IASTName searchName belongs to.
-     * 
-     * @param searchName the IASTName whose references/declarations are to be retrieved
-     * @param limitTo used to specify whether to get declarations, references, or both, one of: 
-     * ( CSearchPattern.DECLARATION | CSearchPattern.REFERENCES | CSearchPattern.ALL_OCCURRENCES ) 
-     * @return IASTName[] declarations, references, or both depending on limitTo that correspond to the IASTName searchName searched for
-     */
-    public static IName[] getNamesFromDOM(IASTName searchName, int limitTo) {
+	}
+
+	/**
+	 * This is used to get the names from the TU that the IASTName searchName belongs to.
+	 *
+	 * @param searchName the IASTName whose references/declarations are to be retrieved
+	 * @param limitTo used to specify whether to get declarations, references, or both, one of:
+	 * ( CSearchPattern.DECLARATION | CSearchPattern.REFERENCES | CSearchPattern.ALL_OCCURRENCES )
+	 * @return IASTName[] declarations, references, or both depending on limitTo that correspond to the IASTName searchName searched for
+	 */
+	public static IName[] getNamesFromDOM(IASTName searchName, int limitTo) {
 		IName[] names = null;
 		IASTTranslationUnit tu = searchName.getTranslationUnit();
-		
+
 		if (tu == null) {
 			return IASTName.EMPTY_NAME_ARRAY;
 		}
-		
+
 		IBinding binding = searchName.resolveBinding();
 		if (binding instanceof IIndexBinding) {
 			fail("Not implemented");
-//			try { 
-//				ArrayList pdomNames = new ArrayList();
-//				IPDOMResolver pdom= ((PDOMBinding) binding).getPDOM();
-//				// First decls
-//				names= pdom.getDeclarations(binding);
-//				pdomNames.addAll(Arrays.asList(names));
-//				// Next defs
-//				names= pdom.getDefinitions(binding);
-//				pdomNames.addAll(Arrays.asList(names));
-//				names = (IName[])pdomNames.toArray(new IName[pdomNames.size()]);
-//			} catch (CoreException e) {
-//				CCorePlugin.log(e);
-//			}
+			//			try {
+			//				ArrayList pdomNames = new ArrayList();
+			//				IPDOMResolver pdom= ((PDOMBinding) binding).getPDOM();
+			//				// First decls
+			//				names= pdom.getDeclarations(binding);
+			//				pdomNames.addAll(Arrays.asList(names));
+			//				// Next defs
+			//				names= pdom.getDefinitions(binding);
+			//				pdomNames.addAll(Arrays.asList(names));
+			//				names = (IName[])pdomNames.toArray(new IName[pdomNames.size()]);
+			//			} catch (CoreException e) {
+			//				CCorePlugin.log(e);
+			//			}
 		} else {
 			names = getNames(tu, binding, limitTo);
-			
-			if (names == null || names.length == 0) { // try alternate strategies		
+
+			if (names == null || names.length == 0) { // try alternate strategies
 				try {
 					// fix for 86829, 95224
-					if ((binding instanceof ICPPConstructor || (binding instanceof ICPPMethod && ((ICPPMethod)binding).isDestructor())) 
+					if ((binding instanceof ICPPConstructor
+							|| (binding instanceof ICPPMethod && ((ICPPMethod) binding).isDestructor()))
 							&& binding.getScope() instanceof ICPPClassScope) {
-						binding =  ((ICPPClassScope)binding.getScope()).getClassType();
+						binding = ((ICPPClassScope) binding.getScope()).getClassType();
 						names = getNames(tu, binding, limitTo);
 					}
-				} catch (DOMException e) {}
+				} catch (DOMException e) {
+				}
 			}
 		}
 
 		return names;
-    }
-	
+	}
+
 	private static IASTName[] getNames(IASTTranslationUnit tu, IBinding binding, int limitTo) {
-        IASTName[] names = null;
-		if (limitTo == DECLARATIONS ||
-			limitTo == DECLARATIONS_DEFINITIONS) {
-            names = tu.getDeclarationsInAST(binding);
-        } else if (limitTo == REFERENCES) {
-            names = tu.getReferences(binding);
-        } else if (limitTo == DEFINITIONS) {
-            names = tu.getDefinitionsInAST(binding);
-        } else if (limitTo == ALL_OCCURRENCES){
-            names = tu.getDeclarationsInAST(binding);
-            names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
-        } else {  // assume ALL
-            names = tu.getDeclarationsInAST(binding);
-            names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
-        }
-		
+		IASTName[] names = null;
+		if (limitTo == DECLARATIONS || limitTo == DECLARATIONS_DEFINITIONS) {
+			names = tu.getDeclarationsInAST(binding);
+		} else if (limitTo == REFERENCES) {
+			names = tu.getReferences(binding);
+		} else if (limitTo == DEFINITIONS) {
+			names = tu.getDefinitionsInAST(binding);
+		} else if (limitTo == ALL_OCCURRENCES) {
+			names = tu.getDeclarationsInAST(binding);
+			names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
+		} else { // assume ALL
+			names = tu.getDeclarationsInAST(binding);
+			names = ArrayUtil.addAll(IASTName.class, names, tu.getReferences(binding));
+		}
+
 		return names;
 	}
 }