From f84d22f0407f7f13e6953db1922726f6a8b66a36 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 27 Feb 2012 12:36:30 +0400 Subject: [PATCH] Got rid of LinkedMultiMap, since it is added to IDEA platform. --- .../jet/lang/resolve/OverrideResolver.java | 2 +- .../jetbrains/jet/util/LinkedMultiMap.java | 39 ------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 compiler/frontend/src/org/jetbrains/jet/util/LinkedMultiMap.java diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index 21e63ace72a..41c3cbf53e6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.util.CommonSuppliers; -import org.jetbrains.jet.util.LinkedMultiMap; +import com.intellij.util.containers.LinkedMultiMap; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/LinkedMultiMap.java b/compiler/frontend/src/org/jetbrains/jet/util/LinkedMultiMap.java deleted file mode 100644 index aa74d5a5c90..00000000000 --- a/compiler/frontend/src/org/jetbrains/jet/util/LinkedMultiMap.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2012 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.util; - -import com.intellij.util.containers.MultiMap; - -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * @author Evgeny Gerashchenko - * TODO reuse LinkedMultiMap from IDEA platform when it will be available there - */ -public class LinkedMultiMap extends MultiMap { - @Override - protected Map> createMap() { - return new LinkedHashMap>(); - } - - @Override - protected Map> createMap(int i, float v) { - return new LinkedHashMap>(i, v); - } -}