CleanUp: [RJ-Data] Update formatting

Change-Id: Idabdb081351a4afa4d4878811819116df95decd7
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RComplexStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RComplexStore.java
index 20cc1fd..7df5232 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RComplexStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RComplexStore.java
@@ -56,7 +56,7 @@
 		public int hashCode() {
 			final long realBits= Double.doubleToLongBits(this.realValue);
 			final long imaginaryBits= Double.doubleToLongBits(this.imaginaryValue) + 1;
-			return (int) ((realBits ^ (realBits >>> 32)) | (imaginaryBits ^ (imaginaryBits >>> 32)));
+			return (int)((realBits ^ (realBits >>> 32)) | (imaginaryBits ^ (imaginaryBits >>> 32)));
 		}
 		
 		@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RDataUtils.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RDataUtils.java
index e1a8586..301bcfa 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RDataUtils.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RDataUtils.java
@@ -634,14 +634,14 @@
 		if (length < 0 || length > Integer.MAX_VALUE) {
 			throw new UnexpectedRDataException("Unexpected R data length: " + length + ", but <= 2^31-1 expected.");
 		}
-		return (int) length;
+		return (int)length;
 	}
 	
 	public static final int checkIntIdx(final long idx) throws UnexpectedRDataException {
 		if (idx < 0 || idx >= Integer.MAX_VALUE) {
 			throw new UnexpectedRDataException("Unexpected R data index: " + idx + ", but < 2^31-1 expected.");
 		}
-		return (int) idx;
+		return (int)idx;
 	}
 	
 	public static final <T extends RObject> T checkLengthEqual(final T obj, final long length) throws UnexpectedRDataException {
@@ -788,7 +788,7 @@
 			throw new IllegalArgumentException();
 		}
 		if (toIdx <= Integer.MAX_VALUE) {
-			return doBinarySearch(data, (int) fromIdx, (int) toIdx - 1, value);
+			return doBinarySearch(data, (int)fromIdx, (int)toIdx - 1, value);
 		}
 		
 		return doBinarySearch(data, fromIdx, toIdx - 1, value);
@@ -902,7 +902,7 @@
 			throw new IllegalArgumentException();
 		}
 		if (toIdx <= Integer.MAX_VALUE) {
-			return doBinarySearch(data, (int) fromIdx, (int) toIdx - 1, value);
+			return doBinarySearch(data, (int)fromIdx, (int)toIdx - 1, value);
 		}
 		
 		return doBinarySearch(data, fromIdx, toIdx - 1, value);
