summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-07-02 03:09:00 (EDT)
committerEike Stepper2007-07-02 03:09:00 (EDT)
commit1db3bcb946993358321a881865b74383f153c467 (patch)
tree6edf31fbaadae67acd4c27e2d6bc806e8fe0ea2f
parent354a64b680a1723978e92e209e1255142a4f7fc7 (diff)
downloadcdo-1db3bcb946993358321a881865b74383f153c467.zip
cdo-1db3bcb946993358321a881865b74383f153c467.tar.gz
cdo-1db3bcb946993358321a881865b74383f153c467.tar.bz2
task 1: Develop 0.8.0
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java8
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
index 7d01c3e..96d833a 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/views/CDOItemProvider.java
@@ -76,8 +76,8 @@ public class CDOItemProvider extends ContainerItemProvider
if (obj instanceof CDOView)
{
CDOView view = (CDOView)obj;
- return view.isHistorical() ? new Date(view.getTimeStamp()).toString() : view.isReadOnly() ? "readOnly"
- : "readWrite";
+ return view.isHistorical() ? new Date(view.getTimeStamp()).toString() : view.isReadOnly() ? "View"
+ : "Transaction";
}
return super.getText(obj);
@@ -120,7 +120,7 @@ public class CDOItemProvider extends ContainerItemProvider
if (object instanceof CDOSession)
{
CDOSession session = (CDOSession)object;
- manager.add(new OpenViewAction("Open View", "Open a CDO view", session)
+ manager.add(new OpenViewAction("Open Transaction", "Open a CDO transaction", session)
{
@Override
protected CDOView createView()
@@ -129,7 +129,7 @@ public class CDOItemProvider extends ContainerItemProvider
}
});
- manager.add(new OpenViewAction("Open Read-Only View", "Open a read-only CDO view", session)
+ manager.add(new OpenViewAction("Open View", "Open a read-only CDO view", session)
{
@Override
protected CDOView createView()
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
index 4adca16..776714e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOViewImpl.java
@@ -185,7 +185,7 @@ public class CDOViewImpl implements CDOView, Adapter.Internal
CDOObjectImpl object = objects.get(id);
if (object == null)
{
- object = createObjectFromView(id);
+ object = createObject(id);
registerObject(object);
}
@@ -417,7 +417,7 @@ public class CDOViewImpl implements CDOView, Adapter.Internal
CDOStateMachine.INSTANCE.detach(cdoResource, cdoResource, this);
}
- private CDOObjectImpl createObjectFromView(CDOID id)
+ private CDOObjectImpl createObject(CDOID id)
{
if (TRACER.isEnabled())
{