From 67e3e9a75aec8c87e5988512c7acfdcb48353a06 Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <leijdekkers@carp-technologies.nl>
Date: Fri, 27 Aug 2010 17:25:47 +0200
Subject: [PATCH] EA-20111 (assert: ChangeUtil.generateTreeElement)

---
 .../siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
index 93b92b23358a..7c0f77e289ba 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
@@ -194,10 +194,9 @@ public class ReplaceSwitchWithIfIntention extends Intention {
             final PsiStatement ifStatement =
                     factory.createStatementFromText(ifStatementText.toString(),
                             switchStatement);
-            final PsiElement ifElement = switchStatement.replace(ifStatement);
-            final PsiElement parent = ifElement.getParent();
-            assert parent != null;
-            parent.addBefore(declarationStatement, ifElement);
+            final PsiElement parent = switchStatement.getParent();
+            parent.addBefore(declarationStatement, switchStatement);
+            switchStatement.replace(ifStatement);
         } else {
             final PsiStatement newStatement =
                     factory.createStatementFromText(ifStatementText.toString(),