Merging dev-1.5

.travis.yml

@@ -14,9 +14,7 @@ script:
 - if [ $TRAVIS_PULL_REQUEST == "false" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9.]* ]] ; then
   export PROFILES="uploadRepo,uploadProducts"; export UPDATE_SITE="stable" ; fi
 - echo "Running with profiles $PROFILES"
-
-# Maven build
-- mvn -U -DupdateSiteFolder=$UPDATE_SITE -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install
+- mvn -e -DupdateSiteFolder=$UPDATE_SITE -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install
   jacoco:report coveralls:report -P $PROFILES
 notifications:
   webhooks:
@@ -53,7 +51,7 @@ deploy:
     branch:
     - dev
     - master
-    - dev-*.*
+    - dev-1.5
 
 - provider: s3
   access_key_id: AKIAJLCGMGO45ZQFSLJA

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/XDebuggerImpl.xtend

@@ -7,6 +7,7 @@ import org.uqbar.project.wollok.interpreter.api.XDebugger
 import org.uqbar.project.wollok.interpreter.api.XInterpreter
 
 import static extension org.uqbar.project.wollok.utils.XTextExtensions.*
+import org.eclipse.xtend.lib.annotations.Accessors
 
 /**
  * xdebugger implementation that actually
@@ -18,7 +19,7 @@ import static extension org.uqbar.project.wollok.utils.XTextExtensions.*
 class XDebuggerImpl implements XDebugger {
 	static Logger log = Logger.getLogger(XDebuggerImpl)
 	XInterpreter<?> interpreter
-	var XTextInterpreterEventPublisher eventSender
+	@Accessors var XTextInterpreterEventPublisher eventSender
 	val breakpoints = <XBreakpoint>newArrayList 
 	val Object suspendedLock = new Object
 	EObject currentStepObject

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/out/AsyncXTextInterpreterEventPublisher.xtend

@@ -22,23 +22,32 @@ class AsyncXTextInterpreterEventPublisher implements XTextInterpreterEventPublis
 	}
 
 	override started() {
-		service.execute([ wrapped.started ])
+		async [ wrapped.started ]
 	}
 
 	override terminated() {
-		service.execute([ wrapped.terminated ])
+		async [ wrapped.terminated ]
 	}
 
 	override suspendStep() {
-		service.execute([ wrapped.suspendStep ])
+		async [ wrapped.suspendStep ]
 	}
 
 	override resumeStep() {
-		service.execute([ wrapped.resumeStep ])
+		async [ wrapped.resumeStep ]
 	}
 
 	override breakpointHit(String fileName, int lineNumber) {
-		service.execute([ wrapped.breakpointHit(fileName, lineNumber) ])
+		async [ wrapped.breakpointHit(fileName, lineNumber) ]
+	}
+
+	protected def async(Runnable r) {
+		if (!service.isShutdown)
+			service.execute(r)
+	}
+
+	def close() {
+		service.shutdown()
 	}
 
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/CommandHandlerFactory.xtend

@@ -12,13 +12,14 @@ import org.uqbar.project.wollok.interpreter.api.XDebugger
  */
 class CommandHandlerFactory {
 
-	def static void createCommandHandler(XDebugger debugger, int port, ()=>void onReady) {
+	def static Server createCommandHandler(XDebugger debugger, int port, ()=>void onReady) {
+		val server = new Server
 		new CallHandler => [
-			val server = new Server
 			registerGlobal(DebugCommandHandler, new DebugCommandHandlerImpl(debugger, server, onReady))
 //			server.bind(port, it, new DebuggingProtocolFilter) // use this to debug RMI
 			server.bind(port, it)
 		]
+		server
 	}
 
 	def static remoteObjectName() { DebugCommandHandler.simpleName }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/DebugCommandHandler.xtend

@@ -28,6 +28,6 @@ interface DebugCommandHandler {
 	def void setBreakpoint(URI fileURI, int lineNumber)
 	def void clearBreakpoint(URI fileURI, int lineNumber)
 
-	def List<XDebugStackFrame> getStackFrames()
+	def List<XDebugStackFrame> getStackFrames() throws WollokDebuggerException
 
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/DebugCommandHandlerImpl.xtend

@@ -14,6 +14,7 @@ import org.uqbar.project.wollok.interpreter.api.XDebugger
  * 
  * @author jfernandes
  */
+// this should probably have a better name
 class DebugCommandHandlerImpl implements DebugCommandHandler {
 	Server server
 	XDebugger debugger
@@ -48,10 +49,15 @@ class DebugCommandHandlerImpl implements DebugCommandHandler {
 		debugger.clearBreakpoint(fileURI.toString, lineNumber)
 	}
 
-	override getStackFrames() {
-		Lists.newArrayList(debugger.stack.map[
-			new XDebugStackFrame(it)
-		])
+	override getStackFrames() throws WollokDebuggerException {
+		try {
+			Lists.newArrayList(debugger.stack.map[
+				new XDebugStackFrame(it)
+			])
+		}
+		catch (RuntimeException e) {
+			throw new WollokDebuggerException("Error while getting current stack trace", e)
+		}
 	}
 
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/WollokDebuggerException.xtend

@@ -0,0 +1,14 @@
+package org.uqbar.project.wollok.debugger.server.rmi
+
+/**
+ * Base class for remote debugger exceptions
+ * 
+ * @author jfernandes
+ */
+class WollokDebuggerException extends RuntimeException {
+
+	new(String message, Throwable cause) {
+		super(message, cause)
+	}
+
+}

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/XDebugStackFrameVariable.xtend

@@ -23,8 +23,10 @@ class XDebugStackFrameVariable implements Serializable {
 	}
 
 	def asRemoteValue(WollokObject object) {
-		if (object.hasNativeType(LIST) || object.hasNativeType(COLLECTION))
-			 new XWollokListDebugValue(object)
+		if (object.hasNativeType(LIST))
+			 new XWollokListDebugValue(object, LIST)
+		else if (object.hasNativeType(SET))
+			 new XWollokListDebugValue(object, SET)
 		else
 			new XWollokObjectDebugValue(variable.name, object)
 	}

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/XDebugValue.xtend

@@ -2,6 +2,7 @@ package org.uqbar.project.wollok.debugger.server.rmi
 
 import java.io.Serializable
 import java.util.ArrayList
+import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
 
 /**
@@ -15,6 +16,6 @@ class XDebugValue implements Serializable {
 		this.stringValue = stringValue
 	}
 
-	def ArrayList<XDebugStackFrameVariable> getVariables() { EMPTY_LIST }
+	def List<XDebugStackFrameVariable> getVariables() { EMPTY_LIST }
 
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/XWollokListDebugValue.xtend

@@ -1,11 +1,12 @@
 package org.uqbar.project.wollok.debugger.server.rmi
 
-import java.util.ArrayList
+import java.util.Collection
+import java.util.Collections
 import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.uqbar.project.wollok.interpreter.context.WVariable
 import org.uqbar.project.wollok.interpreter.core.WollokObject
-import org.uqbar.project.wollok.interpreter.nativeobj.JavaWrapper
+import wollok.lang.WCollection
 
 import static org.uqbar.project.wollok.sdk.WollokDSK.*
 
@@ -16,18 +17,18 @@ import static org.uqbar.project.wollok.sdk.WollokDSK.*
  * @author jfernandes
  */
 class XWollokListDebugValue extends XDebugValue {
-	@Accessors ArrayList<XDebugStackFrameVariable> variables = newArrayList
+	@Accessors List<XDebugStackFrameVariable> variables = newArrayList
 
-	new(WollokObject list) {
+	new(WollokObject list, String concreteNativeType) {
 		super('''List (id=«System.identityHashCode(list)»)''')
 		var i = 0
-		for (e : list.elements) 
+		for (e : list.getElements(concreteNativeType)) 
 			variables.add(new XDebugStackFrameVariable(new WVariable(String.valueOf(i++), false), e))
 	}
 
-	def getElements(WollokObject object) {
-		val wrapped = object.getNativeObject(LIST) as JavaWrapper<List<WollokObject>>
-		wrapped.wrapped
+	def getElements(WollokObject object, String concreteNativeType) {
+		val native = object.getNativeObject(concreteNativeType) as WCollection<Collection<WollokObject>>
+		if (native.wrapped == null) Collections.EMPTY_LIST else native.wrapped
 	}
 
 }

org.uqbar.project.wollok.launch/src/org/uqbar/project/wollok/debugger/server/rmi/XWollokObjectDebugValue.xtend

@@ -1,6 +1,6 @@
 package org.uqbar.project.wollok.debugger.server.rmi
 
-import java.util.ArrayList
+import java.util.List
 import org.eclipse.xtend.lib.annotations.Accessors
 import org.uqbar.project.wollok.interpreter.core.WollokObject
 import org.uqbar.project.wollok.interpreter.nativeobj.JavaWrapper
@@ -20,7 +20,7 @@ import static extension org.uqbar.project.wollok.sdk.WollokDSK.*
 class XWollokObjectDebugValue extends XDebugValue {
 	String typeName
 	String varName
-	@Accessors ArrayList<XDebugStackFrameVariable> variables = newArrayList
+	@Accessors List<XDebugStackFrameVariable> variables = newArrayList
 
 	new(String varName, WollokObject obj) {
 		super(obj.description)

org.uqbar.project.wollok.lib/META-INF/MANIFEST.MF

@@ -1,7 +1,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Wollok Lib
-Bundle-SymbolicName: org.uqbar.project.wollok.lib
-Bundle-Version: 1.6.0.qualifier
+Bundle-SymbolicName: org.uqbar.project.wollok.lib;singleton:=true
+Bundle-Version: 1.5.1.qualifier
 Bundle-Activator: org.uqbar.project.wollok.lib.WollokLibActivator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

org.uqbar.project.wollok.lib/build.properties

@@ -4,7 +4,8 @@ bin.includes = META-INF/,\
                build.properties,\
                src/wollok.wollokmf,\
                src/wollok/,\
-               src/org/
+               src/org/,\
+               plugin.xml
 source.. = src/,\
            xtend-gen/
 

org.uqbar.project.wollok.lib/plugin.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+</plugin>

org.uqbar.project.wollok.lib/src/wollok/lang.wlk

@@ -427,11 +427,11 @@ class Collection {
 	 * Answers a new collection that contains the result of transforming each of self collection's elements
 	 * using a given closure.
 	 * The condition is a closure argument that takes a single element and Answers an object.
-	 * @returns another collection (same type as self one)
+	 * @returns another list
 	 * Example:
 	 *      const ages = users.map({ user => user.age() })
 	 */
-	method map(closure) = self.fold(self.newInstance(), { acc, e =>
+	method map(closure) = self.fold([], { acc, e =>
 		 acc.add(closure.apply(e))
 		 acc
 	})

org.uqbar.project.wollok.lib/src/wollok/lang/WCollection.xtend

@@ -13,7 +13,7 @@ import static extension org.uqbar.project.wollok.lib.WollokSDKExtensions.*
 /**
  * @author jfernandes
  */
-class WCollection<T extends Collection> {
+class WCollection<T extends Collection<WollokObject>> {
 	@Accessors var T wrapped
 	protected extension WollokInterpreterAccess = new WollokInterpreterAccess
 

org.uqbar.project.wollok.lib/src/wollok/lang/WList.xtend

@@ -14,7 +14,7 @@ import static extension org.uqbar.project.wollok.lib.WollokSDKExtensions.*
  * 
  * @author jfernandes
  */
-class WList extends WCollection<List> implements JavaWrapper<List> {
+class WList extends WCollection<List<WollokObject>> implements JavaWrapper<List<WollokObject>> {
 
  	val WollokObject wollokInstance
 

org.uqbar.project.wollok.lib/src/wollok/lang/WSet.xtend

@@ -8,7 +8,7 @@ import org.uqbar.project.wollok.interpreter.core.WollokObject
 /**
  * @author jfernandes
  */
-class WSet extends WCollection<Set> {
+class WSet extends WCollection<Set<WollokObject>> {
 
 	new() {
 		wrapped = new TreeSet<WollokObject>(new WollokObjectComparator)

org.uqbar.project.wollok.lib/src/wollok/lib.wlk

@@ -185,6 +185,7 @@ object game {
 	method whenKeyPressedSay(key, function) native
 	method whenCollideDo(element, action) native
 	method getObjectsIn(position) native
+	method colliders(visual) native
 	method say(element, message) native
 	method clear() native
 	method stop() native
@@ -194,6 +195,9 @@ object game {
 	}
 
 	method at(x, y) = new Position(x, y)
+	method origin() = self.at(0, 0)
+	method center() = self.at(self.getWidth().div(2), self.getHeight().div(2))
+
 
 	method setTitle(title) native
 	method getTitle() native
@@ -233,6 +237,12 @@ class Position {
 
 	method clone() = new Position(x, y)
 
+	method distance(position) {
+	    const deltaX = self.getX() - position.getX()
+	    const deltaY = self.getY() - position.getY()
+	    return (deltaX.square() + deltaY.square()).squareRoot() 
+	}
+
 	method clear() {
 		self.allElements().forEach{it => game.removeVisual(it)}
 	}
@@ -242,8 +252,7 @@ class Position {
 	method getY() = y
 	method setY(_y) { y = _y }
 
-	override method ==(other) = 
-		x == other.getX() && y == other.getY()
+	override method ==(other) = x == other.getX() && y == other.getY()
 }
 
 object error {

org.uqbar.project.wollok.lib/src/wollok/lib/GameObject.xtend

@@ -67,6 +67,15 @@ class GameObject {
 		.toList.javaToWollok
 	}
 
+	def colliders(WollokObject visual) {
+		val visualObject = board.findVisual(visual)
+		board.getComponentsInPosition(visualObject.position)
+		.map[ it as WVisual ]
+		.filter [ !it.equals(visualObject)]
+		.map [ it.wObject ]
+		.toList.javaToWollok
+	}
+
 	def say(WollokObject visual, WollokObject message) {
 		board.findVisual(visual).say(message.asString)
 	}

org.uqbar.project.wollok.product/plugin.xml

@@ -15,11 +15,11 @@
          </property>
          <property
                name="aboutImage"
-               value="platform:/plugin/org.uqbar.project.wollok.ui/icons/wollok-logo-about.fw.png">
+               value="platform:/plugin/org.uqbar.project.wollok.product/icons/wollok-logo-about.fw.png">
          </property>
          <property
                name="aboutText"
-               value="Wollok Programming Language and IDE&#x0A;Version 1.6.0&#x0A;&#x0A;http://uqbar-project.org&#x0A;http://wollok.uqbar-project.org&#x0A;&#x0A;© Copyright 2014, Uqbar Project Foundation, All right reserved">
+               value="Wollok Programming Language and IDE&#x0A;Version 1.5.1&#x0A;&#x0A;http://uqbar-project.org&#x0A;http://wollok.uqbar-project.org&#x0A;&#x0A;© Copyright 2016, Uqbar Project Foundation, All right reserved">
          </property>
          <property
                name="windowImages"
@@ -74,7 +74,7 @@
       <introProductBinding
             introId="org.uqbar.project.wollok.product.intro"
             productId="org.uqbar.project.wollok.product.org_uqbar_project_wollok_product">
-      </introProductBinding
+      </introProductBinding>
 		-->
    </extension>
    <extension