Skip to content
Snippets Groups Projects
Commit 2352cc8a authored by Simon Spinner's avatar Simon Spinner
Browse files

Transform all header values to String.

parent 0331fc6b
No related branches found
No related tags found
No related merge requests found
......@@ -126,13 +126,13 @@ public class TestModelRepository implements ModelRepository {
}
@Override
public Object getInstance(Object id) {
return id;
public Object getInstance(String id) {
return null;
}
@Override
public Object getInstanceID(Object object) {
return object;
public String getInstanceID(Object object) {
return object.toString();
}
@Override
......
......@@ -33,7 +33,7 @@ public interface ModelRepository {
public <T> List<T> query(String query, Object context, Class<T> resultType);
public Object getInstanceID(Object object);
public String getInstanceID(Object object);
public Object getInstance(Object id);
public Object getInstance(String id);
}
......@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.common.id.CDOIDUtil;
import org.eclipse.emf.cdo.eresource.CDOResourceFolder;
import org.eclipse.emf.cdo.eresource.CDOResourceNode;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
......@@ -174,13 +174,13 @@ public class CDOModelRepository implements ModelRepository {
}
@Override
public Object getInstanceID(Object object) {
return ((CDOObject) object).cdoID();
public String getInstanceID(Object object) {
return ((CDOObject) object).cdoID().toURIFragment();
}
@Override
public Object getInstance(Object id) {
return readOnlyView.getObject((CDOID) id);
public Object getInstance(String id) {
return readOnlyView.getObject(CDOIDUtil.read(id));
}
public Transaction createTransaction() {
......
......@@ -36,12 +36,12 @@ public class ModelNotification extends HashMap<String, Object> {
Object instance) {
this.repository = repository;
put(NOTIFICATION_TYPE, notificationType);
put(INSTANCE_TYPE, instanceType);
put(INSTANCE_TYPE, instanceType.getName());
put(INSTANCE_ID, repository.getInstanceID(instance));
}
public EObject getInstance() {
return (EObject) repository.getInstance(get(INSTANCE_ID));
return (EObject) repository.getInstance((String) get(INSTANCE_ID));
}
public String[] getDestinationScopes() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment