From 69364092418c96c61480bcca44c4a8e5a8001597 Mon Sep 17 00:00:00 2001
From: Markus Schorn <markus.schorn@windriver.com>
Date: Wed, 21 Oct 2009 14:29:08 +0000
Subject: [PATCH] Fixed a few compiler warnings.

---
 .../astwriter/MacroExpansionHandler.java      |  2 +-
 .../TrailNodeEqualityChecker.java             | 23 ++++---------------
 .../src/org/eclipse/cdt/ui/CUIPlugin.java     |  2 +-
 .../dialogs/RegexErrorParserOptionPage.java   |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/MacroExpansionHandler.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/MacroExpansionHandler.java
index 89f4bb068d7..045110df5ed 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/MacroExpansionHandler.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/rewrite/astwriter/MacroExpansionHandler.java
@@ -118,7 +118,7 @@ public class MacroExpansionHandler {
 						int eOff = mName.getFileLocation().getNodeOffset();
 						int eLength = mName.getFileLocation().getNodeLength();
 						if(eOff < nOff && Math.abs((eOff+eLength-nOff)) < 3) {
-							scribe.print(mName.toString() + " ");
+							scribe.print(mName.toString() + " "); //$NON-NLS-1$
 						}
 					}
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
index d1fb24434ae..168af77a52a 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/extractfunction/TrailNodeEqualityChecker.java
@@ -445,6 +445,9 @@ public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> {
 		}else {
 			IType oType = getType(trailName.getRealName().resolveBinding());
 			IType nType = getType(name.resolveBinding());
+			if (oType == null || nType == null)
+				return false;
+			
 			if(oType.isSameType(nType)) {
 				return true;
 			}
@@ -459,25 +462,7 @@ public class TrailNodeEqualityChecker implements EqualityChecker<IASTNode> {
 				return var.getType();
 			}
 		} catch (DOMException e) {
-			return new NullType();
 		}
-		return new NullType();
-	}
-	
-	private class NullType implements IType{
-		
-		@Override
-		public Object clone() {
-			try {
-				return super.clone();
-			} catch (CloneNotSupportedException e) {
-				return null;
-			}
-		}
-
-		public boolean isSameType(IType type) {
-			return false;
-		}
-		
+		return null;
 	}
 }
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
index d5a6271db9e..b2dcca36fc1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/CUIPlugin.java
@@ -915,7 +915,7 @@ public class CUIPlugin extends AbstractUIPlugin {
 	 */
 	public ContextTypeRegistry getCodeTemplateContextRegistry() {
 		if (fCodeTemplateContextTypeRegistry == null) {
-			fCodeTemplateContextTypeRegistry= new ContributionContextTypeRegistry("org.eclipse.cdt.ui.codeTemplates");
+			fCodeTemplateContextTypeRegistry= new ContributionContextTypeRegistry("org.eclipse.cdt.ui.codeTemplates"); //$NON-NLS-1$
 			
 			CodeTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);
 			FileTemplateContextType.registerContextTypes(fCodeTemplateContextTypeRegistry);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
index adb46b9b5b3..491babe5d6b 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/dialogs/RegexErrorParserOptionPage.java
@@ -227,7 +227,7 @@ public final class RegexErrorParserOptionPage extends AbstractCOptionPage {
 			// TODO: remove the warning before 6.1
 			MessageLine errorImageLabel = new MessageLine(composite, SWT.NONE);
 			errorImageLabel.setImage(JFaceResources.getImage(Dialog.DLG_IMG_MESSAGE_WARNING));
-			errorImageLabel.setText("Error Parser Options user entries may be lost on CDT update as persistence will be finalized with CDT 6.1 final release.");
+			errorImageLabel.setText("Error Parser Options user entries may be lost on CDT update as persistence will be finalized with CDT 6.1 final release."); //$NON-NLS-1$
 		}
 
 		setControl(group);