clean up

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/Iteration.java b/platform/lang-impl/src/com/intellij/codeInsight/template/Iteration.java
deleted file mode 100644 (file)
index 1f22d90..0000000
--- a/platform/lang-impl/src/com/intellij/codeInsight/template/Iteration.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2010 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.intellij.codeInsight.template;
-
-/**
- * @author Eugene.Kudelevsky
- */
-public abstract class Iteration {
-  protected final int myMaxIndex;
-  protected int myIndex;
-  private final Iteration myParentIteration;
-
-  public Iteration(int index, int maxIndex, Iteration parentIteration) {
-    myIndex = index;
-    myMaxIndex = maxIndex;
-    myParentIteration = parentIteration;
-  }
-
-  protected void next() {
-    myIndex++;
-    if (myIndex < myMaxIndex) {
-      iter();
-    }
-    else if (myIndex == myMaxIndex && myParentIteration != null) {
-      myParentIteration.next();
-    }
-  }
-
-  public boolean isFinished() {
-    return myIndex >= myMaxIndex;
-  }
-
-  protected abstract void iter();
-}

diff --git a/xml/impl/src/com/intellij/codeInsight/template/XmlCustomLiveTemplate.java b/xml/impl/src/com/intellij/codeInsight/template/XmlCustomLiveTemplate.java
index 2ddd841fdf4a80cea80103df0993373b15c89f28..820259939c5228f4f0f85f07b5c76e188a988fd2 100644 (file)
--- a/xml/impl/src/com/intellij/codeInsight/template/XmlCustomLiveTemplate.java
+++ b/xml/impl/src/com/intellij/codeInsight/template/XmlCustomLiveTemplate.java
@@ -472,8 +472,8 @@ public class XmlCustomLiveTemplate implements CustomLiveTemplate {
       final Object key = new Object();
       myCallback.fixStartOfTemplate(key);
       for (int i = 0; i < count; i++) {
-        final boolean[] flag = new boolean[]{false};
         final int finalI = i;
+        final boolean[] flag = new boolean[]{false};
         TemplateInvokationListener listener = new TemplateInvokationListener() {
           public void finished(boolean inSeparateEvent) {
             MyInterpreter interpreter = new MyInterpreter(myTokens, myCallback, MyState.WORD, new TemplateInvokationListener() {