@@ -994,11 +994,11 @@
 	}
 	
 	public static final long decodeLongFromRaw(final byte[] raw, int idx) {
-		return(	((long) (raw[idx++] & 0xff) << 56) |
-				((long) (raw[idx++] & 0xff) << 48) |
-				((long) (raw[idx++] & 0xff) << 40) |
-				((long) (raw[idx++] & 0xff) << 32) |
-				((long) (raw[idx++] & 0xff) << 24) |
+		return(	((long)(raw[idx++] & 0xff) << 56) |
+				((long)(raw[idx++] & 0xff) << 48) |
+				((long)(raw[idx++] & 0xff) << 40) |
+				((long)(raw[idx++] & 0xff) << 32) |
+				((long)(raw[idx++] & 0xff) << 24) |
 				((raw[idx++] & 0xff) << 16) |
 				((raw[idx++] & 0xff) << 8) |
 				((raw[idx] & 0xff)) );
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RJIO.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RJIO.java
index 72107a0..912b3cb 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RJIO.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/RJIO.java
@@ -102,7 +102,7 @@
 		this.ib= this.bb.asIntBuffer();
 		this.db= this.bb.asDoubleBuffer();
 		
-		this.serialKey= (int) System.currentTimeMillis();
+		this.serialKey= (int)System.currentTimeMillis();
 	}
 	
 	
@@ -270,7 +270,7 @@
 	
 	public void writeVULong(final byte grade, final long value) throws IOException {
 		if (grade == 0) {
-			this.out.writeByte((int) value);
+			this.out.writeByte((int)value);
 			return;
 		}
 		final byte[] ba= this.ba;
@@ -685,41 +685,41 @@
 					(ba[2] & 0xff) );
 		case 3:
 			this.in.read(ba, 0, 4);
-			return (((long) (ba[0] & 0xff) << 24) |
+			return (((long)(ba[0] & 0xff) << 24) |
 					((ba[1] & 0xff) << 16) |
 					((ba[2] & 0xff) << 8) |
 					(ba[3] & 0xff) );
 		case 4:
 			this.in.read(ba, 0, 5);
-			return (((long) (ba[0] & 0xff) << 32) |
-					((long) (ba[1] & 0xff) << 24) |
+			return (((long)(ba[0] & 0xff) << 32) |
+					((long)(ba[1] & 0xff) << 24) |
 					((ba[2] & 0xff) << 16) |
 					((ba[3] & 0xff) << 8) |
 					(ba[4] & 0xff) );
 		case 5:
 			this.in.read(ba, 0, 6);
-			return (((long) (ba[0] & 0xff) << 40) |
-					((long) (ba[1] & 0xff) << 32) |
-					((long) (ba[2] & 0xff) << 24) |
+			return (((long)(ba[0] & 0xff) << 40) |
+					((long)(ba[1] & 0xff) << 32) |
+					((long)(ba[2] & 0xff) << 24) |
 					((ba[3] & 0xff) << 16) |
 					((ba[4] & 0xff) << 8) |
 					(ba[5] & 0xff) );
 		case 6:
 			this.in.read(ba, 0, 7);
-			return (((long) (ba[0] & 0xff) << 48) |
-					((long) (ba[1] & 0xff) << 40) |
-					((long) (ba[2] & 0xff) << 32) |
-					((long) (ba[3] & 0xff) << 24) |
+			return (((long)(ba[0] & 0xff) << 48) |
+					((long)(ba[1] & 0xff) << 40) |
+					((long)(ba[2] & 0xff) << 32) |
+					((long)(ba[3] & 0xff) << 24) |
 					((ba[4] & 0xff) << 16) |
 					((ba[5] & 0xff) << 8) |
 					(ba[6] & 0xff) );
 		case 7:
 			this.in.read(ba, 0, 8);
-			return (((long) (ba[0] & 0xff) << 56) |
-					((long) (ba[1] & 0xff) << 48) |
-					((long) (ba[2] & 0xff) << 40) |
-					((long) (ba[3] & 0xff) << 32) |
-					((long) (ba[4] & 0xff) << 24) |
+			return (((long)(ba[0] & 0xff) << 56) |
+					((long)(ba[1] & 0xff) << 48) |
+					((long)(ba[2] & 0xff) << 40) |
+					((long)(ba[3] & 0xff) << 32) |
+					((long)(ba[4] & 0xff) << 24) |
 					((ba[5] & 0xff) << 16) |
 					((ba[6] & 0xff) << 8) |
 					(ba[7] & 0xff) );
@@ -750,11 +750,11 @@
 				in.readFully(this.ba, 0, bn);
 				for (int db= 0; db < bn; db+= 8) {
 					array[db >>> 3]= Double.longBitsToDouble(
-							((long) (this.ba[db] & 0xff) << 56) |
-							((long) (this.ba[db+1] & 0xff) << 48) |
-							((long) (this.ba[db+2] & 0xff) << 40) |
-							((long) (this.ba[db+3] & 0xff) << 32) |
-							((long) (this.ba[db+4] & 0xff) << 24) |
+							((long)(this.ba[db] & 0xff) << 56) |
+							((long)(this.ba[db+1] & 0xff) << 48) |
+							((long)(this.ba[db+2] & 0xff) << 40) |
+							((long)(this.ba[db+3] & 0xff) << 32) |
+							((long)(this.ba[db+4] & 0xff) << 24) |
 							((this.ba[db+5] & 0xff) << 16) |
 							((this.ba[db+6] & 0xff) << 8) |
 							((this.ba[db+7] & 0xff)) );
@@ -820,11 +820,11 @@
 						break;
 					case 6:
 						array[dr++]= Double.longBitsToDouble(
-								((long) (this.ba[bcount] & 0xff) << 56) |
-								((long) (this.ba[bcount+1] & 0xff) << 48) |
-								((long) (this.ba[bcount+2] & 0xff) << 40) |
-								((long) (this.ba[bcount+3] & 0xff) << 32) |
-								((long) (this.ba[bcount+4] & 0xff) << 24) |
+								((long)(this.ba[bcount] & 0xff) << 56) |
+								((long)(this.ba[bcount+1] & 0xff) << 48) |
+								((long)(this.ba[bcount+2] & 0xff) << 40) |
+								((long)(this.ba[bcount+3] & 0xff) << 32) |
+								((long)(this.ba[bcount+4] & 0xff) << 24) |
 								((this.ba[bcount+5] & 0xff) << 16) |
 								((in.readByte() & 0xff) << 8) |
 								((in.readByte() & 0xff)) );
@@ -832,11 +832,11 @@
 						break;
 					case 7:
 						array[dr++]= Double.longBitsToDouble(
-								((long) (this.ba[bcount] & 0xff) << 56) |
-								((long) (this.ba[bcount+1] & 0xff) << 48) |
-								((long) (this.ba[bcount+2] & 0xff) << 40) |
-								((long) (this.ba[bcount+3] & 0xff) << 32) |
-								((long) (this.ba[bcount+4] & 0xff) << 24) |
+								((long)(this.ba[bcount] & 0xff) << 56) |
+								((long)(this.ba[bcount+1] & 0xff) << 48) |
+								((long)(this.ba[bcount+2] & 0xff) << 40) |
+								((long)(this.ba[bcount+3] & 0xff) << 32) |
+								((long)(this.ba[bcount+4] & 0xff) << 24) |
 								((this.ba[bcount+5] & 0xff) << 16) |
 								((this.ba[bcount+6] & 0xff) << 8) |
 								((in.readByte() & 0xff)) );
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractCharacterStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractCharacterStore.java
index a5b3c67..bd2877e 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractCharacterStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractCharacterStore.java
@@ -137,7 +137,7 @@
 			return true;
 		}
 		else if (length <= Integer.MAX_VALUE) {
-			final int ilength= (int) length;
+			final int ilength= (int)length;
 			for (int idx= 0; idx < ilength; idx++) {
 				if (!(isNA(idx) ? other.isNA(idx) :
 						getChar(idx).equals(other.getChar(idx)) )) {
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractFactorStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractFactorStore.java
index c661208..2ac3357 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractFactorStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractFactorStore.java
@@ -78,12 +78,12 @@
 	
 	@Override
 	public final void setNum(final int idx, final double real) {
-		setInt(idx, (int) real);
+		setInt(idx, (int)real);
 	}
 	
 	@Override
 	public final void setNum(final long idx, final double real) {
-		setInt(idx, (int) real);
+		setInt(idx, (int)real);
 	}
 	
 	
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractIntegerStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractIntegerStore.java
index 7e4b5ce..b3f4229 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractIntegerStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractIntegerStore.java
@@ -78,12 +78,12 @@
 	
 	@Override
 	public final void setNum(final int idx, final double real) {
-		setInt(idx, (int) real);
+		setInt(idx, (int)real);
 	}
 	
 	@Override
 	public final void setNum(final long idx, final double real) {
-		setInt(idx, (int) real);
+		setInt(idx, (int)real);
 	}
 	
 	@Override
@@ -132,7 +132,7 @@
 			return true;
 		}
 		else if (length <= Integer.MAX_VALUE) {
-			final int ilength= (int) length;
+			final int ilength= (int)length;
 			for (int idx= 0; idx < ilength; idx++) {
 				if (!(isNA(idx) ? other.isNA(idx) :
 						getInt(idx) == other.getInt(idx) )) {
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractLogicalStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractLogicalStore.java
index a634d38..07e4672 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractLogicalStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractLogicalStore.java
@@ -128,7 +128,7 @@
 			return true;
 		}
 		else if (length <= Integer.MAX_VALUE) {
-			final int ilength= (int) length;
+			final int ilength= (int)length;
 			for (int idx= 0; idx < ilength; idx++) {
 				if (!(isNA(idx) ? other.isNA(idx) :
 						getLogi(idx) == other.getLogi(idx) )) {
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractNumericStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractNumericStore.java
index 466db28..0041eaa 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractNumericStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractNumericStore.java
@@ -73,12 +73,12 @@
 	
 	@Override
 	public final int getInt(final int idx) {
-		return (int) getNum(idx);
+		return (int)getNum(idx);
 	}
 	
 	@Override
 	public final int getInt(final long idx) {
-		return (int) getNum(idx);
+		return (int)getNum(idx);
 	}
 	
 	@Override
@@ -136,7 +136,7 @@
 			return true;
 		}
 		else if (length <= Integer.MAX_VALUE) {
-			final int ilength= (int) length;
+			final int ilength= (int)length;
 			for (int idx= 0; idx < ilength; idx++) {
 				if (!(isMissing(idx) ?
 						(isNA(idx) ? other.isNA(idx) : other.isMissing(idx)) :
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRObject.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRObject.java
index eea8927..65f1a3f 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRObject.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRObject.java
@@ -37,7 +37,7 @@
 					throw new IllegalArgumentException("Unexpected list segment length (" + array[i].length + ", but " + segmentLength + " expected)");
 				}
 			}
-			length= last * (long) segmentLength;
+			length= last * (long)segmentLength;
 			if (array[last].length > segmentLength) {
 				throw new IllegalArgumentException("Unexpected list segment length (" + array[last].length + ", but max " + segmentLength + " expected)");
 			}
@@ -50,12 +50,12 @@
 		if (length == 0) {
 			return EMPTY_ROBJECT_2dARRAY;
 		}
-		final RObject[][] array= new RObject[1 + (int) ((length - 1) / segmentLength)][];
+		final RObject[][] array= new RObject[1 + (int)((length - 1) / segmentLength)][];
 		final int last= array.length - 1;
 		for (int i= 0; i < last; i++) {
 			array[i]= new RObject[segmentLength];
 		}
-		{	final int restLength= (int) (length % segmentLength);
+		{	final int restLength= (int)(length % segmentLength);
 			array[last]= new RObject[(restLength == 0) ? segmentLength : restLength];
 		}
 		return array;
@@ -66,7 +66,7 @@
 		if (length >= Integer.MAX_VALUE) {
 			throw new IOException("Long length (" + length + ") not supported by this implementation.");
 		}
-		return (int) length;
+		return (int)length;
 	}
 	
 	
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRStore.java
index f8c65dd..de54ff0 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/AbstractRStore.java
@@ -179,12 +179,12 @@
 		if (length == 0) {
 			return EMPTY_INT_2dARRAY;
 		}
-		final var array= new int[1 + (int) ((length - 1) / segmentLength)] @NonNull[];
+		final var array= new int [1 + (int)((length - 1) / segmentLength)] @NonNull[];
 		final int last= array.length - 1;
 		for (int i= 0; i < last; i++) {
 			array[i]= new int[segmentLength];
 		}
-		{	final int restLength= (int) (length % segmentLength);
+		{	final int restLength= (int)(length % segmentLength);
 		array[last]= new int[(restLength == 0) ? segmentLength : restLength];
 		}
 		return array;
@@ -194,12 +194,12 @@
 		if (length == 0) {
 			return EMPTY_DOUBLE_2dARRAY;
 		}
-		final var array= new double [1 + (int) ((length - 1) / segmentLength)] @NonNull[];
+		final var array= new double [1 + (int)((length - 1) / segmentLength)] @NonNull[];
 		final int last= array.length - 1;
 		for (int i= 0; i < last; i++) {
 			array[i]= new double[segmentLength];
 		}
-		{	final int restLength= (int) (length % segmentLength);
+		{	final int restLength= (int)(length % segmentLength);
 			array[last]= new double[(restLength == 0) ? segmentLength : restLength];
 		}
 		return array;
@@ -209,12 +209,12 @@
 		if (length == 0) {
 			return EMPTY_STRING_2dARRAY;
 		}
-		final var array= new String [1 + (int) ((length - 1) / segmentLength)] @NonNull[];
+		final var array= new String [1 + (int)((length - 1) / segmentLength)] @NonNull[];
 		final int last= array.length - 1;
 		for (int i= 0; i < last; i++) {
 			array[i]= new String[segmentLength];
 		}
-		{	final int restLength= (int) (length % segmentLength);
+		{	final int restLength= (int)(length % segmentLength);
 			array[last]= new String[(restLength == 0) ? segmentLength : restLength];
 		}
 		return array;
@@ -224,12 +224,12 @@
 		if (length == 0) {
 			return EMPTY_BYTE_2dARRAY;
 		}
-		final var array= new byte [1 + (int) ((length - 1) / segmentLength)] @NonNull[];
+		final var array= new byte [1 + (int)((length - 1) / segmentLength)] @NonNull[];
 		final int last= array.length - 1;
 		for (int i= 0; i < last; i++) {
 			array[i]= new byte[segmentLength];
 		}
-		{	final int restLength= (int) (length % segmentLength);
+		{	final int restLength= (int)(length % segmentLength);
 		array[last]= new byte[(restLength == 0) ? segmentLength : restLength];
 		}
 		return array;
@@ -702,7 +702,7 @@
 		if (length > Integer.MAX_VALUE) {
 			throw new UnsupportedOperationException("Not supported for long data");
 		}
-		return (int) length;
+		return (int)length;
 	}
 	
 	
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/DefaultRObjectFactory.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/DefaultRObjectFactory.java
index 85a0596..8238b3a 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/DefaultRObjectFactory.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/DefaultRObjectFactory.java
@@ -435,7 +435,7 @@
 	
 	public RLogicalStore createLogiData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RLogicalByte32Store((int) length) :
+				new RLogicalByte32Store((int)length) :
 				new RLogicalByteFix64Store(length);
 	}
 	
@@ -446,7 +446,7 @@
 	
 	public RIntegerStore createIntData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RInteger32Store((int) length) :
+				new RInteger32Store((int)length) :
 				new RIntegerFix64Store(length);
 	}
 	
@@ -457,7 +457,7 @@
 	
 	public RNumericStore createNumData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RNumericB32Store((int) length) :
+				new RNumericB32Store((int)length) :
 				new RNumericBFix64Store(length);
 	}
 	
@@ -468,7 +468,7 @@
 	
 	public RComplexStore createCplxData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RComplexB32Store((int) length) :
+				new RComplexB32Store((int)length) :
 				new RComplexBFix64Store(length);
 	}
 	
@@ -479,7 +479,7 @@
 	
 	public RCharacterStore createCharData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RCharacter32Store((int) length) :
+				new RCharacter32Store((int)length) :
 				new RCharacterFix64Store(length);
 	}
 	
@@ -490,7 +490,7 @@
 	
 	public RRawStore createRawData(final long length) {
 		return (length <= this.storeLengthFixLong) ?
-				new RRaw32Store((int) length) :
+				new RRaw32Store((int)length) :
 				new RRawFix64Store(length);
 	}
 	
@@ -598,19 +598,19 @@
 			if (length <= Integer.MAX_VALUE) {
 				switch (storeType) {
 				case RStore.LOGICAL:
-					return new RLogicalByte32Store(io, (int) length);
+					return new RLogicalByte32Store(io, (int)length);
 				case RStore.INTEGER:
-					return new RInteger32Store(io, (int) length);
+					return new RInteger32Store(io, (int)length);
 				case RStore.NUMERIC:
-					return new RNumericB32Store(io, (int) length);
+					return new RNumericB32Store(io, (int)length);
 				case RStore.COMPLEX:
-					return new RComplexB32Store(io, (int) length);
+					return new RComplexB32Store(io, (int)length);
 				case RStore.CHARACTER:
-					return new RCharacter32Store(io, (int) length);
+					return new RCharacter32Store(io, (int)length);
 				case RStore.RAW:
-					return new RRaw32Store(io, (int) length);
+					return new RRaw32Store(io, (int)length);
 				case RStore.FACTOR:
-					return new RFactor32Store(io, (int) length);
+					return new RFactor32Store(io, (int)length);
 				default:
 					throw new IOException("store type= " + storeType);
 				}
@@ -700,7 +700,7 @@
 		final byte type= io.readByte();
 		if (type == RStore.CHARACTER) {
 			return (length <= Integer.MAX_VALUE) ?
-					new RCharacter32Store(io, (int) length) :
+					new RCharacter32Store(io, (int)length) :
 					new RCharacterFix64Store(io, length);
 		}
 		if (type == 0) {
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacter32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacter32Store.java
index f899dba..4576ad0 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacter32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacter32Store.java
@@ -146,7 +146,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.charValues[(int) idx] == null);
+		return (this.charValues[(int)idx] == null);
 	}
 	
 	@Override
@@ -162,10 +162,10 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-//		if (this.charValues[(int) idx] == null) {
+//		if (this.charValues[(int)idx] == null) {
 //			return;
 //		}
-		this.charValues[(int) idx]= null;
+		this.charValues[(int)idx]= null;
 	}
 	
 	@Override
@@ -178,7 +178,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.charValues[(int) idx] == null);
+		return (this.charValues[(int)idx] == null);
 	}
 	
 	
@@ -194,7 +194,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.charValues[(int) idx];
+		return this.charValues[(int)idx];
 	}
 	
 	@Override
@@ -209,7 +209,7 @@
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
 //		assert (value != null);
-		this.charValues[(int) idx]= value;
+		this.charValues[(int)idx]= value;
 	}
 	
 	
@@ -267,7 +267,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.charValues[(int) idx];
+		return this.charValues[(int)idx];
 	}
 	
 	@Override
@@ -288,7 +288,7 @@
 		}
 		final int l= this.length;
 		final String[] chars= this.charValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (chars[i] == null) {
 				return i;
 			}
@@ -321,7 +321,7 @@
 		}
 		final int l= this.length;
 		final String[] chars= this.charValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (chars[i] != null && chars[i].equals(character)) {
 				return i;
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacterFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacterFix64Store.java
index 3c8e9e8..b3b3b88 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacterFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RCharacterFix64Store.java
@@ -85,7 +85,7 @@
 	
 	@Override
 	public boolean isNA(final long idx) {
-		return (this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == null);
+		return (this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == null);
 	}
 	
 	@Override
@@ -95,7 +95,7 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]= null;
+		this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]= null;
 	}
 	
 	@Override
@@ -105,7 +105,7 @@
 	
 	@Override
 	public boolean isMissing(final long idx) {
-		return (this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == null);
+		return (this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == null);
 	}
 	
 	@Override
@@ -115,7 +115,7 @@
 	
 	@Override
 	public String getChar(final long idx) {
-		return this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -127,7 +127,7 @@
 	@Override
 	public void setChar(final long idx, final String value) {
 //		assert (value != null);
-		this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]= value;
+		this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]= value;
 	}
 	
 	
@@ -144,7 +144,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.charValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.charValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -166,13 +166,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.charValues.length) {
 			final String[] chars= this.charValues[i];
 			while (j < chars.length) {
 				if (chars[j] == null) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
@@ -189,13 +189,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.charValues.length) {
 			final String[] chars= this.charValues[i];
 			while (j < chars.length) {
 				if (chars[j] != null && chars[j].equals(character)) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexB32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexB32Store.java
index e837016..88179f4 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexB32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexB32Store.java
@@ -150,7 +150,7 @@
 	public boolean isNA(final int idx) {
 		final double v= this.realValues[idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -158,9 +158,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) idx];
+		final double v= this.realValues[(int)idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -174,15 +174,15 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.realValues[(int) idx]= NA_numeric_DOUBLE;
-		this.imaginaryValues[(int) idx]= NA_numeric_DOUBLE;
+		this.realValues[(int)idx]= NA_numeric_DOUBLE;
+		this.imaginaryValues[(int)idx]= NA_numeric_DOUBLE;
 	}
 	
 	@Override
 	public boolean isNaN(final int idx) {
 		final double v= this.realValues[idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -190,9 +190,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double value= this.realValues[(int) idx];
+		final double value= this.realValues[(int)idx];
 		return (Double.isNaN(value)
-				&& (int) Double.doubleToRawLongBits(value) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(value) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -205,7 +205,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (Double.isNaN(this.realValues[(int) idx]));
+		return (Double.isNaN(this.realValues[(int)idx]));
 	}
 	
 	
@@ -219,7 +219,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.realValues[(int) idx];
+		return this.realValues[(int)idx];
 	}
 	
 	@Override
@@ -232,7 +232,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.imaginaryValues[(int) idx];
+		return this.imaginaryValues[(int)idx];
 	}
 	
 	@Override
@@ -253,12 +253,12 @@
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
 		if (Double.isNaN(real) || Double.isNaN(imaginary)) {
-			this.realValues[(int) idx]= NaN_numeric_DOUBLE;
-			this.imaginaryValues[(int) idx]= NaN_numeric_DOUBLE;
+			this.realValues[(int)idx]= NaN_numeric_DOUBLE;
+			this.imaginaryValues[(int)idx]= NaN_numeric_DOUBLE;
 		}
 		else {
-			this.realValues[(int) idx]= real;
-			this.imaginaryValues[(int) idx]= imaginary;
+			this.realValues[(int)idx]= real;
+			this.imaginaryValues[(int)idx]= imaginary;
 		}
 	}
 	
@@ -280,12 +280,12 @@
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
 		if (Double.isNaN(real)) {
-			this.realValues[(int) idx]= NaN_numeric_DOUBLE;
-			this.imaginaryValues[(int) idx]= NaN_numeric_DOUBLE;
+			this.realValues[(int)idx]= NaN_numeric_DOUBLE;
+			this.imaginaryValues[(int)idx]= NaN_numeric_DOUBLE;
 		}
 		else {
-			this.realValues[(int) idx]= real;
-			this.imaginaryValues[(int) idx]= 0.0;
+			this.realValues[(int)idx]= real;
+			this.imaginaryValues[(int)idx]= 0.0;
 		}
 	}
 	
@@ -349,7 +349,7 @@
 		}
 		final double v= this.realValues[idx];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 			new Complex(v, this.imaginaryValues[idx]) :
 			null;
 	}
