X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Faccessor%2Fjava%2FJavaByte.java;h=9ffca42bb47ee614ae330d655d9dc3a697daba4c;hb=dac7a40d1cf85956aeac63ccbdf5b7a0d9977ac3;hp=6e63f201db13f55f96133bad6d94378dd9fcac23;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaByte.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaByte.java
index 6e63f201d..9ffca42bb 100644
--- a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaByte.java
+++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaByte.java
@@ -1,35 +1,35 @@
-/*******************************************************************************
- *  Copyright (c) 2010 Association for Decentralized Information Management in
- *  Industry THTH ry.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v10.html
- *
- *  Contributors:
- *      VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
+/*******************************************************************************
+ *  Copyright (c) 2010 Association for Decentralized Information Management in
+ *  Industry THTH ry.
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *
+ *  Contributors:
+ *      VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
 package org.simantics.databoard.accessor.java;
 
-import org.simantics.databoard.Bindings;
-import org.simantics.databoard.accessor.Accessor;
-import org.simantics.databoard.accessor.ByteAccessor;
-import org.simantics.databoard.accessor.error.AccessorConstructionException;
-import org.simantics.databoard.accessor.error.AccessorException;
-import org.simantics.databoard.accessor.error.ReferenceException;
-import org.simantics.databoard.accessor.event.Event;
-import org.simantics.databoard.accessor.event.ValueAssigned;
-import org.simantics.databoard.accessor.impl.AccessorParams;
-import org.simantics.databoard.accessor.impl.ListenerEntry;
-import org.simantics.databoard.accessor.interestset.ByteInterestSet;
-import org.simantics.databoard.accessor.reference.ChildReference;
-import org.simantics.databoard.binding.ArrayBinding;
-import org.simantics.databoard.binding.Binding;
-import org.simantics.databoard.binding.ByteBinding;
-import org.simantics.databoard.binding.RecordBinding;
-import org.simantics.databoard.binding.VariantBinding;
-import org.simantics.databoard.binding.error.BindingException;
-import org.simantics.databoard.type.ByteType;
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.accessor.Accessor;
+import org.simantics.databoard.accessor.ByteAccessor;
+import org.simantics.databoard.accessor.error.AccessorConstructionException;
+import org.simantics.databoard.accessor.error.AccessorException;
+import org.simantics.databoard.accessor.error.ReferenceException;
+import org.simantics.databoard.accessor.event.Event;
+import org.simantics.databoard.accessor.event.ValueAssigned;
+import org.simantics.databoard.accessor.impl.AccessorParams;
+import org.simantics.databoard.accessor.impl.ListenerEntry;
+import org.simantics.databoard.accessor.interestset.ByteInterestSet;
+import org.simantics.databoard.accessor.reference.ChildReference;
+import org.simantics.databoard.binding.ArrayBinding;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.databoard.binding.ByteBinding;
+import org.simantics.databoard.binding.RecordBinding;
+import org.simantics.databoard.binding.VariantBinding;
+import org.simantics.databoard.binding.error.BindingException;
+import org.simantics.databoard.type.ByteType;
 
 /**
  * Accessor to a Java Object that contains a Byte Type. 
@@ -52,45 +52,45 @@ public class JavaByte extends JavaObject implements ByteAccessor {
 	}
 
 	@Override
-	public byte getValue() throws AccessorException {
+	public byte getValue() throws AccessorException {
 		readLock();
 		try {
 			return getBinding().getValue_(object);
 		} catch (BindingException e) {
 			throw new AccessorException(e);
-		} finally {
-			readUnlock();
+		} finally {
+			readUnlock();
 		}
-	}
+	}
 	
 	@Override
 	public void setValue(byte newValue) throws AccessorException {
-		if (newValue == getValue()) return;
-		writeLock();
+		if (newValue == getValue()) return;
+		writeLock();
 		try {
-			if (binding.isImmutable() && parent!=null && parent instanceof JavaArray) {
-				JavaObject jo = (JavaObject) parent;
-				ArrayBinding ab = (ArrayBinding) jo.binding;
-				Object nv = getBinding().create(newValue);
-				ab.set(jo.object, (Integer)keyInParent, nv);
-				this.object = nv;
-			} else if (binding.isImmutable() && parent!=null && parent instanceof JavaRecord) {
-				JavaObject jo = (JavaObject) parent;
-				RecordBinding rb = (RecordBinding) jo.binding;
-				Object nv = getBinding().create(newValue);
-				rb.setComponent(jo.object, (Integer)keyInParent, nv);
-				this.object = nv;
-			} else if (binding.isImmutable() && parent!=null && parent instanceof JavaVariant) {
-				JavaObject jo = (JavaObject) parent;
-				VariantBinding vb = (VariantBinding) jo.binding;
-				Object nv = getBinding().create(newValue);
-				vb.setContent(jo.object, getBinding(), nv);
-				this.object = nv;
-			} else {			
-				// Set value
-				getBinding().setValue(object, newValue);
-			}
-
+			if (binding.isImmutable() && parent!=null && parent instanceof JavaArray) {
+				JavaObject jo = (JavaObject) parent;
+				ArrayBinding ab = (ArrayBinding) jo.binding;
+				Object nv = getBinding().create(newValue);
+				ab.set(jo.object, (Integer)keyInParent, nv);
+				this.object = nv;
+			} else if (binding.isImmutable() && parent!=null && parent instanceof JavaRecord) {
+				JavaObject jo = (JavaObject) parent;
+				RecordBinding rb = (RecordBinding) jo.binding;
+				Object nv = getBinding().create(newValue);
+				rb.setComponent(jo.object, (Integer)keyInParent, nv);
+				this.object = nv;
+			} else if (binding.isImmutable() && parent!=null && parent instanceof JavaVariant) {
+				JavaObject jo = (JavaObject) parent;
+				VariantBinding vb = (VariantBinding) jo.binding;
+				Object nv = getBinding().create(newValue);
+				vb.setContent(jo.object, getBinding(), nv);
+				this.object = nv;
+			} else {			
+				// Set value
+				getBinding().setValue(object, newValue);
+			}
+
 			
 			// Notify
 			ListenerEntry le = listeners;
@@ -105,13 +105,13 @@ public class JavaByte extends JavaObject implements ByteAccessor {
 			
 		} catch (BindingException e) {
 			throw new AccessorException(e);
-		} finally {
-			writeUnlock();
+		} finally {
+			writeUnlock();
 		}
 	}
 
 	@Override
-	public void setValue(Binding binding, Object newValue) throws AccessorException {
+	public void setValue(Binding binding, Object newValue) throws AccessorException {
 		try {
 			byte nv = ((ByteBinding)binding).getValue_(newValue);
 			setValue(nv);
@@ -130,15 +130,15 @@ public class JavaByte extends JavaObject implements ByteAccessor {
 	}
 
 	@Override
-	Event applyLocal(Event e, boolean makeRollback) throws AccessorException {
-		Event rollback = makeRollback ? new ValueAssigned( Bindings.BYTE, getValue() ) : null; 		
-		if (e instanceof ValueAssigned) {
-			ValueAssigned va = (ValueAssigned) e;
-			if (va.newValue == null) throw new AccessorException("Byte value expected, got null");			
-			setValue(va.newValue.getBinding(), va.newValue.getValue());
-			return rollback;
-		} else {
-			throw new AccessorException("Cannot apply "+e.getClass().getName()+" to Byte");
+	Event applyLocal(Event e, boolean makeRollback) throws AccessorException {
+		Event rollback = makeRollback ? new ValueAssigned( Bindings.BYTE, getValue() ) : null; 		
+		if (e instanceof ValueAssigned) {
+			ValueAssigned va = (ValueAssigned) e;
+			if (va.newValue == null) throw new AccessorException("Byte value expected, got null");			
+			setValue(va.newValue.getBinding(), va.newValue.getValue());
+			return rollback;
+		} else {
+			throw new AccessorException("Cannot apply "+e.getClass().getName()+" to Byte");
 		}
 	}