#784 Fix removing unnecessary tools

Signed-off-by: Faycal ABKA <abka.faycal@gmail.com>
eclipse · Apr 29, 2024 · 901e127 · 901e127
1 parent 4995b94
commit 901e127
Showing 1 changed file with 6 additions and 20 deletions.
diff --git a/...get/src/org/polarsys/kitalpha/richtext/widget/factory/MDERichTextConfigurableFactory.java b/...get/src/org/polarsys/kitalpha/richtext/widget/factory/MDERichTextConfigurableFactory.java
@@ -15,17 +15,13 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.polarsys.kitalpha.richtext.common.intf.MDERichTextWidget;
-import org.polarsys.kitalpha.richtext.common.util.MDERichTextHelper;
-import org.polarsys.kitalpha.richtext.nebula.widget.MDENebulaBasedRichTextWidget;
 import org.polarsys.kitalpha.richtext.nebula.widget.MDENebulaRichTextConfiguration;
 import org.polarsys.kitalpha.richtext.nebula.widget.MDERichTextConstants;
 import org.polarsys.kitalpha.richtext.widget.MDERichtextWidgetImpl;
 import org.polarsys.kitalpha.richtext.widget.configurable.editormodel.EditorGroup;
 import org.polarsys.kitalpha.richtext.widget.configurable.editormodel.EditorItem;
 import org.polarsys.kitalpha.richtext.widget.configurable.editormodel.EditorModel;
 import org.polarsys.kitalpha.richtext.widget.configurable.editormodel.EditorToolbar;
-import org.polarsys.kitalpha.richtext.widget.editor.tools.OpenInEditorHandler;
-import org.polarsys.kitalpha.richtext.widget.internal.Activator;
 
 public class MDERichTextConfigurableFactory extends MDERichTextFactory {
 	public MDERichTextWidget createPreferencesCompliantRichTextWidget(Composite parent) {
@@ -78,12 +74,11 @@ public MDERichTextWidget createPreferencesCompliantRichTextWidget(Composite pare
 
 		// Remove systematically when we configure the rich text editor
 		configuration.setOption(MDENebulaRichTextConfiguration.REMOVE_PLUGINS, MDERichTextConstants.SMILEYS);
-
-		configuration.removeDefaultToolbarButton(MDERichTextConstants.FLASH);
-		configuration.removeDefaultToolbarButton(MDERichTextConstants.IFRAME);
-		configuration.removeDefaultToolbarButton(MDERichTextConstants.IMAGE);
-		configuration.removeDefaultToolbarButton(MDERichTextConstants.PAGE_BREAK);
-		configuration.removeDefaultToolbarButton(MDERichTextConstants.SMILEYS);
+		configuration.removeToolbarItems(MDERichTextConstants.FLASH);
+		configuration.removeToolbarItems(MDERichTextConstants.IFRAME);
+		configuration.removeToolbarItems(MDERichTextConstants.IMAGE);
+		configuration.removeToolbarItems(MDERichTextConstants.PAGE_BREAK);
+		configuration.removeToolbarItems(MDERichTextConstants.SMILEYS);
 
 		MDERichtextWidgetImpl widget;
 
@@ -96,19 +91,10 @@ public MDERichTextWidget createPreferencesCompliantRichTextWidget(Composite pare
 			widget = new MDERichtextWidgetImpl(parent, configuration);
 		}
 
-		addEditorToolbarItems(widget);
+		addToolbarItems(widget);
 		return widget;
 	}
 
-	@Override
-	protected void addEditorToolbarItems(MDENebulaBasedRichTextWidget widget) {
-		super.addEditorToolbarItems(widget);
-		widget.addToolbarItem(widget, MDERichTextConstants.MDE_OPEN_EDITOR, MDERichTextConstants.MDE_OPEN_EDITOR, "Open in Editor", //$NON-NLS-1$ 
-				MDERichTextConstants.MDE_ENABLE_EDITING_TOOLBAR,
-				MDERichTextHelper.getURL(Activator.PLUGIN_ID, "icons/openInEditor.gif"), //$NON-NLS-1$
-				new OpenInEditorHandler());
-	}
-
 
 	public static boolean isConfigurableRTEActivated()
 	{