@@ -359,10 +359,10 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) idx];
+		final double v= this.realValues[(int)idx];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
-			new Complex(v, this.imaginaryValues[(int) idx]) :
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+			new Complex(v, this.imaginaryValues[(int)idx]) :
 			null;
 	}
 	
@@ -374,7 +374,7 @@
 		for (int i= 0; i < array.length; i++) {
 			final double v= reals[i];
 			if (!Double.isNaN(v)
-					|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
+					|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
 				array[i]= new Complex(v, imgs[i]);
 			}
 		}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexBFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexBFix64Store.java
index 9d26707..344afdb 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexBFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RComplexBFix64Store.java
@@ -113,14 +113,14 @@
 	public boolean isNA(final int idx) {
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
 	public boolean isNA(final long idx) {
-		final double v= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double v= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -133,9 +133,9 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_numeric_DOUBLE;
-		this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_numeric_DOUBLE;
 	}
 	
@@ -143,14 +143,14 @@
 	public boolean isNaN(final int idx) {
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
 	public boolean isNaN(final long idx) {
-		final double value= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double value= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (Double.isNaN(value)
-				&& (int) Double.doubleToRawLongBits(value) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(value) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -162,7 +162,7 @@
 	@Override
 	public boolean isMissing(final long idx) {
 		return (Double.isNaN(
-				this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] ));
+				this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] ));
 	}
 	
 	@Override
