Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 151634 Details for
Bug 247226
Transparently support legacy models (CDOLegacyAdapter)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
LegacyAdapter Patch v2
patch.txt (text/plain), 3.68 KB, created by
Eike Stepper
on 2009-11-07 13:58:08 EST
(
hide
)
Description:
LegacyAdapter Patch v2
Filename:
MIME Type:
Creator:
Eike Stepper
Created:
2009-11-07 13:58:08 EST
Size:
3.68 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.emf.cdo >Index: src/org/eclipse/emf/internal/cdo/CDOLegacyAdapter.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyAdapter.java,v >retrieving revision 1.4 >diff -u -r1.4 CDOLegacyAdapter.java >--- src/org/eclipse/emf/internal/cdo/CDOLegacyAdapter.java 7 May 2009 08:40:40 -0000 1.4 >+++ src/org/eclipse/emf/internal/cdo/CDOLegacyAdapter.java 7 Nov 2009 18:59:46 -0000 >@@ -31,7 +31,9 @@ > > public void setTarget(Notifier newTarget) > { >+ > instance = (InternalEObject)newTarget; >+ > } > > public void unsetTarget(Notifier oldTarget) >@@ -56,6 +58,14 @@ > { > CDOStore store = view.getStore(); > EStructuralFeature feature = (EStructuralFeature)msg.getFeature(); >+ >+ // TODO Martin: Seems that it is quite uncool to set a transient feature to the view. Leads to an error because the >+ // the wrong featureID will be found in the revision. Discuss this with Eike. >+ if (feature.isTransient()) >+ { >+ return; >+ } >+ > switch (msg.getEventType()) > { > case Notification.SET: >@@ -85,9 +95,9 @@ > // TODO Is that correct? > store.add(instance, feature, pos++, object); > } >- } > > break; >+ } > > case Notification.REMOVE: > store.remove(instance, feature, msg.getPosition()); >@@ -102,14 +112,9 @@ > { > store.remove(instance, feature, pos); > } >- } > > break; > } >- } >- >- @Override >- public void cdoInternalPostInvalidate() >- { >+ } > } > } >Index: src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java,v >retrieving revision 1.30 >diff -u -r1.30 CDOLegacyWrapper.java >--- src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java 20 Oct 2009 06:51:12 -0000 1.30 >+++ src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java 7 Nov 2009 18:59:46 -0000 >@@ -28,7 +28,6 @@ > import org.eclipse.net4j.util.om.trace.ContextTracer; > > import org.eclipse.emf.common.notify.Adapter; >-import org.eclipse.emf.common.notify.Notification; > import org.eclipse.emf.common.notify.impl.NotifyingListImpl; > import org.eclipse.emf.common.util.URI; > import org.eclipse.emf.ecore.EClass; >@@ -283,7 +282,7 @@ > { > // Attempt 4 > Object value = revision.getValue(feature); >- view.getStore().set(instance, feature, Notification.NO_INDEX, value); >+ view.getStore().set(instance, feature, EStore.NO_INDEX, value); > } > > protected Resource.Internal getInstanceResource(InternalEObject instance) >Index: src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java,v >retrieving revision 1.17 >diff -u -r1.17 CDOObjectWrapper.java >--- src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java 23 Sep 2009 17:19:29 -0000 1.17 >+++ src/org/eclipse/emf/internal/cdo/CDOObjectWrapper.java 7 Nov 2009 18:59:46 -0000 >@@ -91,10 +91,11 @@ > > public void cdoInternalSetID(CDOID id) > { >- if (id == null) >- { >- throw new IllegalArgumentException("id == null"); //$NON-NLS-1$ >- } >+ // TODO Clarify >+ // if (id == null) >+ // { >+ //throw new IllegalArgumentException("id == null"); //$NON-NLS-1$ >+ // } > > if (TRACER.isEnabled()) > {
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 247226
:
112514
|
112894
|
134866
|
151009
|
151634
|
151651
|
152232
|
153867
|
153868
|
155030
|
155031
|
155181
|
155182
|
155400
|
163497
|
163499