Prevent external change in SimpleDiagnostics and convert to Kotlin

2014-10-08 21:25:12 +04:00
parent ec077d5f8f
commit b98f000c29
2 changed files with 37 additions and 62 deletions
@@ -1,62 +0,0 @@
-/*
- * Copyright 2010-2013 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 org.jetbrains.jet.lang.resolve;
-
-import com.intellij.psi.PsiElement;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.diagnostics.Diagnostic;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-public class SimpleDiagnostics implements Diagnostics {
-    private final Collection<Diagnostic> diagnostics;
-    private final DiagnosticsElementsCache elementsCache = new DiagnosticsElementsCache(this);
-
-    public SimpleDiagnostics(@NotNull Collection<Diagnostic> diagnostics) {
-        this.diagnostics = diagnostics;
-    }
-
-    @NotNull
-    @Override
-    public Collection<Diagnostic> all() {
-        return diagnostics;
-    }
-
-    @NotNull
-    @Override
-    public Collection<Diagnostic> forElement(@NotNull PsiElement psiElement) {
-        return elementsCache.getDiagnostics(psiElement);
-    }
-
-    @NotNull
-    @Override
-    public Diagnostics noSuppression() {
-        return this;
-    }
-
-    @NotNull
-    @Override
-    public Iterator<Diagnostic> iterator() {
-        return all().iterator();
-    }
-
-    @Override
-    public boolean isEmpty() {
-        return all().isEmpty();
-    }
-}
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2014 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 org.jetbrains.jet.lang.resolve
+
+import com.intellij.psi.PsiElement
+import org.jetbrains.jet.lang.diagnostics.Diagnostic
+import java.util.ArrayList
+
+public class SimpleDiagnostics(diagnostics: Collection<Diagnostic>) : Diagnostics {
+    //copy to prevent external change
+    private val diagnostics = ArrayList(diagnostics)
+    private val elementsCache = DiagnosticsElementsCache(this)
+
+    override fun all() = diagnostics
+
+    override fun forElement(psiElement: PsiElement) = elementsCache.getDiagnostics(psiElement)
+
+    override fun noSuppression() = this
+
+    override fun iterator() = all().iterator()
+
+    override fun isEmpty() = all().isEmpty()
+}