@@ -172,7 +172,7 @@
 	
 	@Override
 	public double getCplxRe(final long idx) {
-		return this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -182,7 +182,7 @@
 	
 	@Override
 	public double getCplxIm(final long idx) {
-		return this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -204,15 +204,15 @@
 	@Override
 	public void setCplx(final long idx, final double real, final double imaginary) {
 		if (Double.isNaN(real) || Double.isNaN(imaginary)) {
-			this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					NaN_numeric_DOUBLE;
-			this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					NaN_numeric_DOUBLE;
 		}
 		else {
-			this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					real;
-			this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					imaginary;
 		}
 	}
@@ -236,15 +236,15 @@
 	@Override
 	public void setNum(final long idx, final double real) {
 		if (Double.isNaN(real)) {
-			this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					NaN_numeric_DOUBLE;
-			this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					NaN_numeric_DOUBLE;
 		}
 		else {
-			this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					real;
-			this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+			this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 					0.0;
 		}
 	}
@@ -257,7 +257,7 @@
 		}
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 			new Complex(v, this.imaginaryValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH]) :
 			null;
 	}
@@ -267,10 +267,10 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double v= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
-			new Complex(v, this.imaginaryValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]) :
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+			new Complex(v, this.imaginaryValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]) :
 			null;
 	}
 	
