Changeset 438 for java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/script/XMLConstantProvider.java

Timestamp:

10/18/15 23:05:09 (9 years ago)

Author:

Mateusz Poszwa

Message:

Ported Framclipse to Xtext 2.8.4

File:

• java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/script/XMLConstantProvider.java (modified) (6 diffs)

java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/script/XMLConstantProvider.java

@@ -7 +7 @@
 import java.util.Map;
 
+import org.antlr.misc.MultiMap;
 import org.apache.commons.io.IOUtils;
 import org.eclipse.core.runtime.ILog;
@@ -20 +21 @@
 import com.framsticks.framclipse.script.model.Type;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
 import com.google.inject.Inject;
 import com.thoughtworks.xstream.XStream;
@@ -68 +67 @@
         private Map<String, Map<String, Type>> createTypeMappings(Framscontext framscontext, Framscript framscript) {
                 Map<String, Map<String, Type>> types = Maps.newHashMap();
-                Multimap<String, String> ext2ctx = ext2Ctx(framscontext);
-                Multimap<String, Type> ctx2type = ctx2Type(framscript);
+                MultiMap<String, String> ext2ctx = ext2Ctx(framscontext);
+                MultiMap<String, Type> ctx2type = ctx2Type(framscript);
                 for (String ext : ext2ctx.keySet()) {
                         HashMap<String, Type> map = new HashMap<String, Type>();
@@ -82 +81 @@
         }
 
-        private Multimap<String, String> ext2Ctx(Framscontext framscontext) {
-                Multimap<String, String> ext2ctx = Multimaps.newHashMultimap();
+        private MultiMap<String, String> ext2Ctx(Framscontext framscontext) {
+                MultiMap<String, String> ext2ctx = new MultiMap<String, String>();
                 for (File file : framscontext.getFiles()) {
                         String ext = file.getPattern();
@@ -89 +88 @@
                         if (file.getCode() != null) {
                                 for (Context context : file.getCode().getContexts()) {
-                                        ext2ctx.put(ext, context.getName());
+                                        ext2ctx.map(ext, context.getName());
                                 }
                         }
@@ -96 +95 @@
         }
 
-        private Multimap<String, Type> ctx2Type(Framscript framscript) {
-                Multimap<String, Type> ctx2type = Multimaps.newHashMultimap();
+        private MultiMap<String, Type> ctx2Type(Framscript framscript) {
+                MultiMap<String, Type> ctx2type = new MultiMap<String, Type>();
                 for (Type type : framscript.getTypes()) {
-                        ctx2type.put(type.getContext(), type);
+                        ctx2type.map(type.getContext(), type);
                 }
                 return ctx2type;