? editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java
? editor/src/org/netbeans/modules/editor/impl/CustomizableSideBarClass2LayerFolder.java

Index: editor/src/META-INF/services/org.netbeans.spi.editor.mimelookup.Class2LayerFolder
===================================================================
RCS file: /cvs/editor/src/META-INF/services/org.netbeans.spi.editor.mimelookup.Class2LayerFolder,v
retrieving revision 1.6
diff -u -r1.6 org.netbeans.spi.editor.mimelookup.Class2LayerFolder
--- editor/src/META-INF/services/org.netbeans.spi.editor.mimelookup.Class2LayerFolder   19 Feb 2007 05:27:47 -0000      1.6
+++ editor/src/META-INF/services/org.netbeans.spi.editor.mimelookup.Class2LayerFolder   22 Feb 2007 03:04:14 -0000
@@ -1,4 +1,4 @@
 org.netbeans.modules.editor.impl.GlyphGutterActionsProvider
 org.netbeans.modules.editor.impl.PopupMenuActionsProvider
-org.netbeans.modules.editor.CustomizableSideBarClass2LayerFolder
+org.netbeans.modules.editor.impl.CustomizableSideBarClass2LayerFolder
 org.netbeans.modules.editor.hyperlink.LayerHyperlinkClass2LayerFolder

cvs server: editor/src/org/netbeans/modules/editor/CustomizableSideBar.java was removed, no comparison available
cvs server: editor/src/org/netbeans/modules/editor/CustomizableSideBarClass2LayerFolder.java was removed, no comparison available

Index: editor/src/org/netbeans/modules/editor/NbEditorUI.java
===================================================================
RCS file: /cvs/editor/src/org/netbeans/modules/editor/NbEditorUI.java,v
retrieving revision 1.61
diff -u -r1.61 NbEditorUI.java
--- editor/src/org/netbeans/modules/editor/NbEditorUI.java      21 Feb 2007 05:06:32 -0000      1.61
+++ editor/src/org/netbeans/modules/editor/NbEditorUI.java      22 Feb 2007 03:04:14 -0000
@@ -20,10 +20,8 @@
 package org.netbeans.modules.editor;

 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
@@ -40,15 +38,12 @@
 import javax.swing.text.AttributeSet;
 import javax.swing.text.Document;
 import javax.swing.text.JTextComponent;
-import javax.swing.text.StyleConstants;
 import org.netbeans.api.editor.mimelookup.MimeLookup;
-import org.netbeans.api.editor.settings.EditorStyleConstants;
 import org.netbeans.api.editor.settings.FontColorSettings;
 import org.netbeans.editor.BaseKit;
 import org.netbeans.editor.Coloring;
 import org.netbeans.editor.EditorUI;
 import org.netbeans.editor.Settings;
-import org.netbeans.editor.SettingsDefaults;
 import org.netbeans.editor.Utilities;
 import org.netbeans.editor.ext.ExtEditorUI;
 import org.netbeans.editor.ext.ExtKit;
@@ -69,7 +64,8 @@
 import javax.swing.JToolBar;
 import javax.swing.border.Border;
 import org.netbeans.api.editor.mimelookup.MimePath;
-import org.netbeans.modules.editor.CustomizableSideBar.SideBarPosition;
+import org.netbeans.modules.editor.impl.CustomizableSideBar;
+import org.netbeans.modules.editor.impl.CustomizableSideBar.SideBarPosition;
 import org.openide.text.CloneableEditorSupport;
 import org.openide.util.ContextAwareAction;
 import org.openide.util.Lookup;