@@ -285,7 +285,7 @@
 			for (int j= 0; j < reals.length; j++) {
 				final double v= reals[j];
 				if (!Double.isNaN(v)
-						|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
+						|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
 					array[k]= new Complex(v, imgs[i]);
 				}
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RDataFrameFix64Impl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RDataFrameFix64Impl.java
index fd2a380..4ad1082 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RDataFrameFix64Impl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RDataFrameFix64Impl.java
@@ -49,7 +49,7 @@
 					for (int j= 0; j < segment.length; j++) {
 						if (segment[j].getRObjectType() != RObject.TYPE_VECTOR
 								|| (segment[j].getLength() != this.rowCount)) {
-							throw new IllegalArgumentException("Length of column " + (i * (long) SEGMENT_LENGTH + j) + ": " + segment[j].getLength());
+							throw new IllegalArgumentException("Length of column " + (i * (long)SEGMENT_LENGTH + j) + ": " + segment[j].getLength());
 						}
 					}
 				}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/REnvironmentImpl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/REnvironmentImpl.java
index afc126f..6f744e3 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/REnvironmentImpl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/REnvironmentImpl.java
@@ -71,7 +71,7 @@
 		//-- data
 		this.handle= io.readLong();
 		this.environmentName= io.readString();
-		final int l= this.length= (int) io.readVULong((byte) (options & RObjectFactory.O_LENGTHGRADE_MASK));
+		final int l= this.length= (int)io.readVULong((byte) (options & RObjectFactory.O_LENGTHGRADE_MASK));
 		
 		if ((options & RObjectFactory.O_NO_CHILDREN) != 0) {
 			this.namesAttribute= null;
@@ -188,7 +188,7 @@
 		if (idx < 0 || idx >= Integer.MAX_VALUE) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.components[(int) idx];
+		return this.components[(int)idx];
 	}
 	
 	@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactor32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactor32Store.java
index 6493ee7..58074c7 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactor32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactor32Store.java
@@ -127,7 +127,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.codes[(int) idx] <= 0);
+		return (this.codes[(int)idx] <= 0);
 	}
 	
 	@Override
@@ -140,7 +140,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.codes[(int) idx]= NA_integer_INT;
+		this.codes[(int)idx]= NA_integer_INT;
 	}
 	
 	@Override
@@ -153,7 +153,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.codes[(int) idx] <= 0);
+		return (this.codes[(int)idx] <= 0);
 	}
 	
 	@Override
@@ -166,7 +166,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.codes[(int) idx];
+		return this.codes[(int)idx];
 	}
 	
 	@Override
@@ -185,7 +185,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.codes[(int) idx]= code;
+		this.codes[(int)idx]= code;
 	}
 	
 	@Override
@@ -199,7 +199,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final int code= this.codes[(int) idx];
+		final int code= this.codes[(int)idx];
 		return (code > 0) ? this.codeLabels.getChar(code - 1): null;
 	}
 	
@@ -221,7 +221,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.codes[(int) idx]= code;
+		this.codes[(int)idx]= code;
 	}
 	
 	
@@ -347,7 +347,7 @@
 		if (idx < 0 || idx >= length()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final int code= this.codes[(int) idx];
+		final int code= this.codes[(int)idx];
 		return (code > 0) ?
 				Integer.valueOf(code) :
 				null;
@@ -377,7 +377,7 @@
 		}
 		final int l= length();
 		final int[] ints= this.codes;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (ints[i] == NA_integer_INT) {
 				return i;
 			}
@@ -396,7 +396,7 @@
 		}
 		final int l= length();
 		final int[] ints= this.codes;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (ints[i] == code) {
 				return i;
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorFix64Store.java
index 0e0b5ac..9abea94 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorFix64Store.java
@@ -99,7 +99,7 @@
 	
 	@Override
 	public boolean isNA(final long idx) {
-		return (this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] <= 0);
+		return (this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] <= 0);
 	}
 	
 	@Override
@@ -110,7 +110,7 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_integer_INT;
 	}
 	
@@ -121,7 +121,7 @@
 	
 	@Override
 	public boolean isMissing(final long idx) {
-		return (this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] <= 0);
+		return (this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] <= 0);
 	}
 	
 	@Override
@@ -131,7 +131,7 @@
 	
 	@Override
 	public int getInt(final long idx) {
-		return this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -147,7 +147,7 @@
 		if (code <= 0 || code > this.codeLabels.length()) {
 			throw new IllegalArgumentException();
 		}
-		this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]= code;
+		this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]= code;
 	}
 	
 	@Override
@@ -158,7 +158,7 @@
 	
 	@Override
 	public String getChar(final long idx) {
-		final int code= this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final int code= this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (code > 0) ? this.codeLabels.getChar(code - 1): null;
 	}
 	
@@ -177,7 +177,7 @@
 		if (code <= 0) {
 			throw new IllegalArgumentException();
 		}
-		this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]= code;
+		this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]= code;
 	}
 	
 	
