Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 247226 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/emf/internal/cdo/CDOLegacyAdapter.java (-7 / +12 lines)
Lines 31-37 Link Here
31
31
32
  public void setTarget(Notifier newTarget)
32
  public void setTarget(Notifier newTarget)
33
  {
33
  {
34
34
    instance = (InternalEObject)newTarget;
35
    instance = (InternalEObject)newTarget;
36
35
  }
37
  }
36
38
37
  public void unsetTarget(Notifier oldTarget)
39
  public void unsetTarget(Notifier oldTarget)
Lines 56-61 Link Here
56
  {
58
  {
57
    CDOStore store = view.getStore();
59
    CDOStore store = view.getStore();
58
    EStructuralFeature feature = (EStructuralFeature)msg.getFeature();
60
    EStructuralFeature feature = (EStructuralFeature)msg.getFeature();
61
62
    // TODO Martin: Seems that it is quite uncool to set a transient feature to the view. Leads to an error because the
63
    // the wrong featureID will be found in the revision. Discuss this with Eike.
64
    if (feature.isTransient())
65
    {
66
      return;
67
    }
68
59
    switch (msg.getEventType())
69
    switch (msg.getEventType())
60
    {
70
    {
61
    case Notification.SET:
71
    case Notification.SET:
Lines 85-93 Link Here
85
        // TODO Is that correct?
95
        // TODO Is that correct?
86
        store.add(instance, feature, pos++, object);
96
        store.add(instance, feature, pos++, object);
87
      }
97
      }
88
    }
89
98
90
      break;
99
      break;
100
    }
91
101
92
    case Notification.REMOVE:
102
    case Notification.REMOVE:
93
      store.remove(instance, feature, msg.getPosition());
103
      store.remove(instance, feature, msg.getPosition());
Lines 102-115 Link Here
102
      {
112
      {
103
        store.remove(instance, feature, pos);
113
        store.remove(instance, feature, pos);
104
      }
114
      }
105
    }
106
115
107
      break;
116
      break;
108
    }
117
    }
109
  }
118
    }
110
111
  @Override
112
  public void cdoInternalPostInvalidate()
113
  {
114
  }
119
  }
115
}
120
}
(-)src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java (-2 / +1 lines)
Lines 28-34 Link Here
28
import org.eclipse.net4j.util.om.trace.ContextTracer;
28
import org.eclipse.net4j.util.om.trace.ContextTracer;
29
29
30
import org.eclipse.emf.common.notify.Adapter;
30
import org.eclipse.emf.common.notify.Adapter;
31
import org.eclipse.emf.common.notify.Notification;
32
import org.eclipse.emf.common.notify.impl.NotifyingListImpl;
31
import org.eclipse.emf.common.notify.impl.NotifyingListImpl;
33
import org.eclipse.emf.common.util.URI;
32
import org.eclipse.emf.common.util.URI;
34
import org.eclipse.emf.ecore.EClass;
33
import org.eclipse.emf.ecore.EClass;
Lines 283-289 Link Here
283
  {
282
  {
284
    // Attempt 4
283
    // Attempt 4
285
    Object value = revision.getValue(feature);
284
    Object value = revision.getValue(feature);
286
    view.getStore().set(instance, feature, Notification.NO_INDEX, value);
285
    view.getStore().set(instance, feature, EStore.NO_INDEX, value);
287
  }
286
  }
288
287
289
  protected Resource.Internal getInstanceResource(InternalEObject instance)
288
  protected Resource.Internal getInstanceResource(InternalEObject instance)
(-)src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java (-4 / +5 lines)
Lines 91-100 Link Here
91
91
92
  public void cdoInternalSetID(CDOID id)
92
  public void cdoInternalSetID(CDOID id)
93
  {
93
  {
94
    if (id == null)
94
    // TODO Clarify
95
    {
95
    // if (id == null)
96
      throw new IllegalArgumentException("id == null"); //$NON-NLS-1$
96
    // {
97
    }
97
    //throw new IllegalArgumentException("id == null"); //$NON-NLS-1$
98
    // }
98
99
99
    if (TRACER.isEnabled())
100
    if (TRACER.isEnabled())
100
    {
101
    {

Return to bug 247226