Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c3ebd1ed8e1
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ffdf5300541e
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 15, 2015

  1. Fix java_implements for multiple interfaces

    @eliaslevy
    eliaslevy committed Sep 15, 2015
    Copy the full SHA
    0c4eb28 View commit details

Commits on Sep 16, 2015

  1. Merge pull request #3329 from eliaslevy/fix_interface_string_join 

    Fix java_implements for multiple interfaces
    @kares
    kares committed Sep 16, 2015
    Copy the full SHA
    ffdf530 View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 lib/ruby/shared/jruby/compiler/java_class.rb
  2. +2 −2 spec/java_integration/jrubyc/java/implements_spec.rb
2 changes: 1 addition & 1 deletion lib/ruby/shared/jruby/compiler/java_class.rb
View file
Original file line number Diff line number Diff line change
@@ -374,7 +374,7 @@ def add_interface(ifc)

def interface_string
if @interfaces.size > 0
"implements " + @interfaces.join('.')
"implements " + @interfaces.join(', ')
else
""
end
4 changes: 2 additions & 2 deletions spec/java_integration/jrubyc/java/implements_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ def generate(script)
cls.interfaces[0].should == "Runnable"

java = cls.to_s
java.should match /public class Foo implements Runnable/
java.should match /^public class Foo extends RubyObject implements Runnable/

cls = generate("class Foo; java_implements 'Runnable', 'Serializable'; end").classes[0]

@@ -26,7 +26,7 @@ def generate(script)
cls.interfaces[1].should == "Serializable"

java = cls.to_s
java.should match /public class Foo implements Runnable, Serializable/
java.should match /^public class Foo extends RubyObject implements Runnable, Serializable/
end
end
end