@@ -224,7 +224,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final int code= this.codes[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final int code= this.codes[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (code > 0) ?
 				Integer.valueOf(code) :
 				null;
@@ -253,13 +253,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.codes.length) {
 			final int[] ints= this.codes[i];
 			while (j < ints.length) {
 				if (ints[i] == NA_integer_INT) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
@@ -276,13 +276,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.codes.length) {
 			final int[] ints= this.codes[i];
 			while (j < ints.length) {
 				if (ints[i] == code) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorStructStore.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorStructStore.java
index c000f6a..3ce059e 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorStructStore.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RFactorStructStore.java
@@ -27,7 +27,7 @@
 		if (levelCount > Integer.MAX_VALUE) {
 			throw new IllegalArgumentException("levelCount > 2^31-1");
 		}
-		return new RFactorStructStore(store.isOrdered(), (int) levels.getLength()) {
+		return new RFactorStructStore(store.isOrdered(), (int)levels.getLength()) {
 			@Override
 			public RCharacterStore getLevels() {
 				return levels;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RInteger32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RInteger32Store.java
index 8fbeb32..739765b 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RInteger32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RInteger32Store.java
@@ -137,7 +137,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.intValues[(int) idx] == NA_integer_INT);
+		return (this.intValues[(int)idx] == NA_integer_INT);
 	}
 	
 	@Override
@@ -150,7 +150,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.intValues[(int) idx]= NA_integer_INT;
+		this.intValues[(int)idx]= NA_integer_INT;
 	}
 	
 	@Override
@@ -163,7 +163,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.intValues[(int) idx] == NA_integer_INT);
+		return (this.intValues[(int)idx] == NA_integer_INT);
 	}
 	
 	@Override
@@ -176,7 +176,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.intValues[(int) idx];
+		return this.intValues[(int)idx];
 	}
 	
 	@Override
@@ -191,7 +191,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.intValues[(int) idx]= value;
+		this.intValues[(int)idx]= value;
 	}
 	
 	
@@ -251,7 +251,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final int v= this.intValues[(int) idx];
+		final int v= this.intValues[(int)idx];
 		return (v != NA_integer_INT) ?
 				Integer.valueOf(v) : null;
 	}
@@ -280,7 +280,7 @@
 		}
 		final int l= this.length;
 		final int[] ints= this.intValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (ints[i] == NA_integer_INT) {
 				return i;
 			}
@@ -299,7 +299,7 @@
 		}
 		final int l= this.length;
 		final int[] ints= this.intValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (ints[i] == integer) {
 				return i;
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RIntegerFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RIntegerFix64Store.java
index dec2b02..fda5bc3 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RIntegerFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RIntegerFix64Store.java
@@ -101,7 +101,7 @@
 	
 	@Override
 	public boolean isNA(final long idx) {
-		return (this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == NA_integer_INT);
+		return (this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == NA_integer_INT);
 	}
 	
 	@Override
@@ -112,7 +112,7 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_integer_INT;
 	}
 	
@@ -123,7 +123,7 @@
 	
 	@Override
 	public boolean isMissing(final long idx) {
-		return (this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == NA_integer_INT);
+		return (this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == NA_integer_INT);
 	}
 	
 	
@@ -134,7 +134,7 @@
 	
 	@Override
 	public int getInt(final long idx) {
-		return this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -147,7 +147,7 @@
 	@Override
 	public void setInt(final long idx, final int value) {
 //		assert (value != NA_integer_INT);
-		this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				value;
 	}
 	
@@ -168,7 +168,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final int v= this.intValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final int v= this.intValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (v != NA_integer_INT) ?
 			Integer.valueOf(v) :
 			null;
@@ -197,13 +197,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.intValues.length) {
 			final int[] ints= this.intValues[i];
 			while (j < ints.length) {
 				if (ints[i] == NA_integer_INT) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
@@ -220,13 +220,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.intValues.length) {
 			final int[] ints= this.intValues[i];
 			while (j < ints.length) {
 				if (ints[i] == integer) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RList32Impl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RList32Impl.java
index 2e3f35e..112c00a 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RList32Impl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RList32Impl.java
@@ -183,7 +183,7 @@
 		if (idx < 0 || idx >= Integer.MAX_VALUE) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.components[(int) idx];
+		return this.components[(int)idx];
 	}
 	
 	@Override
@@ -212,7 +212,7 @@
 //		if (idx < 0 || idx >= Integer.MAX_VALUE) {
 //			throw new IndexOutOfBoundsException(Long.toString(idx));
 //		}
-//		this.components[(int) idx]= component;
+//		this.components[(int)idx]= component;
 //		return true;
 //	}
 	
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RListFix64Impl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RListFix64Impl.java
index df4ac23..9ea0166 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RListFix64Impl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RListFix64Impl.java
@@ -189,7 +189,7 @@
 	
 	@Override
 	public final RObject get(final long idx) {
-		return this.components[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.components[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByte32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByte32Store.java
index 3ee1564..a9325c6 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByte32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByte32Store.java
@@ -167,7 +167,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] == NA_logical_BYTE);
+		return (this.boolValues[(int)idx] == NA_logical_BYTE);
 	}
 	
 	@Override
@@ -180,7 +180,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] == NA_logical_BYTE);
+		return (this.boolValues[(int)idx] == NA_logical_BYTE);
 	}
 	
 	@Override
@@ -193,7 +193,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.boolValues[(int) idx]= NA_logical_BYTE;
+		this.boolValues[(int)idx]= NA_logical_BYTE;
 	}
 	
 	@Override
@@ -206,7 +206,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] == TRUE_BYTE);
+		return (this.boolValues[(int)idx] == TRUE_BYTE);
 	}
 	
 	@Override
@@ -219,7 +219,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.boolValues[(int) idx]= (value) ? TRUE_BYTE : FALSE_BYTE;
+		this.boolValues[(int)idx]= (value) ? TRUE_BYTE : FALSE_BYTE;
 	}
 	
 	
