Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge from original master #1

Merged
merged 12 commits into from
Oct 23, 2013
Merged

Merge from original master #1

merged 12 commits into from
Oct 23, 2013

Commits on Aug 2, 2013

  1. Fix off by 1 error on CFI generation. First element is 2 not zero.

    @matwood
    matwood committed Aug 2, 2013
    Configuration menu
    Copy the full SHA
    54b5557 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #14 from bibliolabs/develop 

    Fix off by 1 error on CFI generation.  First element is 2 not zero.
    @AlanQuatermain
    AlanQuatermain committed Aug 2, 2013
    Configuration menu
    Copy the full SHA
    7ffa681 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2013

  1. Added jni::Pointer and jni::PointerPool classes to allow storing smar… 

    …t pointers on C++ side that have been passed to Java side, preventing early deletion. Storage is tested and working, now release needs testing with some closeBook() function on Java side.
    @prcolaco
    prcolaco committed Aug 6, 2013
    Configuration menu
    Copy the full SHA
    64f8c50 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2013

  1. Finished the Pointer and PointerPool and tested the lifecycle of cont… 

    …ainers and packages.
    @prcolaco
    prcolaco committed Aug 8, 2013
    Configuration menu
    Copy the full SHA
    fa612ef View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/txtr-s1-sharedptrs' into develop

    @prcolaco
    prcolaco committed Aug 8, 2013
    Configuration menu
    Copy the full SHA
    2b78731 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2013

  1. New template classed to ease JNI handling of Java classes, fields, ar… 

    …rays and many others.
    @prcolaco
    prcolaco committed Aug 14, 2013
    Configuration menu
    Copy the full SHA
    e0ffd87 View commit details
    Browse the repository at this point in the history

  2. Implemented a Java version of the Library class. This was implemented… 

    … as pure Java class, since the C++ class didn't implement anything interesting to the Java side. Also started an IRI class, but didn't have time to finish. As it is now is building so I push this version to finish sprint 0.8. Work on IRI will continue next sprint.
    @prcolaco
    prcolaco committed Aug 14, 2013
    Configuration menu
    Copy the full SHA
    e39890d View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2013

  1. - Fixed off by 1 bug. CFIs are even and start at 2, while the list ho… 

    …lding the spine items is zero based.
    @matwood
    matwood committed Aug 22, 2013
    Configuration menu
    Copy the full SHA
    529d473 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from bibliolabs/develop 

    - Fixed off by 1 bug.
    @AlanQuatermain
    AlanQuatermain committed Aug 22, 2013
    Configuration menu
    Copy the full SHA
    caadd3a View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2013

  1. Some improvements to JNI helper classes, including Method and String … 

    …access and better Exception handling and throwing.
    @prcolaco
    prcolaco committed Aug 26, 2013
    Configuration menu
    Copy the full SHA
    2733f93 View commit details
    Browse the repository at this point in the history

  2. Finished IRI java class and it's JNI layer.

    @prcolaco
    prcolaco committed Aug 26, 2013
    Configuration menu
    Copy the full SHA
    1f1b345 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/txtr-s2-library-iri' into develop

    @prcolaco
    prcolaco committed Aug 26, 2013
    Configuration menu
    Copy the full SHA
    33f8753 View commit details
    Browse the repository at this point in the history