Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-09-22 09:08:59 +0000
committerEike Stepper2015-09-22 09:08:59 +0000
commit3d0d03c3136634e2a68c14d078c4764cda984ccf (patch)
tree619000044c44c99e7dec32387d0c6c090ac3c08f
parent3a0a9441b8c320882b27e85724c9faa4d9b355d9 (diff)
downloadcdo-3d0d03c3136634e2a68c14d078c4764cda984ccf.tar.gz
cdo-3d0d03c3136634e2a68c14d078c4764cda984ccf.tar.xz
cdo-3d0d03c3136634e2a68c14d078c4764cda984ccf.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRepositoryPage.java12
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch10
3 files changed, 18 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
index 42231ee74d..d36823eb72 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/SwitchToActionProvider.java
@@ -35,7 +35,7 @@ public class SwitchToActionProvider extends AbstractBranchPointActionProvider
@Override
protected void fillSubMenu(IWorkbenchPage page, IMenuManager subMenu, CDOCheckout checkout)
{
- if (checkout.isOnline())
+ if (CDOCheckout.TYPE_ONLINE_TRANSACTIONAL.equals(checkout.getType()))
{
subMenu.add(new SwitchToNewBranchAction(page, checkout));
}
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRepositoryPage.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRepositoryPage.java
index e8709c1a29..b74a71a166 100644
--- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRepositoryPage.java
+++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/wizards/CheckoutRepositoryPage.java
@@ -12,6 +12,7 @@ package org.eclipse.emf.cdo.explorer.ui.checkouts.wizards;
import org.eclipse.emf.cdo.explorer.CDOExplorerUtil;
import org.eclipse.emf.cdo.explorer.repositories.CDORepository;
+import org.eclipse.emf.cdo.explorer.repositories.CDORepositoryManager;
import org.eclipse.emf.cdo.explorer.ui.repositories.CDORepositoriesView;
import org.eclipse.emf.cdo.explorer.ui.repositories.CDORepositoryItemProvider;
import org.eclipse.emf.cdo.internal.explorer.checkouts.CDOCheckoutImpl;
@@ -136,6 +137,17 @@ public class CheckoutRepositoryPage extends CheckoutWizardPage
}
});
+ if (repository == null)
+ {
+ CDORepositoryManager repositoryManager = CDOExplorerUtil.getRepositoryManager();
+ CDORepository[] repositories = repositoryManager.getRepositories();
+ if (repositories.length != 0)
+ {
+ setRepository(repositories[0]);
+ tableViewer.setSelection(new StructuredSelection(repositories[0]));
+ }
+ }
+
tableViewer.addDoubleClickListener(new IDoubleClickListener()
{
public void doubleClick(DoubleClickEvent event)
diff --git a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
index c58c26cebc..28acd859bb 100644
--- a/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
+++ b/plugins/org.eclipse.emf.cdo.ui/CDOClient1.launch
@@ -10,10 +10,10 @@
<setEntry value="org.eclipse.emf.cdo.examples.company.edit:4.0.400.qualifier:default:true"/>
<setEntry value="org.eclipse.emf.cdo.expressions.edit:4.3.100.qualifier:default:true"/>
<setEntry value="org.eclipse.emf.cdo.security.edit:4.3.100.qualifier:default:true"/>
-<setEntry value="org.eclipse.emf.compare.edit:4.1.0.201508020419:default:true"/>
-<setEntry value="org.eclipse.emf.databinding.edit:1.3.0.v20150601-0402:default:true"/>
-<setEntry value="org.eclipse.emf.ecore.edit:2.9.0.v20150601-0402:default:true"/>
-<setEntry value="org.eclipse.emf.ecore.editor:2.11.0.v20150601-0402:default:true"/>
+<setEntry value="org.eclipse.emf.compare.edit:4.2.0.201509130440:default:true"/>
+<setEntry value="org.eclipse.emf.databinding.edit:1.3.0.v20150904-1501:default:true"/>
+<setEntry value="org.eclipse.emf.ecore.edit:2.9.0.v20150904-1501:default:true"/>
+<setEntry value="org.eclipse.emf.ecore.editor:2.11.0.v20150904-1501:default:true"/>
<setEntry value="org.eclipse.emf.ecp.edit:1.5.0.20141210-1818:default:true"/>
<setEntry value="org.eclipse.emf.ecp.view.categorization.model.edit:1.5.0.20141210-1818:default:true"/>
<setEntry value="org.eclipse.emf.ecp.view.compoundcontrol.model.edit:1.5.0.20141210-1818:default:true"/>
@@ -28,7 +28,7 @@
<setEntry value="org.eclipse.emf.ecp.view.template.model.edit:1.5.0.20141210-1818:default:true"/>
<setEntry value="org.eclipse.emf.ecp.view.treemasterdetail.model.edit:1.5.0.20141210-1818:default:true"/>
<setEntry value="org.eclipse.emf.ecp.view.vertical.model.edit:1.5.0.20141210-1818:default:true"/>
-<setEntry value="org.eclipse.emf.edit:2.11.0.v20150601-0402:default:true"/>
+<setEntry value="org.eclipse.emf.edit:2.12.0.v20150904-1501:default:true"/>
<setEntry value="org.eclipse.gmf.codegen.edit:2.9.0.201406111907:default:true"/>
<setEntry value="org.eclipse.gmf.runtime.notation.edit:1.7.0.201505312221:default:true"/>
</setAttribute>

Back to the top