@@ -283,7 +283,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		switch(this.boolValues[(int) idx]) {
+		switch(this.boolValues[(int)idx]) {
 		case TRUE_BYTE:
 			return Boolean.TRUE;
 		case FALSE_BYTE:
@@ -323,7 +323,7 @@
 		}
 		final long l= getLength();
 		final byte[] bools= this.boolValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (bools[i] == NA_logical_BYTE) {
 				return i;
 			}
@@ -343,14 +343,14 @@
 		final int l= this.length;
 		final byte[] bools= this.boolValues;
 		if (integer != 0) {
-			for (int i= (int) fromIdx; i < l; i++) {
+			for (int i= (int)fromIdx; i < l; i++) {
 				if (bools[i] == TRUE_BYTE) {
 					return i;
 				}
 			}
 		}
 		else {
-			for (int i= (int) fromIdx; i < l; i++) {
+			for (int i= (int)fromIdx; i < l; i++) {
 				if (bools[i] == FALSE_BYTE) {
 					return i;
 				}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByteFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByteFix64Store.java
index 8eb95c5..8bdb545 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByteFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalByteFix64Store.java
@@ -116,7 +116,7 @@
 	
 	@Override
 	public boolean isNA(final long idx) {
-		return (this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == NA_logical_BYTE);
+		return (this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == NA_logical_BYTE);
 	}
 	
 	@Override
@@ -126,7 +126,7 @@
 	
 	@Override
 	public boolean isMissing(final long idx) {
-		return (this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == NA_logical_BYTE);
+		return (this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == NA_logical_BYTE);
 	}
 	
 	@Override
@@ -137,7 +137,7 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_logical_BYTE;
 	}
 	
@@ -149,7 +149,7 @@
 	
 	@Override
 	public boolean getLogi(final long idx) {
-		return (this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] == TRUE_BYTE);
+		return (this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] == TRUE_BYTE);
 	}
 	
 	@Override
@@ -160,7 +160,7 @@
 	
 	@Override
 	public void setLogi(final long idx, final boolean value) {
-		this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				(value) ? TRUE_BYTE : FALSE_BYTE;
 	}
 	
@@ -185,7 +185,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		switch(this.boolValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]) {
+		switch(this.boolValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]) {
 		case TRUE_BYTE:
 			return Boolean.TRUE;
 		case FALSE_BYTE:
@@ -224,13 +224,13 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		{	while (i < this.boolValues.length) {
 				final byte[] bools= this.boolValues[i];
 				while (j < bools.length) {
 					if (bools[i] == NA_logical_BYTE) {
-						return (i * (long) SEGMENT_LENGTH) + j;
+						return (i * (long)SEGMENT_LENGTH) + j;
 					}
 				}
 				i++;
@@ -248,14 +248,14 @@
 		if (fromIdx < 0) {
 			fromIdx= 0;
 		}
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		if (integer != 0) {
 			while (i < this.boolValues.length) {
 				final byte[] bools= this.boolValues[i];
 				while (j < bools.length) {
 					if (bools[i] == TRUE_BYTE) {
-						return (i * (long) SEGMENT_LENGTH) + j;
+						return (i * (long)SEGMENT_LENGTH) + j;
 					}
 				}
 				i++;
@@ -267,7 +267,7 @@
 				final byte[] bools= this.boolValues[i];
 				while (j < bools.length) {
 					if (bools[i] == FALSE_BYTE) {
-						return (i * (long) SEGMENT_LENGTH) + j;
+						return (i * (long)SEGMENT_LENGTH) + j;
 					}
 				}
 				i++;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalInt32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalInt32Store.java
index d566ee4..9b0cb2e 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalInt32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RLogicalInt32Store.java
@@ -148,7 +148,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] == NA_logical_INT);
+		return (this.boolValues[(int)idx] == NA_logical_INT);
 	}
 	
 	@Override
@@ -161,7 +161,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] == NA_logical_INT);
+		return (this.boolValues[(int)idx] == NA_logical_INT);
 	}
 	
 	@Override
@@ -174,7 +174,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.boolValues[(int) idx]= NA_logical_INT;
+		this.boolValues[(int)idx]= NA_logical_INT;
 	}
 	
 	
@@ -188,7 +188,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] != FALSE_INT);
+		return (this.boolValues[(int)idx] != FALSE_INT);
 	}
 	
 	@Override
@@ -201,7 +201,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.boolValues[(int) idx]= (value) ? TRUE_INT : FALSE_INT;
+		this.boolValues[(int)idx]= (value) ? TRUE_INT : FALSE_INT;
 	}
 	
 	
@@ -259,8 +259,8 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (this.boolValues[(int) idx] != NA_logical_INT) ?
-				((this.boolValues[(int) idx] == TRUE_INT) ? Boolean.TRUE : Boolean.FALSE) : null;
+		return (this.boolValues[(int)idx] != NA_logical_INT) ?
+				((this.boolValues[(int)idx] == TRUE_INT) ? Boolean.TRUE : Boolean.FALSE) : null;
 	}
 	
 	@Override
@@ -285,7 +285,7 @@
 		}
 		final long l= getLength();
 		final int[] ints= this.boolValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (ints[i] == NA_integer_INT) {
 				return i;
 			}
@@ -305,14 +305,14 @@
 		final int l= this.length;
 		final int[] ints= this.boolValues;
 		if (integer != 0) {
-			for (int i= (int) fromIdx; i < l; i++) {
+			for (int i= (int)fromIdx; i < l; i++) {
 				if (ints[i] == TRUE_INT) {
 					return i;
 				}
 			}
 		}
 		else {
-			for (int i= (int) fromIdx; i < l; i++) {
+			for (int i= (int)fromIdx; i < l; i++) {
 				if (ints[i] == FALSE_INT) {
 					return i;
 				}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericB32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericB32Store.java
index 180ac95..3fcc32d 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericB32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericB32Store.java
@@ -127,7 +127,7 @@
 	public boolean isNA(final int idx) {
 		final double v= this.realValues[idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -135,9 +135,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) idx];
+		final double v= this.realValues[(int)idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -150,14 +150,14 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.realValues[(int) idx]= NA_numeric_DOUBLE;
+		this.realValues[(int)idx]= NA_numeric_DOUBLE;
 	}
 	
 	@Override
 	public boolean isNaN(final int idx) {
 		final double v= this.realValues[idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -165,9 +165,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) idx];
+		final double v= this.realValues[(int)idx];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -180,7 +180,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return (Double.isNaN(this.realValues[(int) idx]));
+		return (Double.isNaN(this.realValues[(int)idx]));
 	}
 	
 	
@@ -194,7 +194,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.realValues[(int) idx];
+		return this.realValues[(int)idx];
 	}
 	
 	@Override
@@ -207,7 +207,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.realValues[(int) idx]= (Double.isNaN(value)) ? NaN_numeric_DOUBLE : value;
+		this.realValues[(int)idx]= (Double.isNaN(value)) ? NaN_numeric_DOUBLE : value;
 	}
 	
 	
@@ -258,7 +258,7 @@
 		}
 		final double v= this.realValues[idx];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 						Double.valueOf(v) : null;
 	}
 	
@@ -267,9 +267,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) idx];
+		final double v= this.realValues[(int)idx];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 						Double.valueOf(v) : null;
 	}
 	
@@ -281,7 +281,7 @@
 		for (int i= 0; i < array.length; i++) {
 			final double v= reals[i];
 			if (!Double.isNaN(v)
-					|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
+					|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
 				array[i]= Double.valueOf(v);
 			}
 		}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericBFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericBFix64Store.java
