Update Launchpad plugin toward GAMA2024-06

mit.feature.launchpad/.project → gama.experimental.feature.launchpad/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mit.feature.launchpad</name>
+	<name>gama.experimental.feature.launchpad</name>
 	<comment></comment>
 	<projects>
 	</projects>

mit.feature.launchpad/feature.xml → gama.experimental.feature.launchpad/feature.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="mit.feature.launchpad"
+      id="gama.experimental.feature.launchpad"
       label="LaunchPad"
-      version="1.0.0.qualifier">
+      version="1.0.0.qualifier"
+      provider-name="MIT MEDIA Lab">
 
    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -21,10 +22,7 @@
    </url>
 
    <plugin
-         id="mit.gaml.extension.launchpad"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+         id="gama.experimental.launchpad"
+         version="0.0.0"/>
 
 </feature>

mit.feature.launchpad/pom.xml → gama.experimental.feature.launchpad/pom.xml

@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>msi.gama</groupId>
-  <artifactId>mit.feature.launchpad</artifactId>
+  <artifactId>gama.experimental.feature.launchpad</artifactId>
   <packaging>eclipse-feature</packaging>
   <parent>
   	<groupId>msi.gama</groupId>

gama.experimental.launchpad/.factorypath

@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="WKSPJAR" id="/gama.processor/gama.processor.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>

mit.gaml.extension.launchpad/.project → gama.experimental.launchpad/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>mit.gaml.extension.launchpad</name>
+	<name>gama.experimental.launchpad</name>
 	<comment></comment>
 	<projects>
 	</projects>

mit.gaml.extension.launchpad/META-INF/MANIFEST.MF → gama.experimental.launchpad/META-INF/MANIFEST.MF

@@ -1,11 +1,12 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: mit.gaml.extension.launchpad
-Bundle-SymbolicName: mit.gaml.extension.launchpad;singleton:=true
+Bundle-Name: gama.experimental.launchpad
+Bundle-SymbolicName: gama.experimental.launchpad;singleton:=true
+Bundle-Vendor: MIT MEDIA Lab
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
-Require-Bundle: msi.gama.core,
- msi.gama.ext
+Require-Bundle: gama.core,
+ gama.dependencies
 Bundle-ClassPath: libs/lib/hazelcast-2.6.jar,
  libs/lib/jackson-annotations-2.2.2.jar,
  libs/lib/jackson-core-2.2.2.jar,
@@ -71,6 +72,7 @@ Export-Package: com.fasterxml.jackson.annotation,
  com.hazelcast.security,
  com.hazelcast.util,
  com.hazelcast.util.concurrent,
+ gama.experimental.launchpad.skills,
  gaml.additions.launchpad,
  io.netty.bootstrap,
  io.netty.buffer,
@@ -114,7 +116,6 @@ Export-Package: com.fasterxml.jackson.annotation,
  io.netty.util.internal,
  io.netty.util.internal.chmv8,
  io.netty.util.internal.logging,
- mit.gaml.extension.launchpad.skills,
  net.thecodersbreakfast.lp4j.api,
  net.thecodersbreakfast.lp4j.emulator,
  net.thecodersbreakfast.lp4j.midi,

mit.gaml.extension.launchpad/models/LaunchPad Layer/.project → gama.experimental.launchpad/models/LaunchPad Layer/.project

@@ -13,7 +13,7 @@
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
-		<nature>msi.gama.application.gamaNature</nature>
-		<nature>msi.gama.application.pluginNature</nature>
+		<nature>gama.ui.application.gamaNature</nature>
+		<nature>gama.ui.application.pluginNature</nature>
 	</natures>
 </projectDescription>

gama.experimental.launchpad/models/LaunchPad Layer/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

mit.gaml.extension.launchpad/models/LaunchPad Layer/models/LaunchPad Event Layer.gaml → gama.experimental.launchpad/models/LaunchPad Layer/models/LaunchPad Event Layer.gaml

@@ -44,7 +44,7 @@ experiment Displays type: gui
 		display View_change_color 
 		{
 			grid cell border: #black;
-			event "pad_down" type: "launchpad" action: updateGrid;
+			event "pad_down" type: "launchpad" {ask simulation {do updateGrid;}}
 		}
 	}
 }

mit.gaml.extension.launchpad/plugin.xml → gama.experimental.launchpad/plugin.xml

@@ -7,7 +7,7 @@
 <extension
          point="gama.event_layer">
       <implementation
-            class="mit.gaml.extension.launchpad.skills.LaunchPadEventLayer">
+            class="gama.experimental.launchpad.skills.LaunchPadEventLayer">
       </implementation>
    </extension>
 </plugin>

mit.gaml.extension.launchpad/pom.xml → gama.experimental.launchpad/pom.xml

@@ -1,7 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>msi.gama</groupId>
-  <artifactId>mit.gaml.extension.launchpad</artifactId>
+  <artifactId>gama.experimental.launchpad</artifactId>
   <packaging>eclipse-plugin</packaging>
   <parent>
   	<groupId>msi.gama</groupId>

