update

Author: monkstone

CHANGELOG.md

@@ -1,3 +1,7 @@
+### v0.8.0 
+
+Update for JRubyArt-1.1+ and processing-3.1+
+
 ### v0.7.0 
 
 A strike for independence, now building from source using polyglot maven

README.md

@@ -30,7 +30,7 @@ Copyright (c) 2014 Daniel Shiffman
 
 This gem was created by Martin Prout
 
-Copyright (c) 2015 Martin Prout
+Copyright (c) 2015/16 Martin Prout
 
 ### To compile
 

lib/pbox2d.rb

@@ -5,6 +5,7 @@
 end
 
 ContactListener = Java::OrgJbox2dCallbacks::ContactListener
+ContactAdaptor = Java::OrgJbox2dCallbacks::ContactAdaptor
 
 def import_class_list(list, string)
   list.each { |d| java_import format(string, d) }

lib/pbox2d/version.rb

@@ -1,4 +1,4 @@
 # module to give version a namespace
 module Pbox2d
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

pbox2d.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.has_rdoc = true
   spec.extra_rdoc_files = ['README.md', 'LICENSE.md']
   spec.authors       = ['Martin Prout']
-  spec.email         = ['martin_p@lineone.net']
+  spec.email         = ['mamba2928@yahoo.co.uk']
   spec.summary       = %q{jbox2d wrapped in a gem for JRubyArt}
   spec.description   = <<-EOF
 "An exemplar for making processing/java libraries available as a gem, for use 
@@ -21,8 +21,8 @@ EOF
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.files << 'lib/box2d.jar'
   spec.require_paths = ['lib']
-  spec.add_dependency 'jruby_art', '~> 1.0', '>= 1.0.4'
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency 'jruby_art', '~> 1.1', '>= 1.1.1'
+  spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.8"
   spec.platform='java'
 end

pom.rb

@@ -2,7 +2,7 @@
 project 'pbox2d', 'https://github.com/ruby-processing/jbox2d' do
 
   model_version '4.0.0'
-  id 'ruby-processing:pbox2d', '0.7'
+  id 'ruby-processing:pbox2d', '0.8'
   packaging 'jar'
 
   description 'jbox2d for JRubyArt'
@@ -33,8 +33,8 @@
               'jruby.api' => "http://jruby.org/apidocs/"
             )
 
-  pom 'org.jruby:jruby:9.0.5.0'
-  jar 'org.processing:core:3.0.1'
+  pom 'org.jruby:jruby:9.1.2.0'
+  jar 'org.processing:core:3.1'
   plugin_management do
     plugin :resources, '2.6'
     plugin :dependency, '2.8'

pom.xml

@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>pbox2d</artifactId>
-  <version>0.7</version>
+  <version>0.8</version>
   <name>pbox2d</name>
   <description>jbox2d for JRubyArt</description>
   <url>https://github.com/ruby-processing/jbox2d</url>
@@ -56,13 +56,13 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.0.5.0</version>
+      <version>9.1.2.0</version>
       <type>pom</type>
     </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.0.1</version>
+      <version>3.1</version>
     </dependency>
   </dependencies>
   <build>

src/org/jbox2d/callbacks/ContactAdaptor.java

@@ -0,0 +1,27 @@
+/**
+ * Reduce typing by using ContactAdaptor rather than ContactListener
+ * @author Martin Prout
+ */
+package org.jbox2d.callbacks;
+
+import org.jbox2d.collision.Manifold;
+import org.jbox2d.dynamics.contacts.Contact;
+
+public abstract class ContactAdaptor implements ContactListener {
+
+    @Override
+    public void beginContact(Contact cntct) {
+    }
+
+    @Override
+    public void endContact(Contact cntct) {
+    }
+
+    @Override
+    public void preSolve(Contact cntct, Manifold mnfld) {
+    }
+
+    @Override
+    public void postSolve(Contact cntct, ContactImpulse ci) {
+    }
+}

src/org/jbox2d/callbacks/ParticleDestructionListener.java

@@ -6,6 +6,7 @@
 public interface ParticleDestructionListener {
   /**
    * Called when any particle group is about to be destroyed.
+   * @param group
    */
   void sayGoodbye(ParticleGroup group);
 

src/org/jbox2d/collision/ContactID.java

@@ -73,7 +73,7 @@ public ContactID(final ContactID c) {
     set(c);
   }
 
-  public void set(final ContactID c) {
+  public final void set(final ContactID c) {
     indexA = c.indexA;
     indexB = c.indexB;
     typeA = c.typeA;