# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@oracle.com>
# Date 1442215116 -7200
# Node ID 307a4ed5430ebc83b1d689cf9ff80345e896dfdd
# Parent  ffadd23c63c8e77364c96b9126a7d9f4e64ed427
Two more changes to guarantee better compatibility with TruffleVM

diff -r ffadd23c63c8 -r 307a4ed5430e truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/Portaal.java
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/Portaal.java	Mon Sep 14 05:32:13 2015 +0200
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/Portaal.java	Mon Sep 14 09:18:36 2015 +0200
@@ -290,7 +290,7 @@
      * @return an immutable map with keys being MIME types and values the {@link Language
      *         descriptions} of associated languages
      */
-    public Map<String, Language> getLanguages() {
+    public Map<String, ? extends Language> getLanguages() {
         return Collections.unmodifiableMap(langs);
     }
 
diff -r ffadd23c63c8 -r 307a4ed5430e truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/TruffleVM.java
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/TruffleVM.java	Mon Sep 14 05:32:13 2015 +0200
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/TruffleVM.java	Mon Sep 14 09:18:36 2015 +0200
@@ -62,6 +62,42 @@
 
         @Deprecated
         @Override
+        public Builder executor(Executor executor) {
+            return (Builder) super.executor(executor);
+        }
+
+        @Deprecated
+        @Override
+        public Builder globalSymbol(String name, Object obj) {
+            return (Builder) super.globalSymbol(name, obj);
+        }
+
+        @Deprecated
+        @Override
+        public Builder onEvent(EventConsumer<?> handler) {
+            return (Builder) super.onEvent(handler);
+        }
+
+        @Deprecated
+        @Override
+        public Builder stdIn(Reader r) {
+            return (Builder) super.stdIn(r);
+        }
+
+        @Deprecated
+        @Override
+        public Builder stdErr(Writer w) {
+            return (Builder) super.stdErr(w);
+        }
+
+        @Deprecated
+        @Override
+        public Builder stdOut(Writer w) {
+            return (Builder) super.stdOut(w);
+        }
+
+        @Deprecated
+        @Override
         public TruffleVM build() {
             return (TruffleVM) super.build();
         }
@@ -78,6 +114,12 @@
     }
 
     @Override
+    @SuppressWarnings("unchecked")
+    public Map<String, Language> getLanguages() {
+        return (Map<String, Language>) super.getLanguages();
+    }
+
+    @Override
     public Symbol eval(Source source) throws IOException {
         return (Symbol)super.eval(source);
     }