Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-01-10 15:09:31 +0000
committerEike Stepper2009-01-10 15:09:31 +0000
commit36f6e610b8fadba292198ad4c521ca752a168869 (patch)
treecfacce3a00da2cc7ff5905ebca952ef46b8f3eb6
parentd85a33f4be79721c4e0a68431323fea7dc298aca (diff)
downloadcdo-36f6e610b8fadba292198ad4c521ca752a168869.tar.gz
cdo-36f6e610b8fadba292198ad4c521ca752a168869.tar.xz
cdo-36f6e610b8fadba292198ad4c521ca752a168869.zip
fixed 2 warnings
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java3
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index 0bda96f6b4..30b9cde0e8 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
@@ -34,7 +33,9 @@ public final class OpenTransactionAction extends AbstractOpenViewAction
@Override
protected void doRun(IProgressMonitor progressMonitor) throws Exception
{
- CDOTransaction transaction = getSession().openTransaction();
+ getSession().openTransaction();
+
+ // CDOTransaction transaction = getSession().openTransaction();
// transaction.options().getConflictResolvers().add(new CDOObjectConflictResolver.MergeLocalChangesPerFeature());
}
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
index 63ee06f8c2..8171c74c17 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/eresource/impl/CDOResourceImpl.java
@@ -651,6 +651,7 @@ public class CDOResourceImpl extends CDOResourceNodeImpl implements CDOResource,
* @return the URI converter.
* @ADDED
*/
+ @SuppressWarnings("unused")
private URIConverter getURIConverter()
{
return getResourceSet() == null ? getDefaultURIConverter() : getResourceSet().getURIConverter();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
index 72f3b6922a..5336d8b8e4 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOLegacyWrapper.java
@@ -83,6 +83,7 @@ public final class CDOLegacyWrapper extends CDOObjectWrapper
private InternalCDORevision revision;
+ @SuppressWarnings("unused")
private boolean allProxiesResolved;
private boolean handlingCallback;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index 55adfb8c3e..09ee1ba0da 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -535,11 +535,8 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
final private class CommitTransition implements
ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
{
- private boolean useDeltas = false;
-
public CommitTransition(boolean useDeltas)
{
- this.useDeltas = useDeltas;
}
public void execute(InternalCDOObject object, CDOState state, CDOEvent event, CommitTransactionResult data)

Back to the top