halfdan/eva2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit of MK branch rev. 647 (minor change to AbstractStatistics/StringSelection)

Browse Source
This commit is contained in:
Marcel Kronfeld
2010-09-17 14:02:18 +00:00
parent 33dc1be0bf
commit 59ce3e693b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/eva2/server/stat/AbstractStatistics.java
View File

@@ -806,10 +806,10 @@ public abstract class AbstractStatistics implements InterfaceTextListener, Inter
Iterator<String> hIter = headers.iterator(); Iterator<String> hIter = headers.iterator();
Iterator<String> mIter = (metaInfo!=null) ? metaInfo.iterator() : null; Iterator<String> mIter = (metaInfo!=null) ? metaInfo.iterator() : null;
if (!lastIsShowFull) while (hIter.hasNext()) { if (!lastIsShowFull) while (hIter.hasNext()) {
if (mIter!=null) mIter.next(); if (mIter!=null && mIter.hasNext()) mIter.next();
if (!isRequestedAdditionalField(hIter.next())) { if (!isRequestedAdditionalField(hIter.next())) {
hIter.remove(); hIter.remove();
if (mIter!=null) mIter.remove(); if (mIter!=null && mIter.hasNext()) mIter.remove();
} }
} }
return headers; return headers;

6
src/eva2/tools/StringSelection.java
View File

@@ -137,7 +137,11 @@ public class StringSelection implements Serializable {
* @return * @return
*/ */
public boolean isSelected(int i) { public boolean isSelected(int i) {
return selStates[i]; try {
return selStates[i];
} catch(ArrayIndexOutOfBoundsException e) {
throw new ArrayIndexOutOfBoundsException(e.getMessage()+" - inconsistent implementation of InterfaceAdditionalPopulationInformer?");
}
} }
/** /**