Merge branch 'sentryKeyword' into 'master'

Sentry keyword

See merge request core-developers/forge!910

forge-ai/.project

@@ -3,6 +3,7 @@
 	<name>forge-ai</name>
 	<comment></comment>
 	<projects>
+		<project>forge-game</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

forge-core/.classpath

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

forge-game/pom.xml

@@ -30,5 +30,10 @@
             <scope>test</scope>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>io.sentry</groupId>
+            <artifactId>sentry-log4j</artifactId>
+            <version>1.7.5</version>
+        </dependency>
     </dependencies>
 </project>

forge-game/src/main/java/forge/game/keyword/KeywordInstance.java

@@ -14,6 +14,8 @@ import forge.game.spellability.SpellAbility;
 import forge.game.staticability.StaticAbility;
 import forge.game.trigger.Trigger;
 import forge.util.Lang;
+import io.sentry.Sentry;
+import io.sentry.event.BreadcrumbBuilder;
 
 public abstract class KeywordInstance<T extends KeywordInstance<?>> implements KeywordInterface {
     private Keyword keyword;
@@ -92,10 +94,24 @@ public abstract class KeywordInstance<T extends KeywordInstance<?>> implements K
             abilities.clear();
             staticAbilities.clear();
         }
+
+        String msg = "KeywordInstance:createTraits: make Traits for Keyword";
+        Sentry.getContext().recordBreadcrumb(
+                new BreadcrumbBuilder().setMessage(msg)
+                .withData("Card", host.getName()).withData("Keyword", this.original).build()
+        );
+        // add Extra for debugging
+        Sentry.getContext().addExtra("Card", host);
+        Sentry.getContext().addExtra("Keyword", this.original);
+
         CardFactoryUtil.addTriggerAbility(this, host, intrinsic);
         CardFactoryUtil.addReplacementEffect(this, host, intrinsic);
         CardFactoryUtil.addSpellAbility(this, host, intrinsic);
         CardFactoryUtil.addStaticAbility(this, host, intrinsic);
+
+        // remove added extra
+        Sentry.getContext().removeExtra("Card");
+        Sentry.getContext().removeExtra("Keyword");
     }
 
     /*

forge-gui-desktop/.classpath

@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-gui"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-ai"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/forge-game"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

forge-gui-desktop/.project

@@ -3,6 +3,9 @@
 	<name>forge-gui-desktop</name>
 	<comment></comment>
 	<projects>
+		<project>forge-core</project>
+		<project>forge-game</project>
+		<project>forge-gui</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

forge-gui/.classpath

@@ -2,7 +2,6 @@
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

forge-gui/pom.xml

@@ -67,11 +67,6 @@
           <artifactId>cling-support</artifactId>
           <version>2.0.1</version>
         </dependency>
-        <dependency>
-            <groupId>io.sentry</groupId>
-            <artifactId>sentry-log4j</artifactId>
-            <version>1.7.5</version>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>