diff options
author | Eike Stepper | 2009-01-12 13:34:16 +0000 |
---|---|---|
committer | Eike Stepper | 2009-01-12 13:34:16 +0000 |
commit | 0b35024f16c83fb04825d8b2ae327209b7e73a91 (patch) | |
tree | 66b8096c5e81c6e3fa9ea964f5405cb890f30cf1 /plugins/org.eclipse.emf.cdo.ui.ide | |
parent | 0ec22f3b7a19524dc7e1e6decb73f42705101a95 (diff) | |
download | cdo-0b35024f16c83fb04825d8b2ae327209b7e73a91.tar.gz cdo-0b35024f16c83fb04825d8b2ae327209b7e73a91.tar.xz cdo-0b35024f16c83fb04825d8b2ae327209b7e73a91.zip |
*** empty log message ***
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.ide')
2 files changed, 2 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/DisconnectAction.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/DisconnectAction.java index b9d5021f19..07c1a51f9a 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/DisconnectAction.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/DisconnectAction.java @@ -11,7 +11,6 @@ */ package org.eclipse.emf.cdo.ui.internal.ide; -import org.eclipse.emf.cdo.internal.team.RepositoryTeamProvider; import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; import org.eclipse.net4j.util.ui.UIUtil; @@ -20,7 +19,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; @@ -37,13 +35,11 @@ public class DisconnectAction implements IObjectActionDelegate public void setActivePart(IAction action, IWorkbenchPart targetPart) { - setEnablement(action); } public void selectionChanged(IAction action, ISelection selection) { project = UIUtil.getElement(selection, IProject.class); - setEnablement(action); } public void run(IAction action) @@ -52,22 +48,9 @@ public class DisconnectAction implements IObjectActionDelegate { RepositoryProvider.unmap(project); } - catch (TeamException ex) + catch (Exception ex) { OM.LOG.error(ex); } } - - private void setEnablement(IAction action) - { - if (project == null) - { - action.setEnabled(false); - } - else - { - RepositoryProvider provider = RepositoryProvider.getProvider(project, RepositoryTeamProvider.PROVIDER_ID); - action.setEnabled(provider != null); - } - } } diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/TeamConfigurationWizard.java b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/TeamConfigurationWizard.java index 1689f28808..aa13c46443 100644 --- a/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/TeamConfigurationWizard.java +++ b/plugins/org.eclipse.emf.cdo.ui.ide/src/org/eclipse/emf/cdo/ui/internal/ide/TeamConfigurationWizard.java @@ -17,7 +17,6 @@ import org.eclipse.emf.cdo.ui.internal.ide.bundle.OM; import org.eclipse.core.resources.IProject; import org.eclipse.jface.wizard.Wizard; import org.eclipse.team.core.RepositoryProvider; -import org.eclipse.team.core.TeamException; import org.eclipse.team.ui.IConfigurationWizard; import org.eclipse.ui.IWorkbench; @@ -45,7 +44,7 @@ public class TeamConfigurationWizard extends Wizard implements IConfigurationWiz RepositoryProvider.map(project, RepositoryTeamProvider.PROVIDER_ID); return true; } - catch (TeamException ex) + catch (Exception ex) { OM.LOG.error(ex); return false; |