diff options
author | Steffen Pingel | 2012-01-15 01:17:41 +0000 |
---|---|---|
committer | Steffen Pingel | 2012-01-15 01:24:47 +0000 |
commit | 4be1e2387287d13d32d771e19a3a5f9e3a8da46c (patch) | |
tree | bf22fb76315200c88b61c7e1601c91a22b5e983b /org.eclipse.mylyn.tasks.ui | |
parent | 2fb6894719cf158175abcaf42d3c1dfa82b7981e (diff) | |
download | org.eclipse.mylyn.tasks-4be1e2387287d13d32d771e19a3a5f9e3a8da46c.tar.gz org.eclipse.mylyn.tasks-4be1e2387287d13d32d771e19a3a5f9e3a8da46c.tar.xz org.eclipse.mylyn.tasks-4be1e2387287d13d32d771e19a3a5f9e3a8da46c.zip |
bug 353236: remove tasks.ui dependency on monitor.ui
https://bugs.eclipse.org/bugs/show_bug.cgi?id=353236
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
3 files changed, 12 insertions, 21 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskEditorBloatMonitor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskEditorBloatMonitor.java index 89ed7c72f..e914d1253 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskEditorBloatMonitor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskEditorBloatMonitor.java @@ -14,7 +14,6 @@ package org.eclipse.mylyn.internal.tasks.ui; import java.util.ArrayList; import java.util.List; -import org.eclipse.mylyn.monitor.ui.AbstractEditorTracker; import org.eclipse.mylyn.tasks.ui.editors.TaskEditor; import org.eclipse.mylyn.tasks.ui.editors.TaskEditorInput; import org.eclipse.ui.IEditorPart; @@ -24,18 +23,13 @@ import org.eclipse.ui.PartInitException; /** * @author Mik Kersten + * @author Steffen Pingel */ -public class TaskEditorBloatMonitor extends AbstractEditorTracker { +public class TaskEditorBloatMonitor { - private final int MAX_EDITORS = 12; + private final static int MAX_EDITORS = 12; - @Override - protected void editorBroughtToTop(IEditorPart part) { - // ignore - } - - @Override - public void editorOpened(IEditorPart editorPartOpened) { + public static void editorOpened(IEditorPart editorPartOpened) { IWorkbenchPage page = editorPartOpened.getSite().getPage(); List<IEditorReference> toClose = new ArrayList<IEditorReference>(); int totalTaskEditors = 0; @@ -60,7 +54,7 @@ public class TaskEditorBloatMonitor extends AbstractEditorTracker { toClose.add(editorReference); } } - if ((totalTaskEditors - toClose.size()) < MAX_EDITORS) { + if ((totalTaskEditors - toClose.size()) <= MAX_EDITORS) { break; } } catch (PartInitException e) { @@ -74,8 +68,4 @@ public class TaskEditorBloatMonitor extends AbstractEditorTracker { } } - @Override - public void editorClosed(IEditorPart editorPart) { - // ignore - } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java index 2559828b3..06eef5ea0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TasksUiPlugin.java @@ -176,8 +176,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { private ISaveParticipant saveParticipant; - private TaskEditorBloatMonitor taskEditorBloatManager; - private TaskJobFactory taskJobFactory; // shared colors for all forms @@ -449,9 +447,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { if (repositoriesView != null) { repositoriesView.getViewer().refresh(); } - - taskEditorBloatManager = new TaskEditorBloatMonitor(); - taskEditorBloatManager.install(PlatformUI.getWorkbench()); } catch (Throwable t) { StatusHandler.log(new Status(IStatus.ERROR, TasksUiPlugin.ID_PLUGIN, "Could not finish Tasks UI initialization", t)); //$NON-NLS-1$ @@ -790,7 +785,6 @@ public class TasksUiPlugin extends AbstractUIPlugin { // PREFERENCE_LISTENER); // } serviceMessageManager.stop(); - taskEditorBloatManager.dispose(PlatformUI.getWorkbench()); INSTANCE = null; } } catch (Exception e) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index c2255b759..daf2998ff 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -55,6 +55,7 @@ import org.eclipse.mylyn.commons.workbench.WorkbenchUtil; import org.eclipse.mylyn.commons.workbench.editors.CommonTextSupport; import org.eclipse.mylyn.internal.tasks.core.LocalRepositoryConnector; import org.eclipse.mylyn.internal.tasks.core.TaskList; +import org.eclipse.mylyn.internal.tasks.ui.TaskEditorBloatMonitor; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.internal.tasks.ui.actions.OpenWithBrowserAction; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskEditorScheduleAction; @@ -191,6 +192,12 @@ public class TaskEditor extends SharedHeaderFormEditor { } @Override + protected void createPages() { + super.createPages(); + TaskEditorBloatMonitor.editorOpened(this); + } + + @Override protected Composite createPageContainer(Composite parent) { this.editorParent = parent; Composite composite = super.createPageContainer(parent); |