Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2020-06-08 06:53:28 +0000
committerEike Stepper2020-06-08 06:53:28 +0000
commit6f7ba059f4f77ef12a11f7692b5890fff8094948 (patch)
tree6198d35c9678e33fdb40bb6cb94f2624a3af819c
parentcfe59e87cb7ce33dddc7bff01c27402780c1af6d (diff)
downloadcdo-6f7ba059f4f77ef12a11f7692b5890fff8094948.tar.gz
cdo-6f7ba059f4f77ef12a11f7692b5890fff8094948.tar.xz
cdo-6f7ba059f4f77ef12a11f7692b5890fff8094948.zip
[Releng] Fix typos
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java2
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java2
3 files changed, 2 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
index 53801e2ff4..205b6d86ba 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
+++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutImpl.java
@@ -214,7 +214,6 @@ public abstract class CDOCheckoutImpl extends AbstractElement implements CDOChec
{
if (repository == fromCheckout.getRepository() && repository.isConnected())
{
-
CDOBranchManager branchManager = repository.getSession().getBranchManager();
CDOBranch branch = branchManager.getBranch(fromCheckout.getBranchID());
return branch.getPoint(fromCheckout.getTimeStamp());
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
index 69a6cea364..43929b446d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_415415_Test.java
@@ -115,7 +115,7 @@ public class Bugzilla_415415_Test extends AbstractCDOTest
CDOCommitInfo commit = remoteUser.commit();
transaction.waitForUpdate(commit.getTimeStamp(), DEFAULT_TIMEOUT);
- assertEquals("As child1 is remotelly detached, the stale reference child2.otherNodes:child1 should be removed", 0, child2.getOtherNodes().size());
+ assertEquals("As child1 is remotely detached, the stale reference child2.otherNodes:child1 should be removed", 0, child2.getOtherNodes().size());
String assertMessage = "As the stale reference child2.otherNodes:child1 has been removed the transaction should be clean";
assertEquals(assertMessage, false, transaction.isDirty());
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index d9286cdda5..f6fd8ee6d6 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -3845,7 +3845,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
private void invalidateNewChildrenOfRemotelyDetached(Set<CDOObject> remotelyDetachedObjects)
{
// Test EObject.eInternalContainer()/eDirectResource() implicit references to have them return null in legacy for
- // objects in NEW state whose a direct/indirect parent has been remotelly detached
+ // objects in NEW state whose a direct/indirect parent has been remotely detached
for (CDOObject referencer : getNewObjects().values())
{

Back to the top