[458349] Consolidate UI

Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349

3 files changed, 9 insertions, 43 deletions

diff --git a/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
index 6ea8366a80..89454167cb 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.ui.team/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.ui.team;singleton:=true
-Bundle-Version: 4.2.100.qualifier
+Bundle-Version: 4.2.200.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.ui.internal.team.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -10,9 +10,8 @@ Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.ui;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.ui.shared;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.ui.internal.team.actions;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.team.bundle;version="4.2.100";x-internal:=true,
- org.eclipse.emf.cdo.ui.internal.team.history;version="4.2.100";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.ui.internal.team.bundle;version="4.2.200";x-internal:=true,
+ org.eclipse.emf.cdo.ui.internal.team.history;version="4.2.200";x-friends:="org.eclipse.emf.cdo.explorer.ui"
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/plugin.xml b/plugins/org.eclipse.emf.cdo.ui.team/plugin.xml
index 31d037c824..b66231e613 100644
--- a/plugins/org.eclipse.emf.cdo.ui.team/plugin.xml
+++ b/plugins/org.eclipse.emf.cdo.ui.team/plugin.xml
@@ -21,6 +21,11 @@
         <adapter type="org.eclipse.team.ui.history.IHistoryPageSource"/>
      </factory>
      <factory
+           adaptableType="org.eclipse.emf.cdo.common.branch.CDOBranch"
+           class="org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryAdapterFactory">
+        <adapter type="org.eclipse.team.ui.history.IHistoryPageSource"/>
+     </factory>
+     <factory
            adaptableType="org.eclipse.emf.cdo.view.CDOView"
            class="org.eclipse.emf.cdo.ui.internal.team.history.CDOHistoryAdapterFactory">
         <adapter type="org.eclipse.team.ui.history.IHistoryPageSource"/>
diff --git a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/actions/AbstractContainerAction.java b/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/actions/AbstractContainerAction.java
deleted file mode 100644
index cb62268fde..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.team/src/org/eclipse/emf/cdo/ui/internal/team/actions/AbstractContainerAction.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2012 Eike Stepper (Berlin, Germany) and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *    Victor Roldan Betancort - initial API and implementation
- *    Eike Stepper - maintenance
- */
-package org.eclipse.emf.cdo.ui.internal.team.actions;
-
-import org.eclipse.net4j.util.container.IContainer;
-import org.eclipse.net4j.util.ui.actions.LongRunningAction;
-
-/**
- * @author Victor Roldan Betancort
- */
-public abstract class AbstractContainerAction<E> extends LongRunningAction
-{
-  private IContainer.Modifiable<E> container;
-
-  public AbstractContainerAction(IContainer.Modifiable<E> container)
-  {
-    setContainer(container);
-  }
-
-  protected IContainer.Modifiable<E> getContainer()
-  {
-    return container;
-  }
-
-  protected void setContainer(IContainer.Modifiable<E> container)
-  {
-    this.container = container;
-  }
-}