NEW - bug 244650: Move WikiText out of incubator, task editor extension out of sandbox

https://bugs.eclipse.org/bugs/show_bug.cgi?id=244650

1 files changed, 1 insertions, 56 deletions

diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/EditorStyleContributionItem.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/EditorStyleContributionItem.java
index 9ae59a65..c0e49d8f 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/EditorStyleContributionItem.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/EditorStyleContributionItem.java
@@ -13,17 +13,13 @@ package org.eclipse.mylyn.internal.sandbox.ui.editors;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.SortedSet;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.window.Window;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensions;
-import org.eclipse.mylyn.internal.tasks.ui.editors.TaskEditorExtensions.RegisteredTaskEditorExtension;
 import org.eclipse.mylyn.tasks.core.TaskRepository;
 import org.eclipse.mylyn.tasks.ui.TasksUiUtil;
 import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditorExtension;
@@ -37,35 +33,6 @@ import org.eclipse.ui.actions.CompoundContributionItem;
  */
 public class EditorStyleContributionItem extends CompoundContributionItem {
 
-	private class EditorStyleContributionAction extends Action {
-
-		private final RegisteredTaskEditorExtension editorExtension;
-
-		public EditorStyleContributionAction(RegisteredTaskEditorExtension editorExtension) {
-			super(editorExtension.getName());
-			setId(editorExtension.getId() + ".action");
-			this.editorExtension = editorExtension;
-		}
-
-		// default constructor only needs specifying id and name
-		public EditorStyleContributionAction(String id, String name) {
-			super(name);
-			setId(id);
-			this.editorExtension = null;
-		}
-
-		@Override
-		public void run() {
-			if (taskRepository != null) {
-				TaskEditorExtensions.setTaskEditorExtensionId(taskRepository,
-						editorExtension != null ? editorExtension.getId() : "");
-				setChecked(true);
-			}
-		}
-	}
-
-	private final TaskRepository taskRepository;
-
 	public EditorStyleContributionItem() {
 		this(null);
 	}
@@ -77,35 +44,12 @@ public class EditorStyleContributionItem extends CompoundContributionItem {
 
 	public EditorStyleContributionItem(String id, TaskRepository taskRepository) {
 		super(id);
-		this.taskRepository = taskRepository;
 	}
 
 	@Override
 	protected IContributionItem[] getContributionItems() {
 		List<IContributionItem> items = new ArrayList<IContributionItem>();
-
-		EditorStyleContributionAction noEditorStyleContributionAction = new EditorStyleContributionAction(
-				"org.eclipse.mylyn.sandbox.ui.action.none", "None");
-		items.add(new ActionContributionItem(noEditorStyleContributionAction));
-		String defaultExtensionId = TaskEditorExtensions.getTaskEditorExtensionId(taskRepository);
-		if (defaultExtensionId == null || defaultExtensionId.equals("")) {
-			noEditorStyleContributionAction.setChecked(true);
-		}
-
-		SortedSet<RegisteredTaskEditorExtension> allEditorExtensions = TaskEditorExtensions.getTaskEditorExtensions();
-		for (RegisteredTaskEditorExtension editorExtension : allEditorExtensions) {
-			Action editorStyleAction = new EditorStyleContributionAction(editorExtension);
-			ActionContributionItem item = new ActionContributionItem(editorStyleAction);
-			if (editorExtension.getId().equals(defaultExtensionId)) {
-				editorStyleAction.setChecked(true);
-			}
-
-			items.add(item);
-		}
-
-		items.add(new Separator());
 		items.add(new ActionContributionItem(new InteranlLinkAction()));
-
 		return items.toArray(new IContributionItem[items.size()]);
 	}
 
@@ -143,4 +87,5 @@ public class EditorStyleContributionItem extends CompoundContributionItem {
 		TaskRepository taskRepository = TasksUiUtil.getSelectedRepository();
 		taskRepository.setProperty(AbstractTaskEditorExtension.INTERNAL_WIKI_LINK_PATTERN, internalLink);
 	}
+
 }