diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibHyperlinkDetector.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibHyperlinkDetector.java
index 2e6b2af..bd39186 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibHyperlinkDetector.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/TaglibHyperlinkDetector.java
@@ -130,7 +130,7 @@
 					int regLength = valueRegion.getTextLength();
 					String attValue = att.getValueRegionText();
 					if (StringUtils.isQuoted(attValue)) {
-						regOffset = ++regOffset;
+						++regOffset;
 						regLength = regLength - 2;
 					}
 					hyperRegion = new Region(regOffset, regLength);
diff --git a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLHyperlinkDetector.java
index dc669ea..fb4765c 100644
--- a/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ b/bundles/org.eclipse.jst.jsp.ui/src/org/eclipse/jst/jsp/ui/internal/hyperlink/XMLHyperlinkDetector.java
@@ -304,7 +304,7 @@
 					int regLength = valueRegion.getTextLength();
 					String attValue = att.getValueRegionText();
 					if (StringUtils.isQuoted(attValue)) {
-						regOffset = ++regOffset;
+						++regOffset;
 						regLength = regLength - 2;
 					}
 					hyperRegion = new Region(regOffset, regLength);
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/XMLHyperlinkDetector.java
index 1264e31..54f9baa 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/hyperlink/XMLHyperlinkDetector.java
@@ -304,7 +304,7 @@
 					int regLength = valueRegion.getTextLength();
 					String attValue = att.getValueRegionText();
 					if (StringUtils.isQuoted(attValue)) {
-						regOffset = ++regOffset;
+						++regOffset;
 						regLength = regLength - 2;
 					}
 					hyperRegion = new Region(regOffset, regLength);
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java
index cafcd60..2e72f98 100644
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java
+++ b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java
@@ -149,7 +149,7 @@
 					break;
 				}
 				case Node.ENTITY_REFERENCE_NODE : {
-					image = image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ENTITY_REFERENCE);
+					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ENTITY_REFERENCE);
 					break;
 				}
 			}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java
index 7c10986..16118e6 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java
@@ -106,7 +106,7 @@
 		if (!hasEndTag && !isJSPTag) {
 
 			// create appropriate close tag text
-			String proposedText = proposedText = "</" + tagName; //$NON-NLS-1$
+			String proposedText = "</" + tagName; //$NON-NLS-1$
 			String viewerText = viewer.getTextWidget().getText();
 			if (viewerText.length() >= documentPosition && viewerText.length() >= 2 && documentPosition >= 2) {
 				String last2chars = viewerText.substring(documentPosition - 2, documentPosition);
@@ -125,7 +125,7 @@
 		else if (!hasEndTag && isJSPTag) {
 
 			// create appropriate close tag text
-			String proposedText = proposedText = "%"; //$NON-NLS-1$
+			String proposedText = "%"; //$NON-NLS-1$
 			String viewerText = viewer.getTextWidget().getText();
 
 			// TODO (pa) make it smarter to add "%>" or just ">" if % is
@@ -196,7 +196,7 @@
 		if (!hasEndTag) {
 
 			// create appropriate close tag text
-			String proposedText = proposedText = "</" + tagName; //$NON-NLS-1$
+			String proposedText = "</" + tagName; //$NON-NLS-1$
 			String viewerText = viewer.getTextWidget().getText();
 			if (viewerText.length() >= documentPosition && viewerText.length() >= 2 && documentPosition >= 2) {
 				String last2chars = viewerText.substring(documentPosition - 2, documentPosition);
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java
index d15439d..cb48441 100644
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java
@@ -304,7 +304,7 @@
 					int regLength = valueRegion.getTextLength();
 					String attValue = att.getValueRegionText();
 					if (StringUtils.isQuoted(attValue)) {
-						regOffset = ++regOffset;
+						++regOffset;
 						regLength = regLength - 2;
 					}
 					hyperRegion = new Region(regOffset, regLength);