index b02410c..bc53351 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericBFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RNumericBFix64Store.java
@@ -98,14 +98,14 @@
 	public boolean isNA(final int idx) {
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
 	public boolean isNA(final long idx) {
-		final double v= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double v= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) == NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -116,7 +116,7 @@
 	
 	@Override
 	public void setNA(final long idx) {
-		this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				NA_numeric_DOUBLE;
 	}
 	
@@ -124,14 +124,14 @@
 	public boolean isNaN(final int idx) {
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
 	public boolean isNaN(final long idx) {
-		final double v= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double v= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (Double.isNaN(v)
-				&& (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
+				&& (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH);
 	}
 	
 	@Override
@@ -143,7 +143,7 @@
 	@Override
 	public boolean isMissing(final long idx) {
 		return (Double.isNaN(
-				this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] ));
+				this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] ));
 	}
 	
 	
@@ -154,7 +154,7 @@
 	
 	@Override
 	public double getNum(final long idx) {
-		return this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -165,7 +165,7 @@
 	
 	@Override
 	public void setNum(final long idx, final double value) {
-		this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				(Double.isNaN(value)) ? NaN_numeric_DOUBLE : value;
 	}
 	
@@ -177,7 +177,7 @@
 		}
 		final double v= this.realValues[idx / SEGMENT_LENGTH][idx % SEGMENT_LENGTH];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 			Double.valueOf(v) :
 			null;
 	}
@@ -187,9 +187,9 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		final double v= this.realValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		final double v= this.realValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 		return (!Double.isNaN(v)
-				|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
+				|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) ?
 			Double.valueOf(v) :
 			null;
 	}
@@ -205,7 +205,7 @@
 			for (int j= 0; j < reals.length; j++) {
 				final double v= reals[j];
 				if (!Double.isNaN(v)
-						|| (int) Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
+						|| (int)Double.doubleToRawLongBits(v) != NA_numeric_INT_MATCH) {
 					array[k]= Double.valueOf(v);
 				}
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRaw32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRaw32Store.java
index 46aa9cc..f0f8f69 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRaw32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRaw32Store.java
@@ -105,7 +105,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.byteValues[(int) idx];
+		return this.byteValues[(int)idx];
 	}
 	
 	@Override
@@ -118,7 +118,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		this.byteValues[(int) idx]= value;
+		this.byteValues[(int)idx]= value;
 	}
 	
 	
@@ -175,7 +175,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return Byte.valueOf(this.byteValues[(int) idx]);
+		return Byte.valueOf(this.byteValues[(int)idx]);
 	}
 	
 	@Override
@@ -201,7 +201,7 @@
 		final byte raw= (byte) (integer & 0xff);
 		final int l= this.length;
 		final byte[] raws= this.byteValues;
-		for (int i= (int) fromIdx; i < l; i++) {
+		for (int i= (int)fromIdx; i < l; i++) {
 			if (raws[i] == raw) {
 				return i;
 			}
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRawFix64Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRawFix64Store.java
index d27e597..b8fe43b 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRawFix64Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RRawFix64Store.java
@@ -81,7 +81,7 @@
 	
 	@Override
 	public byte getRaw(final long idx) {
-		return this.byteValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)];
+		return this.byteValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)];
 	}
 	
 	@Override
@@ -92,7 +92,7 @@
 	
 	@Override
 	public void setRaw(final long idx, final byte value) {
-		this.byteValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)] =
+		this.byteValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)] =
 				value;
 	}
 	
@@ -110,7 +110,7 @@
 		if (idx < 0 || idx >= this.length) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return Byte.valueOf(this.byteValues[(int) (idx / SEGMENT_LENGTH)][(int) (idx % SEGMENT_LENGTH)]);
+		return Byte.valueOf(this.byteValues[(int)(idx / SEGMENT_LENGTH)][(int)(idx % SEGMENT_LENGTH)]);
 	}
 	
 	@Override
@@ -134,13 +134,13 @@
 			return -1;
 		}
 		final byte raw= (byte) (integer & 0xff);
-		int i= (int) (fromIdx / SEGMENT_LENGTH);
-		int j= (int) (fromIdx % SEGMENT_LENGTH);
+		int i= (int)(fromIdx / SEGMENT_LENGTH);
+		int j= (int)(fromIdx % SEGMENT_LENGTH);
 		while (i < this.byteValues.length) {
 			final byte[] raws= this.byteValues[i];
 			while (j < raws.length) {
 				if (raws[i] == raw) {
-					return (i * (long) SEGMENT_LENGTH) + j;
+					return (i * (long)SEGMENT_LENGTH) + j;
 				}
 			}
 			i++;
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RReferenceImpl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RReferenceImpl.java
index 637f724..3fc0155 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RReferenceImpl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RReferenceImpl.java
@@ -105,7 +105,7 @@
 	
 	@Override
 	public int hashCode() {
-		return (int) this.handle;
+		return (int)this.handle;
 	}
 	
 	@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RS4ObjectImpl.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RS4ObjectImpl.java
index 3cb8c6b..9c22b89 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RS4ObjectImpl.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RS4ObjectImpl.java
@@ -61,7 +61,7 @@
 		//-- special attributes
 		this.className= io.readString();
 		//-- data
-		final int l= (int) io.readVULong((byte) (options & RObjectFactory.O_LENGTHGRADE_MASK));
+		final int l= (int)io.readVULong((byte) (options & RObjectFactory.O_LENGTHGRADE_MASK));
 		
 		this.dataSlotIdx= io.readInt();
 		this.slotNames= new RCharacter32Store(io, l);
@@ -146,7 +146,7 @@
 		if (idx < 0 || idx >= Integer.MAX_VALUE) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		return this.slotValues[(int) idx];
+		return this.slotValues[(int)idx];
 	}
 	
 	@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacter32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacter32Store.java
index 7e4c00e..1b7e5a8 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacter32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacter32Store.java
@@ -55,7 +55,7 @@
 		if (idx < 0 || idx >= getLength()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		setChar((int) idx, value);
+		setChar((int)idx, value);
 	}
 	
 	@Override
diff --git a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacterHash32Store.java b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacterHash32Store.java
index fc63c8d..c331cd9 100644
--- a/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacterHash32Store.java
+++ b/core/org.eclipse.statet.rj.data/src/org/eclipse/statet/rj/data/impl/RUniqueCharacterHash32Store.java
@@ -46,7 +46,7 @@
 	
 	
 	protected void initMap() {
-		final int length= (int) getLength();
+		final int length= (int)getLength();
 		for (int idx= 0; idx < length; idx++) {
 			if (this.charValues[idx] != null) {
 				this.map.put(this.charValues[idx], idx);
@@ -68,7 +68,7 @@
 		if (idx < 0 || idx >= getLength()) {
 			throw new IndexOutOfBoundsException(Long.toString(idx));
 		}
-		setChar((int) idx, value);
+		setChar((int)idx, value);
 	}
 	
 	@Override