Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/BasicEObjectImpl.java45
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java122
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java23
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EObjectImpl.java20
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStringToStringMapEntryImpl.java16
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java178
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java13
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap_CustomFieldSerializer.java43
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEList.java43
-rw-r--r--plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEMap.java74
10 files changed, 13 insertions, 564 deletions
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/BasicEObjectImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/BasicEObjectImpl.java
index 684367218..f6789311f 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/BasicEObjectImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/BasicEObjectImpl.java
@@ -13,7 +13,7 @@
*
* </copyright>
*
- * $Id: BasicEObjectImpl.java,v 1.2 2010/04/28 20:39:53 khussey Exp $
+ * $Id: BasicEObjectImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
@@ -2062,49 +2062,6 @@ public class BasicEObjectImpl extends BasicNotifierImpl implements EObject, Inte
return eInvocationDelegate(eOperation).dynamicInvoke(this, arguments);
}
- // XXX 245014
-// protected void eWriteObject(ObjectOutputStream out) throws IOException
-// {
-// out.writeObject(eContainer());
-// out.writeInt(eContainerFeatureID());
-// out.writeObject(eDynamicClass());
-// int size = eClass().getFeatureCount() - eStaticFeatureCount();
-// if (size > 0)
-// {
-// DynamicValueHolder eSettings = eSettings();
-// for (int i = 0; i < size; ++i)
-// {
-// out.writeObject(eSettings.dynamicGet(i));
-// }
-// }
-// }
-
- // XXX 245014
-// protected void eReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException
-// {
-// InternalEObject eContainer = (InternalEObject)in.readObject();
-// int eContainerFeatureID = in.readInt();
-// eBasicSetContainer(eContainer, eContainerFeatureID);
-// EClass eClass = (EClass)in.readObject();
-// if (eClass != null)
-// {
-// eSetClass(eClass);
-// }
-// else
-// {
-// eClass = eClass();
-// }
-// int size = eClass.getFeatureCount() - eStaticFeatureCount();
-// if (size > 0)
-// {
-// DynamicValueHolder eSettings = eSettings();
-// for (int i = 0; i < size; ++i)
-// {
-// eSettings.dynamicSet(i, in.readObject());
-// }
-// }
-// }
-
@Override
public String toString()
{
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
index 0a22e24e7..8a5bebf12 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EClassifierImpl.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: EClassifierImpl.java,v 1.2 2010/04/28 20:39:50 khussey Exp $
+ * $Id: EClassifierImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
@@ -955,124 +955,4 @@ public abstract class EClassifierImpl extends ENamedElementImpl implements EClas
}
super.setName(newName);
}
-
- // XXX 245014
- /*
- protected Object writeReplace() throws ObjectStreamException
- {
- return new WriteReplacement(this);
- }
-
- // XXX 245014
- protected static class WriteReplacement implements Externalizable
- {
- protected EClassifier eClassifier;
-
- public WriteReplacement()
- {
- super();
- }
-
- public WriteReplacement(EClassifier eClassifier)
- {
- this.eClassifier = eClassifier;
- }
-
- public void writeExternal(ObjectOutput out) throws IOException
- {
- EPackage ePackage = eClassifier.getEPackage();
-
- // First try to see if this package's implementation class has an eInstance.
- //
- try
- {
- Field field = ePackage.getClass().getField("eINSTANCE");
- out.writeByte(0);
- out.writeObject(field.getDeclaringClass());
- }
- catch (Exception exception)
- {
- String nsURI = ePackage.getNsURI();
- if (EPackage.Registry.INSTANCE.get(nsURI) == ePackage)
- {
- out.writeByte(1);
- }
- else
- {
- out.writeByte(2);
- nsURI = ExtendedMetaData.INSTANCE.getNamespace(ePackage);
- if (nsURI == null)
- {
- nsURI = "";
- }
- }
- out.writeUTF(nsURI);
- }
-
- out.writeUTF(ExtendedMetaData.INSTANCE.getName(eClassifier));
- }
-
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
- byte value = in.readByte();
- if (value == 0)
- {
- Class<?> packageInterface = (Class<?>)in.readObject();
- try
- {
- EPackage ePackage = (EPackage)packageInterface.getField("eINSTANCE").get(null);
- eClassifier = ExtendedMetaData.INSTANCE.getType(ePackage, in.readUTF());
- }
- catch (Throwable throwable)
- {
- throw new Resource.IOWrappedException(throwable);
- }
- }
- else
- {
- String nsURI = in.readUTF();
- String name = in.readUTF();
- if (value == 1)
- {
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
- eClassifier = ExtendedMetaData.INSTANCE.getType(ePackage, name);
- }
- else
- {
- if (nsURI.length() == 0)
- {
- nsURI = null;
- }
- eClassifier = ExtendedMetaData.INSTANCE.demandType(nsURI, name);
- }
- }
- }
-
- protected Object readResolve()
- {
- return eClassifier;
- }
-
- @Override
- public int hashCode()
- {
- return eClassifier == null ? null : eClassifier.hashCode();
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (o instanceof WriteReplacement)
- {
- WriteReplacement writeReplacement = (WriteReplacement)o;
- return eClassifier == null ? writeReplacement.eClassifier == null : eClassifier.equals(writeReplacement.eClassifier);
- }
- else
- {
- return false;
- }
- }
- }
- */
-
}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
index 4b51072c3..42b8ef8ce 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EFactoryImpl.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: EFactoryImpl.java,v 1.2 2010/04/28 20:39:45 khussey Exp $
+ * $Id: EFactoryImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
@@ -265,27 +265,6 @@ public class EFactoryImpl extends EModelElementImpl implements EFactory
return basicCreate(eClass);
}
- // XXX 245014
-// private static class SerializableDynamicEObjectImpl extends DynamicEObjectImpl implements Serializable
-// {
-// private static final long serialVersionUID = 1L;
-//
-// public SerializableDynamicEObjectImpl(EClass eClass)
-// {
-// super(eClass);
-// }
-//
-// private void writeObject(ObjectOutputStream out) throws IOException
-// {
-// eWriteObject(out);
-// }
-//
-// private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
-// {
-// eReadObject(in);
-// }
-// }
-
protected EObject basicCreate(EClass eClass)
{
return
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EObjectImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EObjectImpl.java
index c131a38d6..9d51208df 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EObjectImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EObjectImpl.java
@@ -12,12 +12,11 @@
*
* </copyright>
*
- * $Id: EObjectImpl.java,v 1.2 2010/04/28 20:39:48 khussey Exp $
+ * $Id: EObjectImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
-
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.common.util.EList;
@@ -294,21 +293,4 @@ public class EObjectImpl extends BasicEObjectImpl implements EObject
eFlags &= ~EDYNAMIC_CLASS;
}
}
-
- // XXX 245014
-// @Override
-// protected void eWriteObject(ObjectOutputStream out) throws IOException
-// {
-// super.eWriteObject(out);
-// out.writeInt(eFlags);
-// }
-
- // XXX 245014
-// @Override
-// protected void eReadObject(ObjectInputStream in) throws IOException, ClassNotFoundException
-// {
-// super.eReadObject(in);
-// eFlags = in.readInt();
-// }
-
}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStringToStringMapEntryImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStringToStringMapEntryImpl.java
index 0eb4f5bec..2b9011a1e 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStringToStringMapEntryImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStringToStringMapEntryImpl.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: EStringToStringMapEntryImpl.java,v 1.2 2010/04/28 20:39:55 khussey Exp $
+ * $Id: EStringToStringMapEntryImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
@@ -339,18 +339,4 @@ public class EStringToStringMapEntryImpl extends MinimalEObjectImpl.Container im
return container == null ? null : (EMap<String, String>)container.eGet(eContainmentFeature());
}
- // XXX 245014
-// private void writeObject(ObjectOutputStream out) throws IOException
-// {
-// out.defaultWriteObject();
-// eWriteObject(out);
-// }
-
- // XXX 245014
-// private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
-// {
-// in.defaultReadObject();
-// eReadObject(in);
-// }
-
} //EStringToStringMapEntryImpl
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
index dc5865f3c..048feabfc 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/impl/EStructuralFeatureImpl.java
@@ -12,13 +12,11 @@
*
* </copyright>
*
- * $Id: EStructuralFeatureImpl.java,v 1.2 2010/04/28 20:39:46 khussey Exp $
+ * $Id: EStructuralFeatureImpl.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.impl;
-import com.google.gwt.user.client.rpc.GwtTransient;
-import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -59,6 +57,8 @@ import org.eclipse.emf.ecore.util.FeatureMap;
import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
+import com.google.gwt.user.client.rpc.GwtTransient;
+
/**
* <!-- begin-user-doc -->
@@ -2933,11 +2933,8 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
return cachedIsFeatureMap;
}
- public static abstract class BasicFeatureMapEntry implements FeatureMap.Entry.Internal, Serializable
+ public static abstract class BasicFeatureMapEntry implements FeatureMap.Entry.Internal
{
- // XXX 245014
- private static final long serialVersionUID = 1L;
-
protected final EStructuralFeature.Internal eStructuralFeature;
BasicFeatureMapEntry(EStructuralFeature.Internal eStructuralFeature)
@@ -3021,9 +3018,6 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
public final static class SimpleFeatureMapEntry extends BasicFeatureMapEntry
{
- // XXX 245014
- private static final long serialVersionUID = 1L;
-
protected final Object value;
public SimpleFeatureMapEntry(EStructuralFeature.Internal eStructuralFeature, Object value)
@@ -3066,9 +3060,6 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
public final static class SimpleContentFeatureMapEntry extends BasicFeatureMapEntry
{
- // XXX 245014
- private static final long serialVersionUID = 1L;
-
protected EFactory eFactory;
protected EDataType eDataType;
@@ -3117,9 +3108,6 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
public final class InverseUpdatingFeatureMapEntry extends BasicFeatureMapEntry
{
- // XXX 245014
- private static final long serialVersionUID = 1L;
-
protected final InternalEObject value;
public InverseUpdatingFeatureMapEntry(EStructuralFeature.Internal eStructuralFeature, InternalEObject value)
@@ -3191,9 +3179,6 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
public final static class ContainmentUpdatingFeatureMapEntry extends BasicFeatureMapEntry
{
- // XXX 245014
- private static final long serialVersionUID = 1L;
-
protected final InternalEObject value;
public ContainmentUpdatingFeatureMapEntry(EStructuralFeature.Internal eStructuralFeature, InternalEObject value)
@@ -3322,159 +3307,4 @@ public abstract class EStructuralFeatureImpl extends ETypedElementImpl implement
}
super.setName(newName);
}
-
- // XXX 245014
- /*
- protected Object writeReplace() throws ObjectStreamException
- {
- return new WriteReplacement(this);
- }
-
- // XXX 245014
- protected static class WriteReplacement implements Externalizable
- {
- protected EStructuralFeature eStructuralFeature;
-
- public WriteReplacement()
- {
- super();
- }
-
- public WriteReplacement(EStructuralFeature eStructuralFeature)
- {
- this.eStructuralFeature = eStructuralFeature;
- }
-
- public void readExternalx(ObjectInput in) throws IOException, ClassNotFoundException
- {
- String nsURI = in.readUTF();
- String classifierName = in.readUTF();
- String featureName = in.readUTF();
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
- if (ePackage == null)
- {
- eStructuralFeature = ExtendedMetaData.INSTANCE.demandFeature(nsURI, featureName, true);
- }
- else
- {
- EClass eClass = (EClass)ePackage.getEClassifier(classifierName);
- eStructuralFeature = eClass.getEStructuralFeature(featureName);
- }
- }
-
- public void writeExternalx(ObjectOutput out) throws IOException
- {
- EClass eClass = eStructuralFeature.getEContainingClass();
- EPackage ePackage = eClass.getEPackage();
- out.writeUTF(ePackage.getNsURI());
- out.writeUTF(eClass.getName());
- out.writeUTF(eStructuralFeature.getName());
- }
-
- public void writeExternal(ObjectOutput out) throws IOException
- {
- EClass eClass = eStructuralFeature.getEContainingClass();
- EPackage ePackage = eClass.getEPackage();
-
- // First try to see if this package's implementation class has an eInstance.
- //
- try
- {
- Field field = ePackage.getClass().getField("eINSTANCE");
- out.writeByte(0);
- out.writeObject(field.getDeclaringClass());
- out.writeUTF(eClass.getName());
- out.writeUTF(eStructuralFeature.getName());
- }
- catch (Exception exception)
- {
- String nsURI = ePackage.getNsURI();
- if (EPackage.Registry.INSTANCE.get(nsURI) == ePackage)
- {
- out.writeByte(1);
- out.writeUTF(nsURI);
- out.writeUTF(eClass.getName());
- out.writeUTF(eStructuralFeature.getName());
- }
- else
- {
- out.writeByte
- (ExtendedMetaData.INSTANCE.getFeatureKind(eStructuralFeature) == ExtendedMetaData.ELEMENT_FEATURE ?
- eStructuralFeature instanceof EReference ? 2 : 3 :
- eStructuralFeature instanceof EReference ? 4 : 5);
- String namespace = ExtendedMetaData.INSTANCE.getNamespace(eStructuralFeature);
- out.writeUTF(namespace == null ? "" : namespace);
- out.writeUTF(ExtendedMetaData.INSTANCE.getName(eStructuralFeature));
- }
- }
- }
-
- public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
- {
- byte value = in.readByte();
- if (value == 0)
- {
- Class<?> packageInterface = (Class<?>)in.readObject();
- try
- {
- EPackage ePackage = (EPackage)packageInterface.getField("eINSTANCE").get(null);
- EClass eClass = (EClass)ePackage.getEClassifier(in.readUTF());
- eStructuralFeature = eClass.getEStructuralFeature(in.readUTF());
- }
- catch (Throwable throwable)
- {
- throw new Resource.IOWrappedException(throwable);
- }
- }
- else
- {
- if (value == 1)
- {
- String nsURI = in.readUTF();
- EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsURI);
- EClass eClass = (EClass)ePackage.getEClassifier(in.readUTF());
- eStructuralFeature = eClass.getEStructuralFeature(in.readUTF());
- }
- else
- {
- boolean isElement = value == 2 || value == 3;
- boolean isReference = value == 2 || value == 4;
- String namespace = in.readUTF();
- if (namespace.length() == 0)
- {
- namespace = null;
- }
- String name = in.readUTF();
- eStructuralFeature = ExtendedMetaData.INSTANCE.demandFeature(namespace, name, isElement, isReference);
- }
- }
- }
-
- protected Object readResolve()
- {
- return eStructuralFeature;
- }
-
- @Override
- public int hashCode()
- {
- return eStructuralFeature == null ? null : eStructuralFeature.hashCode();
- }
-
- @Override
- public boolean equals(Object o)
- {
- if (o instanceof WriteReplacement)
- {
- WriteReplacement writeReplacement = (WriteReplacement)o;
- return eStructuralFeature == null ? writeReplacement.eStructuralFeature == null : eStructuralFeature.equals(writeReplacement.eStructuralFeature);
- }
- else
- {
- return false;
- }
- }
- }
- */
-
}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
index ff594616e..f527d32a2 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap.java
@@ -12,12 +12,11 @@
*
* </copyright>
*
- * $Id: BasicFeatureMap.java,v 1.3 2010/05/17 13:17:57 emerks Exp $
+ * $Id: BasicFeatureMap.java,v 1.4 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.util;
-//import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
@@ -47,9 +46,7 @@ public class BasicFeatureMap
{
private static final long serialVersionUID = 1L;
- protected Wrapper wrapper = this;
-
- // XXX 245014
+ protected Wrapper wrapper = this;
protected transient FeatureMapUtil.Validator featureMapValidator;
public BasicFeatureMap(InternalEObject owner, int featureID)
@@ -2561,10 +2558,4 @@ public class BasicFeatureMap
super.set(newValue instanceof FeatureMap ? newValue : ((FeatureMap.Internal.Wrapper)newValue).featureMap());
}
- // XXX 245014
-// private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException
-// {
-// in.defaultReadObject();
-// featureMapValidator = FeatureMapUtil.getValidator(owner.eClass(), getEStructuralFeature());
-// }
}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap_CustomFieldSerializer.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap_CustomFieldSerializer.java
deleted file mode 100644
index 1ab2cddd1..000000000
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/BasicFeatureMap_CustomFieldSerializer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2010 Ed Merks and others.
- * 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:
- * Ed Merks - Initial API and implementation
- *
- * </copyright>
- *
- * $Id: BasicFeatureMap_CustomFieldSerializer.java,v 1.2 2010/04/28 20:39:41 khussey Exp $
- */
-package org.eclipse.emf.ecore.util;
-
-import com.google.gwt.user.client.rpc.SerializationException;
-import com.google.gwt.user.client.rpc.SerializationStreamReader;
-import com.google.gwt.user.client.rpc.SerializationStreamWriter;
-
-public final class BasicFeatureMap_CustomFieldSerializer
-{
- public static void serialize(SerializationStreamWriter streamWriter, BasicFeatureMap basicFeatureMap) throws SerializationException
- {
- // TODO
- throw new UnsupportedOperationException();
- }
-
- public static BasicFeatureMap instantiate(SerializationStreamReader streamReader) throws SerializationException
- {
- throw new UnsupportedOperationException();
- }
-
- public static void deserialize(SerializationStreamReader reader, BasicFeatureMap map) throws SerializationException
- {
- reader.readObject();
-
- map.featureMapValidator = FeatureMapUtil.getValidator(map.owner.eClass(), map.getEStructuralFeature());
- }
-
-}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEList.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEList.java
index 57f021864..27a1574cc 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEList.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEList.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: EcoreEList.java,v 1.2 2010/04/28 20:39:44 khussey Exp $
+ * $Id: EcoreEList.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.util;
@@ -849,45 +849,4 @@ public abstract class EcoreEList<E> extends NotifyingInternalEListImpl<E> implem
return eStructuralFeature;
}
}
-
- // XXX 245014
-// private void writeObject(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// objectOutputStream.defaultWriteObject();
-// writeDataDeferred(objectOutputStream);
-// }
-
- // XXX 245014
-// @Override
-// protected void writeData(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// // Defer this.
-// }
-
- // XXX 245014
-// protected void writeDataDeferred(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// super.writeData(objectOutputStream);
-// }
-
- // XXX 245014
-// private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// objectInputStream.defaultReadObject();
-// readDataDeferred(objectInputStream);
-// }
-
- // XXX 245014
-// @Override
-// protected void readData(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// // Defer this
-// }
-
- // XXX 245014
-// protected void readDataDeferred(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// super.readData(objectInputStream);
-// }
-
}
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEMap.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEMap.java
index 11b01096e..041c763d6 100644
--- a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEMap.java
+++ b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreEMap.java
@@ -12,7 +12,7 @@
*
* </copyright>
*
- * $Id: EcoreEMap.java,v 1.2 2010/04/28 20:39:44 khussey Exp $
+ * $Id: EcoreEMap.java,v 1.3 2010/05/21 15:20:09 khussey Exp $
*/
package org.eclipse.emf.ecore.util;
@@ -158,46 +158,6 @@ public class EcoreEMap<K, V> extends BasicEMap<K, V> implements InternalEList.Un
{
EcoreEMap.this.doMove(movedObject);
}
-
- // XXX 245014
-// private void writeObject(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// objectOutputStream.defaultWriteObject();
-// writeDataDeferredAgain(objectOutputStream);
-// }
-
- // XXX 245014
-// @Override
-// protected void writeDataDeferred(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// // Defer this even more.
-// }
-
- // XXX 245014
-// protected void writeDataDeferredAgain(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// super.writeDataDeferred(objectOutputStream);
-// }
-
- // XXX 245014
-// private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// objectInputStream.defaultReadObject();
-// readDataDeferredAgain(objectInputStream);
-// }
-
- // XXX 245014
-// @Override
-// protected void readDataDeferred(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// // Defer this even more
-// }
-
- // XXX 245014
-// protected void readDataDeferredAgain(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// super.readDataDeferred(objectInputStream);
-// }
}
@Override
@@ -406,36 +366,4 @@ public class EcoreEMap<K, V> extends BasicEMap<K, V> implements InternalEList.Un
{
((EStructuralFeature.Setting)delegateEList).unset();
}
-
- // XXX 245014
-// private void writeObject(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// // Write the fields before writing the entries.
-// }
-
- // XXX 245014
-// @Override
-// protected void writeEntries(ObjectOutputStream objectOutputStream) throws IOException
-// {
-// objectOutputStream.writeObject(entryClass);
-// objectOutputStream.writeObject(entryEClass);
-// objectOutputStream.writeObject(delegateEList);
-// }
-
- // XXX 245014
-// private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// // Read the fields before reading the entries
-// }
-
- // XXX 245014
-// @Override
-// @SuppressWarnings("unchecked")
-// protected void readEntries(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException
-// {
-// entryClass = (Class<?>)objectInputStream.readObject();
-// entryEClass = (EClass)objectInputStream.readObject();
-// delegateEList = (EList<Entry<K, V>>)objectInputStream.readObject();
-// }
-
}

Back to the top