Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-08-05 15:05:38 +0000
committerEike Stepper2015-08-05 15:05:38 +0000
commit3f1315d703eee0f99cb24c2d25433587bf6aa8af (patch)
treebea7710eb4eba7c31cf5b727134ccbc7c39df05f /plugins/org.eclipse.emf.cdo.explorer.ui
parent1682d9c3d1259173445650c4b90b07d3b8b393e6 (diff)
downloadcdo-3f1315d703eee0f99cb24c2d25433587bf6aa8af.tar.gz
cdo-3f1315d703eee0f99cb24c2d25433587bf6aa8af.tar.xz
cdo-3f1315d703eee0f99cb24c2d25433587bf6aa8af.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml3
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java9
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java2
4 files changed, 7 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
index 90c29bfade..5505c44d58 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/plugin.xml
@@ -98,7 +98,8 @@
<view
id="org.eclipse.emf.cdo.explorer.ui.CDORepositoriesView"
relationship="stack"
- relative="org.eclipse.ui.views.ContentOutline">
+ relative="org.eclipse.ui.views.ContentOutline"
+ visible="false">
</view>
<view
id="org.eclipse.ui.views.PropertySheet"
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
index 5820bc1bf5..8822982a14 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/CDOCheckoutContentProvider.java
@@ -510,7 +510,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
final Object finalObject = object;
final CDOCheckout finalOpeningCheckout = openingCheckout;
- final CDOCheckout finalCheckout = checkout;
+
final ITreeContentProvider contentProvider = stateManager.getContentProvider(finalObject);
if (contentProvider == null)
{
@@ -558,12 +558,7 @@ public class CDOCheckoutContentProvider implements ICommonContentProvider, IProp
loadedRevisions.addAll(revisions);
}
- Object[] children;
- CDOCheckout checkout = finalCheckout != null ? finalCheckout : CDOExplorerUtil.getCheckout(finalObject);
- synchronized (checkout.getView())
- {
- children = contentProvider.getChildren(finalObject);
- }
+ Object[] children = contentProvider.getChildren(finalObject);
// Adjust possible legacy adapters.
for (int i = 0; i < children.length; i++)
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
index 8e4f7cb49e..8ee236a5bf 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/NewActionProvider.java
@@ -512,7 +512,7 @@ public class NewActionProvider extends CommonActionProvider implements ISelectio
protected void preRun() throws Exception
{
SelectClassDialog dialog = new SelectClassDialog(page, "New Root Object",
- "Select a package and a class for new root object.");
+ "Select a package and a class for the new root object.");
if (dialog.open() == SelectClassDialog.OK)
{
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
index cd09b3abf1..02a4937cda 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java
@@ -43,6 +43,8 @@ public class WorkspaceUpdateHandler extends AbstractBaseHandler<OfflineCDOChecko
CDOMerger merger = new DefaultCDOMerger.PerFeature.ManyValued();
CDOTransaction transaction = workspace.update(merger);
transaction.commit(monitor);
+
+ checkout.refresh();
}
}
}

Back to the top