X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.databoard%2Fsrc%2Forg%2Fsimantics%2Fdataboard%2Faccessor%2Fjava%2FJavaString.java;h=2c0c46e612d9c448e81f9b9fc1a48bad4544821e;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=345cd7d3c2aab6f58dc1586fc9b79c61afc70454;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaString.java b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaString.java index 345cd7d3c..2c0c46e61 100644 --- a/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaString.java +++ b/bundles/org.simantics.databoard/src/org/simantics/databoard/accessor/java/JavaString.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.StringAccessor; -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.StringInterestSet; -import org.simantics.databoard.accessor.reference.ChildReference; -import org.simantics.databoard.binding.ArrayBinding; -import org.simantics.databoard.binding.Binding; -import org.simantics.databoard.binding.RecordBinding; -import org.simantics.databoard.binding.StringBinding; -import org.simantics.databoard.binding.VariantBinding; -import org.simantics.databoard.binding.error.BindingException; -import org.simantics.databoard.type.StringType; +import org.simantics.databoard.Bindings; +import org.simantics.databoard.accessor.Accessor; +import org.simantics.databoard.accessor.StringAccessor; +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.StringInterestSet; +import org.simantics.databoard.accessor.reference.ChildReference; +import org.simantics.databoard.binding.ArrayBinding; +import org.simantics.databoard.binding.Binding; +import org.simantics.databoard.binding.RecordBinding; +import org.simantics.databoard.binding.StringBinding; +import org.simantics.databoard.binding.VariantBinding; +import org.simantics.databoard.binding.error.BindingException; +import org.simantics.databoard.type.StringType; public class JavaString extends JavaObject implements StringAccessor { @@ -47,45 +47,45 @@ public class JavaString extends JavaObject implements StringAccessor { } @Override - public String getValue() throws AccessorException { + public String getValue() throws AccessorException { readLock(); try { return getBinding().getValue(object); } catch (BindingException e) { throw new AccessorException(e); - } finally { - readUnlock(); + } finally { + readUnlock(); } } @Override public void setValue(String newValue) throws AccessorException { - if (newValue.equals( getValue() )) return; - writeLock(); + if (newValue.equals( 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; @@ -100,8 +100,8 @@ public class JavaString extends JavaObject implements StringAccessor { } catch (BindingException e) { throw new AccessorException(e); - } finally { - writeUnlock(); + } finally { + writeUnlock(); } } @@ -124,15 +124,15 @@ public class JavaString extends JavaObject implements StringAccessor { } @Override - Event applyLocal(Event e, boolean makeRollback) throws AccessorException { - Event rollback = makeRollback ? new ValueAssigned( Bindings.STRING, getValue() ) : null; - if (e instanceof ValueAssigned) { - ValueAssigned va = (ValueAssigned) e; - if (va.newValue == null) throw new AccessorException("String value expected, got null"); - setValue(va.newValue.getBinding(), va.newValue.getValue()); - return rollback; - } else { - throw new AccessorException("Cannot apply "+e.getClass().getName()+" to String"); + Event applyLocal(Event e, boolean makeRollback) throws AccessorException { + Event rollback = makeRollback ? new ValueAssigned( Bindings.STRING, getValue() ) : null; + if (e instanceof ValueAssigned) { + ValueAssigned va = (ValueAssigned) e; + if (va.newValue == null) throw new AccessorException("String value expected, got null"); + setValue(va.newValue.getBinding(), va.newValue.getValue()); + return rollback; + } else { + throw new AccessorException("Cannot apply "+e.getClass().getName()+" to String"); } }