diff -r 95b9ad60c0f7 editor/src/org/netbeans/modules/editor/NbEditorKit.java --- a/editor/src/org/netbeans/modules/editor/NbEditorKit.java Tue Mar 18 12:30:11 2008 +0100 +++ b/editor/src/org/netbeans/modules/editor/NbEditorKit.java Wed Mar 19 09:43:01 2008 +0100 @@ -54,6 +54,7 @@ import java.util.Map; import java.util.Map; import java.util.MissingResourceException; import java.util.ResourceBundle; +import java.util.concurrent.Callable; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; @@ -82,8 +83,10 @@ import org.netbeans.editor.SettingsNames import org.netbeans.editor.SettingsNames; import org.netbeans.editor.ext.ExtSettingsNames; import org.netbeans.modules.editor.impl.ActionsList; +import org.netbeans.modules.editor.impl.CustomizableSideBar; import org.netbeans.modules.editor.impl.SearchBar; import org.netbeans.modules.editor.impl.PopupMenuActionsProvider; +import org.netbeans.modules.editor.impl.ToolbarActionsProvider; import org.netbeans.modules.editor.impl.actions.NavigationHistoryBackAction; import org.netbeans.modules.editor.impl.actions.NavigationHistoryForwardAction; import org.netbeans.modules.editor.impl.actions.NavigationHistoryLastEditAction; @@ -108,7 +111,7 @@ import org.openide.util.NbBundle; * @version 1.00 */ -public class NbEditorKit extends ExtKit { +public class NbEditorKit extends ExtKit implements Callable { /** Action property that stores the name of the corresponding nb-system-action */ public static final String SYSTEM_ACTION_CLASS_NAME_PROPERTY = "systemActionClassName"; // NOI18N @@ -866,4 +869,13 @@ public class NbEditorKit extends ExtKit } } } + + public Object call() { + CustomizableSideBar.getFactoriesMap(getContentType()); + NbEditorToolBar.getKeyBindingList(getContentType()); + ToolbarActionsProvider.getToolbarItems(getContentType()); + ToolbarActionsProvider.getToolbarItems("text/base"); //NOI18N + + return null; + } } diff -r 95b9ad60c0f7 editor/src/org/netbeans/modules/editor/NbEditorToolBar.java --- a/editor/src/org/netbeans/modules/editor/NbEditorToolBar.java Tue Mar 18 12:30:11 2008 +0100 +++ b/editor/src/org/netbeans/modules/editor/NbEditorToolBar.java Wed Mar 19 09:43:01 2008 +0100 @@ -412,7 +412,7 @@ import org.openide.util.lookup.ProxyLook return retMap; } - private static List getKeyBindingList(String mimeType) { + public static List getKeyBindingList(String mimeType) { List keyBindingsList = new ArrayList(); AllOptionsFolder aof = AllOptionsFolder.getDefault(); diff -r 95b9ad60c0f7 editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java --- a/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java Tue Mar 18 12:30:11 2008 +0100 +++ b/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java Wed Mar 19 09:43:01 2008 +0100 @@ -233,7 +233,7 @@ public final class CustomizableSideBar { return sideBarsMap; } - private static Map> getFactoriesMap(String mimeType) { + public static Map> getFactoriesMap(String mimeType) { MimePath mimePath = MimePath.parse(mimeType); Lookup.Result lR = LR.get(mimePath); diff -r 95b9ad60c0f7 openide.text/src/org/openide/text/CloneableEditor.java --- a/openide.text/src/org/openide/text/CloneableEditor.java Tue Mar 18 12:30:11 2008 +0100 +++ b/openide.text/src/org/openide/text/CloneableEditor.java Wed Mar 19 09:43:01 2008 +0100 @@ -44,6 +44,7 @@ package org.openide.text; import java.awt.*; import java.io.*; +import java.util.concurrent.Callable; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.*; @@ -262,6 +263,14 @@ public class CloneableEditor extends Clo paneMap.put(DefaultEditorKit.pasteAction, getAction(DefaultEditorKit.pasteAction)); kit = support.cesKit(); + + if (kit instanceof Callable) { + try { + ((Callable) kit).call(); + } catch (Exception e) { + e.printStackTrace(); + } + } } private void initCustomEditor() {