Remove redundant block

Change-Id: I01d785405a51605a19429bcd9560232530fc51c1
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

2 files changed, 24 insertions, 28 deletions

diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
index 7b8de9855a1..742d8699942 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/contentassist/ContextInformationPopup.java
@@ -482,21 +482,19 @@ class ContextInformationPopup implements IContentAssistListener {
 					break;
 				}
 			}
-			{
-				fContentAssistant.removeContentAssistListener(this, ContentAssistant.CONTEXT_INFO_POPUP);
+			fContentAssistant.removeContentAssistListener(this, ContentAssistant.CONTEXT_INFO_POPUP);
 
-				if (fContentAssistSubjectControlAdapter.getControl() != null)
-					fContentAssistSubjectControlAdapter.removeSelectionListener(fTextWidgetSelectionListener);
-				fTextWidgetSelectionListener= null;
+			if (fContentAssistSubjectControlAdapter.getControl() != null)
+				fContentAssistSubjectControlAdapter.removeSelectionListener(fTextWidgetSelectionListener);
+			fTextWidgetSelectionListener= null;
 
-				fContextInfoPopup.setVisible(false);
-				fContextInfoPopup.dispose();
-				fContextInfoPopup= null;
+			fContextInfoPopup.setVisible(false);
+			fContextInfoPopup.dispose();
+			fContextInfoPopup= null;
 
-				if (fTextPresentation != null) {
-					fTextPresentation.clear();
-					fTextPresentation= null;
-				}
+			if (fTextPresentation != null) {
+				fTextPresentation.clear();
+				fTextPresentation= null;
 			}
 		}
 
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
index 9a8c5b1e70a..405b49c2041 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/templates/TemplateProposal.java
@@ -159,24 +159,22 @@ public class TemplateProposal implements ICompletionProposal, ICompletionProposa
 			fContext.setReadOnly(false);
 			int start;
 			TemplateBuffer templateBuffer;
-			{
-				int oldReplaceOffset= getReplaceOffset();
-				try {
-					// this may already modify the document (e.g. add imports)
-					templateBuffer= fContext.evaluate(fTemplate);
-				} catch (TemplateException e1) {
-					fSelectedRegion= fRegion;
-					return;
-				}
+			int oldReplaceOffset= getReplaceOffset();
+			try {
+				// this may already modify the document (e.g. add imports)
+				templateBuffer= fContext.evaluate(fTemplate);
+			} catch (TemplateException e1) {
+				fSelectedRegion= fRegion;
+				return;
+			}
 
-				start= getReplaceOffset();
-				int shift= start - oldReplaceOffset;
-				int end= Math.max(getReplaceEndOffset(), offset + shift);
+			start= getReplaceOffset();
+			int shift= start - oldReplaceOffset;
+			int end= Math.max(getReplaceEndOffset(), offset + shift);
 
-				// insert template string
-				String templateString= templateBuffer.getString();
-				document.replace(start, end - start, templateString);
-			}
+			// insert template string
+			String templateString= templateBuffer.getString();
+			document.replace(start, end - start, templateString);
 
 			// translate positions
 			LinkedModeModel model= new LinkedModeModel();