From 75bf93e6cc81340fc0e22f212509df1575d8d430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Galland?= Date: Wed, 29 Mar 2017 00:25:26 +0200 Subject: [PATCH] [util] Ensure multiple bounds in generic type parameters. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit close #619 Signed-off-by: Stéphane Galland --- ...e.java => RestrictedAccessEventSpace.sarl} | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) rename main/apiplugins/io.sarl.util/src/io/sarl/util/{RestrictedAccessEventSpace.java => RestrictedAccessEventSpace.sarl} (85%) diff --git a/main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.java b/main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.sarl similarity index 85% rename from main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.java rename to main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.sarl index 9ea82ecf8d..424978328f 100644 --- a/main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.java +++ b/main/apiplugins/io.sarl.util/src/io/sarl/util/RestrictedAccessEventSpace.sarl @@ -19,13 +19,13 @@ * limitations under the License. */ -package io.sarl.util; +package io.sarl.util -import java.security.Principal; +import java.security.Principal -import io.sarl.lang.core.Address; -import io.sarl.lang.core.EventListener; -import io.sarl.lang.core.EventSpace; +import io.sarl.lang.core.Address +import io.sarl.lang.core.EventListener +import io.sarl.lang.core.EventSpace @@ -39,7 +39,7 @@ * @mavengroupid $GroupId$ * @mavenartifactid $ArtifactId$ */ -public interface RestrictedAccessEventSpace extends EventSpace { +interface RestrictedAccessEventSpace extends EventSpace { /** * Registers the entity inside this space. @@ -53,7 +53,7 @@ public interface RestrictedAccessEventSpace extends EventSpace { * @return the entity's address in this space * @fires ParticipantRegistered */ - Address register(EventListener entity, Principal requester); + def register(entity : EventListener, requester : Principal) : Address /** * Registers the entity inside this space. @@ -67,7 +67,7 @@ public interface RestrictedAccessEventSpace extends EventSpace { * @return the entity's address in this space * @fires ParticipantRegistered */ -

Address register(P entity); + def register(entity : P) : Address with P extends EventListener & Principal /** * Unregisters the entity inside this space. @@ -78,6 +78,7 @@ public interface RestrictedAccessEventSpace extends EventSpace { * @return the former entity's address * @fires ParticipantUnregistered */ - Address unregister(EventListener entity); + def unregister(entity : EventListener) : Address } +