Attachment 178715 Details for Bug 312535 – Patch (incremental)

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch (incremental)

patch.txt (text/plain), 3.38 KB, created by Caspar D.

on 2010-09-13 02:30:48 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Caspar D.

Created: 2010-09-13 02:30:48 EDT

Size: 3.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.emf.cdo
>Index: src/org/eclipse/emf/cdo/transaction/CDOTransaction.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOTransaction.java,v
>retrieving revision 1.28
>diff -u -r1.28 CDOTransaction.java
>--- src/org/eclipse/emf/cdo/transaction/CDOTransaction.java	4 Sep 2010 05:28:31 -0000	1.28
>+++ src/org/eclipse/emf/cdo/transaction/CDOTransaction.java	13 Sep 2010 06:27:33 -0000
>@@ -30,6 +30,7 @@
> import org.eclipse.net4j.util.options.IOptionsEvent;
> 
> import org.eclipse.emf.common.util.URI;
>+import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.ResourceSet;
> 
> import java.io.IOException;
>@@ -142,6 +143,16 @@
>    */
>   public void setCommitComment(String comment);
> 
>+  /**
>+   * @since 4.0
>+   */
>+  public void setCommittables(Set<EObject> committables);
>+
>+  /**
>+   * @since 4.0
>+   */
>+  public Set<EObject> getCommittables();
>+
>   public Options options();
> 
>   /**
>Index: src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java,v
>retrieving revision 1.10
>diff -u -r1.10 CDOUserTransaction.java
>--- src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java	13 Sep 2010 05:34:40 -0000	1.10
>+++ src/org/eclipse/emf/cdo/transaction/CDOUserTransaction.java	13 Sep 2010 06:27:33 -0000
>@@ -14,12 +14,8 @@
> import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
> import org.eclipse.emf.cdo.util.CommitException;
> 
>-import org.eclipse.emf.ecore.EObject;
>-
> import org.eclipse.core.runtime.IProgressMonitor;
> 
>-import java.util.Set;
>-
> /**
>  * Only deal with transaction process.
>  * 
>@@ -54,14 +50,4 @@
>    * @since 3.0
>    */
>   public CDOUserSavepoint getLastSavepoint();
>-
>-  /**
>-   * @since 4.0
>-   */
>-  public void setCommittables(Set<EObject> committables);
>-
>-  /**
>-   * @since 4.0
>-   */
>-  public Set<EObject> getCommittables();
> }
>Index: src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.emf/org.eclipse.emf.cdo/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java,v
>retrieving revision 1.26
>diff -u -r1.26 CDOXATransactionImpl.java
>--- src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java	13 Sep 2010 05:34:40 -0000	1.26
>+++ src/org/eclipse/emf/internal/cdo/transaction/CDOXATransactionImpl.java	13 Sep 2010 06:27:33 -0000
>@@ -34,7 +34,6 @@
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notification;
> import org.eclipse.emf.common.notify.Notifier;
>-import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.spi.cdo.CDOSessionProtocol;
> import org.eclipse.emf.spi.cdo.CDOSessionProtocol.CommitTransactionResult;
> import org.eclipse.emf.spi.cdo.CDOTransactionStrategy;
>@@ -436,16 +435,6 @@
>     }
>   }
> 
>-  public void setCommittables(Set<EObject> committables)
>-  {
>-    throw new UnsupportedOperationException();
>-  }
>-
>-  public Set<EObject> getCommittables()
>-  {
>-    throw new UnsupportedOperationException();
>-  }
>-
>   /**
>    * @author Simon McDuff
>    */

Actions: View | Diff

Attachments on bug 312535: 178373 | 178678 | 178715