mit.gaml.extension.launchpad/src/mit/gaml/extension/launchpad/skills/LaunchPadEventLayer.java → gama.experimental.launchpad/src/gama/experimental/launchpad/skills/LaunchPadEventLayer.java

@@ -7,29 +7,27 @@
  * 
  *
  **********************************************************************************************/
-package mit.gaml.extension.launchpad.skills;
+package gama.experimental.launchpad.skills;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 
-import msi.gama.common.interfaces.IDisplaySurface;
-import msi.gama.common.interfaces.IEventLayerDelegate;
-import msi.gama.common.interfaces.IGraphics;
-import msi.gama.common.interfaces.ILayer;
-import msi.gama.metamodel.agent.IAgent;
-import msi.gama.outputs.layers.AbstractLayer;
-import msi.gama.outputs.layers.EventLayerStatement;
-import msi.gama.outputs.layers.ILayerData;
-import msi.gama.outputs.layers.ILayerStatement;
-import msi.gama.outputs.layers.LayerData;
-import msi.gama.runtime.IScope;
-import msi.gama.runtime.IScope.IGraphicsScope;
-import msi.gama.runtime.exceptions.GamaRuntimeException;
-import msi.gaml.descriptions.StatementDescription;
-import msi.gaml.statements.IExecutable;
+import gama.core.common.interfaces.IDisplaySurface;
+import gama.core.common.interfaces.IEventLayerDelegate;
+import gama.core.common.interfaces.IGraphics;
+import gama.core.common.interfaces.ILayer;
+import gama.core.metamodel.agent.IAgent;
+import gama.core.outputs.layers.EventLayerStatement;
+import gama.core.outputs.layers.ILayerData;
+import gama.core.outputs.layers.ILayerStatement;
+import gama.core.outputs.layers.LayerData;
+import gama.core.runtime.IScope;
+import gama.core.runtime.IScope.IGraphicsScope;
+import gama.core.runtime.exceptions.GamaRuntimeException;
+import gama.gaml.statements.IExecutable;
 import net.thecodersbreakfast.lp4j.api.BackBufferOperation;
 import net.thecodersbreakfast.lp4j.api.Button;
 import net.thecodersbreakfast.lp4j.api.Color;

mit.gaml.extension.launchpad/src/mit/gaml/extension/launchpad/skills/LaunchPadSkill.java → gama.experimental.launchpad/src/gama/experimental/launchpad/skills/LaunchPadSkill.java

@@ -1,22 +1,21 @@
-package mit.gaml.extension.launchpad.skills;
+package gama.experimental.launchpad.skills;
 
-import msi.gama.metamodel.shape.GamaPoint;
-import msi.gama.metamodel.shape.ILocation;
-import msi.gama.precompiler.GamlAnnotations.action;
-import msi.gama.precompiler.GamlAnnotations.arg;
-import msi.gama.precompiler.GamlAnnotations.doc;
-import msi.gama.precompiler.GamlAnnotations.example;
-import msi.gama.precompiler.GamlAnnotations.getter;
-import msi.gama.precompiler.GamlAnnotations.skill;
-import msi.gama.precompiler.GamlAnnotations.variable;
-import msi.gama.precompiler.GamlAnnotations.vars;
-import msi.gama.precompiler.IConcept;
-import msi.gama.runtime.GAMA;
-import msi.gama.runtime.IScope;
-import msi.gama.runtime.exceptions.GamaRuntimeException;
-import msi.gama.util.IList;
-import msi.gaml.skills.Skill;
-import msi.gaml.types.IType;
+import gama.core.metamodel.shape.GamaPoint;
+import gama.annotations.precompiler.GamlAnnotations.action;
+import gama.annotations.precompiler.GamlAnnotations.arg;
+import gama.annotations.precompiler.GamlAnnotations.doc;
+import gama.annotations.precompiler.GamlAnnotations.example;
+import gama.annotations.precompiler.GamlAnnotations.getter;
+import gama.annotations.precompiler.GamlAnnotations.skill;
+import gama.annotations.precompiler.GamlAnnotations.variable;
+import gama.annotations.precompiler.GamlAnnotations.vars;
+import gama.annotations.precompiler.IConcept;
+import gama.core.runtime.GAMA;
+import gama.core.runtime.IScope;
+import gama.core.runtime.exceptions.GamaRuntimeException;
+import gama.core.util.IList;
+import gama.gaml.skills.Skill;
+import gama.gaml.types.IType;
 import net.thecodersbreakfast.lp4j.api.BackBufferOperation;
 import net.thecodersbreakfast.lp4j.api.Button;
 import net.thecodersbreakfast.lp4j.api.Color;
@@ -48,7 +47,7 @@ public String getButtonPressed() {
 	}
 
 	@getter ("padPressed")
-	public ILocation getPadPressed() {
+	public GamaPoint getPadPressed() {
 		final GamaPoint p = new GamaPoint(LaunchPadEventLayer.pressedPad.getX(), LaunchPadEventLayer.pressedPad.getY());
 		return p;
 	}