From 3ef6bdf244703dc8f363ce7d0d4e971df17a4fc8 Mon Sep 17 00:00:00 2001 From: sojamo Date: Sun, 29 Mar 2015 21:59:13 +0800 Subject: [PATCH] fix, see issue 3, release 2.2.4 updated --- README.md | 7 +++++++ resources/build.xml | 4 ++-- src/controlP5/ControlP5.java | 2 +- src/controlP5/ScrollableList.java | 6 +++++- src/controlP5/changeLog.txt | 5 +++++ 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a37f0a9..18895b2 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,7 @@ The range of available controllers includes Slider, Button, Toggle, Knob, Textfi * [Javascript](#javascript) * [Problems and Issues](#issues) * [Help](#help) + * Digital Object Identifiers ## Installation @@ -366,4 +367,10 @@ If you want to help improve ControlP5, the first place for me to do so would be If you have used ControlP5 in any of your projects, let me know, send me details, send me links, send me screeshots. +## Digital Object Identifiers + +Digital Object Identifiers (DOI) are the backbone of the academic reference and metrics system which allows researchers writing software to make their work they share on GitHub citable by archiving one of their GitHub repositories and assigning a DOI with the data archiving tool Zenodo [(link)](https://guides.github.com/activities/citable-code/). + +[![DOI](https://zenodo.org/badge/doi/10.5281/zenodo.16290.svg)](http://dx.doi.org/10.5281/zenodo.16290) + Copyright 2006-2015 Andreas Schlegel diff --git a/resources/build.xml b/resources/build.xml index 7714a2a..8ae31e8 100644 --- a/resources/build.xml +++ b/resources/build.xml @@ -15,11 +15,11 @@ - + - + diff --git a/src/controlP5/ControlP5.java b/src/controlP5/ControlP5.java index 6467770..5ba4747 100755 --- a/src/controlP5/ControlP5.java +++ b/src/controlP5/ControlP5.java @@ -98,7 +98,7 @@ public class ControlP5 extends ControlP5Base { /** * @exclude */ - @ControlP5.Invisible public static final String VERSION = "2.2.4";// "##version##"; + @ControlP5.Invisible public static final String VERSION = "2.2.5";// "##version##"; /** * @exclude diff --git a/src/controlP5/ScrollableList.java b/src/controlP5/ScrollableList.java index 9bb9576..b2bc161 100644 --- a/src/controlP5/ScrollableList.java +++ b/src/controlP5/ScrollableList.java @@ -134,7 +134,11 @@ public class ScrollableList extends Controller< ScrollableList > implements Cont // n += itemRange; /* UP */ int index = ( int ) n + itemIndexOffset; - + + if ( index >= items.size( ) ) { + return; + } + Map m = items.get( index ); switch ( _myType ) { diff --git a/src/controlP5/changeLog.txt b/src/controlP5/changeLog.txt index 45ab97a..f61d134 100755 --- a/src/controlP5/changeLog.txt +++ b/src/controlP5/changeLog.txt @@ -1,3 +1,8 @@ +2015-03-29 Andreas Schlegel + + * src controlP5.ScrollabelList: + fixing ArrayOutOfBounds error as reported on github under issue 3 https://github.com/sojamo/controlp5/issues/3 + 2014-09-08 Andreas Schlegel * src controlP5.Icon: