# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: CleanComboUI.java
*** D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\CleanComboUI.java Base (1.2)
--- D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\CleanComboUI.java Locally Modified (Based On 1.2)
***************
*** 33,39 ****
  import javax.swing.plaf.basic.BasicComboBoxUI.ComboBoxLayoutManager;
  import javax.swing.plaf.metal.MetalComboBoxIcon;
  
- 
  /** A combobox ui delegate that hides the border for use in the property
   * sheet, and does not have problems with firing unexpected focus lost
   * events that confuse the property sheet.
--- 33,38 ----
***************
*** 143,149 ****
       *  will be events in which removeEditor() will be called because the
       *  editor's action has been performed.  */
      protected FocusListener createFocusListener() {
!         return super.createFocusListener();
  
          /*
  
--- 142,159 ----
       *  will be events in which removeEditor() will be called because the
       *  editor's action has been performed.  */
      protected FocusListener createFocusListener() {
!         final FocusListener orig = super.createFocusListener();
!         return new FocusListener() {
!             public void focusGained(FocusEvent e) {
!                 orig.focusGained( e );
!             }
!             public void focusLost(FocusEvent e) {
!                 Component src = (Component)e.getSource();
!                 if( src instanceof ComboInplaceEditor || (null != src.getParent() && src.getParent() instanceof ComboInplaceEditor) )
!                     e = new FocusEvent( (Component)e.getSource(), e.getID(), true, e.getOppositeComponent() );
!                 orig.focusLost( e );
!             }
!         };
  
          /*
  
***************
*** 299,304 ****
--- 309,324 ----
          }
      }
  
+     protected void configureEditor() {
+         super.configureEditor();
+         FocusListener[] listeners = editor.getFocusListeners();
+         for( int i=0; i<listeners.length; i++ ) {
+             if( listeners[i] instanceof LayoutManager ) {
+                 editor.removeFocusListener( listeners[i] );
+             } 
+         }
+     }
+ 
      private class CleanComboLayout extends ComboBoxLayoutManager {
          public void layoutContainer(Container parent) {
              super.layoutContainer(parent);
Index: RendererFactory.java
*** D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\RendererFactory.java Base (1.8)
--- D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\RendererFactory.java Locally Modified (Based On 1.8)
***************
*** 496,502 ****
  
          /** Overridden to clear state after painting once */
          public void paintComponent(Graphics g) {
!             setEnabled(isEnabled() && PropUtils.checkEnabled(this, editor, this.env));
  
              //We may paint without a parent in PropertyPanel, so do a layout to
              //ensure there's something to paint
--- 496,502 ----
  
          /** Overridden to clear state after painting once */
          public void paintComponent(Graphics g) {
!             setEnabled(isEnabled() && env.isEditable());
  
              //We may paint without a parent in PropertyPanel, so do a layout to
              //ensure there's something to paint
Index: EditorPropertyDisplayer.java
*** D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\EditorPropertyDisplayer.java Base (1.3)
--- D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\EditorPropertyDisplayer.java Locally Modified (Based On 1.3)
***************
*** 398,403 ****
--- 398,406 ----
              }
          }
  
+         if( comp instanceof ComboInplaceEditor )
+             comp.setEnabled( isEnabled() && getPropertyEnv().isEditable() );
+         else
              comp.setEnabled(isEnabled() && PropUtils.checkEnabled(this, inplace.getPropertyEditor(), getPropertyEnv()));
      }
  
Index: ComboInplaceEditor.java
*** D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\ComboInplaceEditor.java Base (1.4)
--- D:\projects\nb\openide\explorer\src\org\openide\explorer\propertysheet\ComboInplaceEditor.java Locally Modified (Based On 1.4)
***************
*** 18,23 ****
--- 18,25 ----
   */
  package org.openide.explorer.propertysheet;
  
+ import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
+ import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
  import org.openide.explorer.propertysheet.editors.EnhancedPropertyEditor;
  
  import java.awt.*;
***************
*** 169,174 ****
--- 171,178 ----
  
          if (o != null) {
              super.setSelectedItem(o);
+             if( tableUI )
+                 hidePopup();
          }
      }
  
***************
*** 256,261 ****
--- 260,267 ----
  
          if (useClean) {
              super.setUI(PropUtils.createComboUI(this, tableUI));
+         } else if( tableUI && lf instanceof WindowsLookAndFeel ) {
+             super.setUI( new MyWindowsComboUI() );
          } else {
              super.updateUI();
          }
***************
*** 567,573 ****
--- 573,608 ----
              return super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
          }
      }
+     
+     private class MyWindowsComboUI extends WindowsComboBoxUI {
+         protected FocusListener createFocusListener() {
+             final FocusListener orig = super.createFocusListener();
+             return new FocusListener() {
+                 public void focusGained(FocusEvent e) {
+                     orig.focusGained( e );
                  }
+                 public void focusLost(FocusEvent e) {
+                     Component src = (Component)e.getSource();
+                     if( src instanceof ComboInplaceEditor || (null != src.getParent() && src.getParent() instanceof ComboInplaceEditor) )
+                         e = new FocusEvent( (Component)e.getSource(), e.getID(), true, e.getOppositeComponent() );
+                     orig.focusLost( e );
+                 }
+             };
+         }
+         
+ 
+         protected void configureEditor() {
+             super.configureEditor();
+             FocusListener[] listeners = editor.getFocusListeners();
+             for( int i=0; i<listeners.length; i++ ) {
+                 if( listeners[i] instanceof LayoutManager ) {
+                     editor.removeFocusListener( listeners[i] );
+                 } 
+             }
+         }
+     }
+ }