[sre] Move the guard evaluator into the SRE internal package.

Signed-off-by: Stéphane Galland <galland@arakhne.org>
sarl · Jan 22, 2020 · da632f2 · da632f2
1 parent 5defeb9
commit da632f2
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 57 deletions.
diff --git a/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF b/sre/io.janusproject/io.janusproject.plugin/META-INF/MANIFEST.MF
@@ -36,8 +36,7 @@ Require-Bundle: io.sarl.core;bundle-version="0.11.0",
  stax2-api;bundle-version="4.2.0"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
-Export-Package: io.sarl.revision;uses:="io.sarl.lang.core,org.eclipse.osgi.util,org.eclipse.xtext.xbase.lib",
- io.sarl.sre;
+Export-Package: io.sarl.sre;
   uses:="io.sarl.lang.core,
    org.eclipse.osgi.util,
    io.sarl.sre.services,

diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/revision/Messages.sarl b/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/revision/Messages.sarl
diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/revision/messages.properties b/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/revision/messages.properties
diff --git a/...oject/io.janusproject.plugin/src/io/sarl/sre/boot/configs/subconfigs/RootContextType.java b/...oject/io.janusproject.plugin/src/io/sarl/sre/boot/configs/subconfigs/RootContextType.java
@@ -97,7 +97,7 @@ public static String getJsonLabels() {
 			if (first) {
 				first = false;
 			} else {
-				buffer.append(", ");
+				buffer.append(", "); //$NON-NLS-1$
 			}
 			buffer.append(type.toJsonString());
 		}

diff --git a/...sarl/revision/BehaviorGuardEvaluator.sarl → .../sre/internal/BehaviorGuardEvaluator.sarl b/...sarl/revision/BehaviorGuardEvaluator.sarl → .../sre/internal/BehaviorGuardEvaluator.sarl
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package io.sarl.revision
+package io.sarl.sre.internal
 
 import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method

diff --git a/...ision/BehaviorGuardEvaluatorRegistry.sarl → ...ernal/BehaviorGuardEvaluatorRegistry.sarl b/...ision/BehaviorGuardEvaluatorRegistry.sarl → ...ernal/BehaviorGuardEvaluatorRegistry.sarl
@@ -19,7 +19,7 @@
  * limitations under the License.
  */
 
-package io.sarl.revision
+package io.sarl.sre.internal
 
 import com.google.common.base.Objects
 import com.google.common.base.Throwables

diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/internal/Messages.sarl b/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/internal/Messages.sarl
@@ -52,6 +52,9 @@ final class Messages extends NLS {
 	public static var ContextMemberEventEmitter_2 : String
 	public static var ContextMemberEventEmitter_3 : String
 
+	public static var BehaviorGuardEvaluator_0 : String
+	public static var BehaviorGuardEvaluator_1 : String
+	public static var BehaviorGuardEvaluatorRegistry_0 : String
 
 	private new {
 	}

diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/internal/messages.properties b/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/internal/messages.properties
@@ -8,3 +8,6 @@ ContextMemberEventEmitter_0=Context Joined: {1}, by: {0}
 ContextMemberEventEmitter_1=Context Left: {1}, by: {0}
 ContextMemberEventEmitter_2=Member Joined: {0}, into: {1}
 ContextMemberEventEmitter_3=Member Left: {0}, from: {1}
+BehaviorGuardEvaluator_0=Invalid argument for the perception guard evaluator method becames inaccessible: {0}
+BehaviorGuardEvaluator_1=Perception guard evaluator method becames inaccessible: {0}
+BehaviorGuardEvaluatorRegistry_0=Method {0} has @{1} annotation but with invalid parameters. Perception guard evaluator methods must have exactly 2 parameters: the event occurence to dispatch, a subtype of Event; and the collection of BehaviorUnit methods to execute, Collection<Runnable>. The declared parameters are: {2}.
diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/skills/internal/EventBus.sarl b/sre/io.janusproject/io.janusproject.plugin/src/io/sarl/sre/skills/internal/EventBus.sarl
@@ -21,8 +21,8 @@
 package io.sarl.sre.skills.internal
 
 import io.sarl.lang.core.Event
-import io.sarl.revision.BehaviorGuardEvaluator
-import io.sarl.revision.BehaviorGuardEvaluatorRegistry
+import io.sarl.sre.internal.BehaviorGuardEvaluator
+import io.sarl.sre.internal.BehaviorGuardEvaluatorRegistry
 import io.sarl.sre.services.executor.EarlyExitException
 import io.sarl.sre.services.executor.ExecutorService
 import io.sarl.sre.services.executor.SreRunnable