summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-06 04:47:04 (EDT)
committerEike Stepper2007-08-06 04:47:04 (EDT)
commit37fcd4a07f78780f31364253281df1bd3479488a (patch)
treea7d81cee55c4194d359aedada97b9f0538514688
parentc3bc0eab651bada892704ad94501e25cac550941 (diff)
downloadcdo-37fcd4a07f78780f31364253281df1bd3479488a.zip
cdo-37fcd4a07f78780f31364253281df1bd3479488a.tar.gz
cdo-37fcd4a07f78780f31364253281df1bd3479488a.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/NOOPStore.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java3
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java11
3 files changed, 10 insertions, 27 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/NOOPStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/NOOPStore.java
index 213f9ac..1bb81f2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/NOOPStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/store/NOOPStore.java
@@ -48,8 +48,6 @@ public class NOOPStore extends Store
@Override
protected void update(ITransaction transaction, CDOPackageImpl cdoPackage)
{
- // TODO Implement method .createAddPackageOperation()
- throw new UnsupportedOperationException("Not yet implemented");
}
};
}
@@ -62,8 +60,6 @@ public class NOOPStore extends Store
@Override
protected void queryAndFill(ITransaction transaction, CDOPackageImpl cdoPackage)
{
- // TODO Implement method .createLoadPackageOperation()
- throw new UnsupportedOperationException("Not yet implemented");
}
};
}
@@ -76,8 +72,6 @@ public class NOOPStore extends Store
@Override
protected void update(ITransaction transaction, CDORevisionImpl revision)
{
- // TODO Implement method .update()
- throw new UnsupportedOperationException("Not yet implemented");
}
};
}
@@ -90,8 +84,7 @@ public class NOOPStore extends Store
@Override
protected CDORevisionImpl query(ITransaction transaction, CDOID id) throws Exception
{
- // TODO Implement method .query()
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
};
}
@@ -104,8 +97,7 @@ public class NOOPStore extends Store
@Override
protected CDORevisionImpl query(ITransaction transaction, CDOID id, long timeStamp) throws Exception
{
- // TODO Implement method .query()
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
};
}
@@ -119,8 +111,6 @@ public class NOOPStore extends Store
@Override
protected void update(ITransaction transaction, CDOID id, String path)
{
- // TODO Implement method .createRegisterResourceOperation()
- throw new UnsupportedOperationException("Not yet implemented");
}
};
}
@@ -133,8 +123,7 @@ public class NOOPStore extends Store
@Override
protected CDOID query(ITransaction transaction, String path) throws Exception
{
- // TODO Implement method .query()
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
};
}
@@ -147,8 +136,7 @@ public class NOOPStore extends Store
@Override
protected String query(ITransaction transaction, CDOID id) throws Exception
{
- // TODO Implement method .query()
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
};
}
@@ -161,8 +149,7 @@ public class NOOPStore extends Store
@Override
protected CDOClassRef query(ITransaction transaction, CDOID id) throws Exception
{
- // TODO Implement method .query()
- throw new UnsupportedOperationException("Not yet implemented");
+ return null;
}
};
}
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
index a9f549a..ed41b72 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/editor/CDOEditor.java
@@ -9,6 +9,7 @@ package org.eclipse.emf.cdo.internal.ui.editor;
import org.eclipse.emf.cdo.CDOObject;
import org.eclipse.emf.cdo.CDOTransaction;
import org.eclipse.emf.cdo.CDOView;
+import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.internal.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.views.CDOEventHandler;
import org.eclipse.emf.cdo.protocol.model.CDOClass;
@@ -2163,7 +2164,7 @@ public class CDOEditor extends MultiPageEditorPart implements IEditingDomainProv
private CreateRootAction(CDOClass cdoClass)
{
- super(getEditorSite().getPage(), cdoClass.getName());
+ super(getEditorSite().getPage(), cdoClass.getName(), SharedIcons.getDescriptor(SharedIcons.OBJ_ECLASS));
this.cdoClass = cdoClass;
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
index 8b2382d..a31963f 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/transaction/Transaction.java
@@ -85,13 +85,8 @@ public class Transaction implements ITransaction
private List<ITransactionalOperation> end()
{
- try
- {
- return operations;
- }
- finally
- {
- operations = null;
- }
+ List<ITransactionalOperation> tmp = operations;
+ operations = null;
+ return tmp;
}
}