Attachment #123408 for bug #210618

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 210618
Collapse All | Expand All

Lines 125-130 Link Here

(-)a/core.execution/nbproject/project.xml (+8 lines)
125	</run-dependency>	125	</run-dependency>
126	</dependency>	126	</dependency>
127	<dependency>	127	<dependency>
		128	<code-name-base>org.openide.filesystems</code-name-base>
		129	<build-prerequisite/>
		130	<compile-dependency/>
		131	<run-dependency>
		132	<specification-version>8.0</specification-version>
		133	</run-dependency>
		134	</dependency>
		135	<dependency>
128	<code-name-base>org.openide.io</code-name-base>	136	<code-name-base>org.openide.io</code-name-base>
129	<build-prerequisite/>	137	<build-prerequisite/>
130	<compile-dependency/>	138	<compile-dependency/>




import javax.swing.DefaultListModel;
import javax.swing.JFileChooser;
import javax.swing.filechooser.FileFilter;
import org.netbeans.beaninfo.editors.FileEditor;
import org.openide.execution.NbClassPath;
import org.openide.filesystems.FileChooserBuilder;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.NbCollections;


  private void addJarButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addJarButtonActionPerformed

        JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
        chooser.setFileHidingEnabled(false);
        setHelpToChooser( chooser );
        

  }//GEN-LAST:event_addJarButtonActionPerformed

  private void addDirButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addDirButtonActionPerformed
        JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
        chooser.setFileHidingEnabled(false);
        setHelpToChooser( chooser );
        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);

        File selectedF = new File(selectedItem);
        if (selectedF.isDirectory()) {

            JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
            setHelpToChooser( chooser );
            chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
            chooser.setDialogTitle(getString("CTL_Edit_Local_Dialog_Title"));

                }
            }
        } else if (selectedF.isFile()) {
            JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
            setHelpToChooser( chooser );

            chooser.setFileFilter(new FileFilter() {

Lines 52-57 Link Here

(-)a/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbProcessDescriptorCustomEditor.java (-1 / +2 lines)
52		52
53	import org.openide.execution.NbProcessDescriptor;	53	import org.openide.execution.NbProcessDescriptor;
54	import org.openide.explorer.propertysheet.PropertyEnv;	54	import org.openide.explorer.propertysheet.PropertyEnv;
		55	import org.openide.filesystems.FileChooserBuilder;
55	import org.openide.util.HelpCtx;	56	import org.openide.util.HelpCtx;
56	import org.openide.util.NbBundle;	57	import org.openide.util.NbBundle;
57		58
Lines 212-218 Link Here
212		213
213	private void jButton1ActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed	214	private void jButton1ActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
214	// Add your handling code here:	215	// Add your handling code here:
215	JFileChooser chooser = org.netbeans.beaninfo.editors.FileEditor.createHackedFileChooser();	216	JFileChooser chooser = new FileChooserBuilder(NbProcessDescriptorCustomEditor.class).createFileChooser();
216	chooser.setMultiSelectionEnabled (false);	217	chooser.setMultiSelectionEnabled (false);
217	File init = new File(processField.getText()); // #13372	218	File init = new File(processField.getText()); // #13372
218	if (init.isFile()) {	219	if (init.isFile()) {

Lines 1-4 Link Here

(-)a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.form (-5 / +7 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>
Lines 60-70 Link Here
60	<EmptySpace min="-2" max="-2" attributes="0"/>	60	<EmptySpace min="-2" max="-2" attributes="0"/>
61	<Group type="103" groupAlignment="0" attributes="0">	61	<Group type="103" groupAlignment="0" attributes="0">
62	<Component id="lblUsageInfo" alignment="0" pref="1370" max="32767" attributes="0"/>	62	<Component id="lblUsageInfo" alignment="0" pref="1370" max="32767" attributes="0"/>
63	<Group type="102" alignment="0" attributes="0">	63	<Group type="102" attributes="0">
64	<Component id="jUsageCheck" min="-2" max="-2" attributes="0"/>	64	<Group type="103" groupAlignment="0" attributes="0">
65	<EmptySpace pref="854" max="32767" attributes="0"/>	65	<Component id="jUsageCheck" alignment="0" min="-2" max="-2" attributes="0"/>
		66	<Component id="lblLearnMore" alignment="0" min="-2" max="-2" attributes="0"/>
		67	</Group>
		68	<EmptySpace max="32767" attributes="0"/>
66	</Group>	69	</Group>
67	<Component id="lblLearnMore" alignment="0" min="-2" max="-2" attributes="0"/>
68	</Group>	70	</Group>
69	</Group>	71	</Group>
70	</Group>	72	</Group>




import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.beaninfo.editors.HtmlBrowser;
import org.netbeans.core.ProxySettings;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.awt.Mnemonics;
import org.openide.util.ImageUtilities;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

/**

    
    private boolean                 changed = false;
    private GeneralOptionsModel     model;
  //XXX  private HtmlBrowser.FactoryEditor editor;
    private AdvancedProxyPanel advancedPanel;
//    private PropertyChangeSupport support = new PropertyChangeSupport(this);
    private boolean valid = true;

    }
    
    private void updateWebBrowsers() {
        /** XXX: communicate via NbPreferences
        if (editor == null) {
            editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);
        }

            editBrowserButton.setVisible(false);
            jSeparator2.setVisible(false);
        }
        */
    }
    
    void applyChanges () {

            model.setSocksPort (tfProxyPort.getText ());
        }

        /* XXX: via NbPreferences...
        // web browser settings
        if (editor == null) {
            editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);
        }
        editor.setAsText ((String) cbWebBrowser.getSelectedItem ());
        */
        
        model.setUsageStatistics(jUsageCheck.isSelected());
    }
    




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>3.10</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.multiview</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>





import java.awt.Component;
import java.awt.Window;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorManager;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.lang.reflect.Array;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import javax.swing.JDialog;

import org.netbeans.jemmy.EventTool;
import org.netbeans.jemmy.JemmyException;
import org.netbeans.jemmy.JemmyProperties;
import org.netbeans.jemmy.QueueTool;
import org.netbeans.jemmy.TestOut;
import org.netbeans.jemmy.operators.JDialogOperator;
import org.netbeans.jemmy.util.PNGEncoder;
import org.netbeans.jemmy.util.Dumper;
import org.netbeans.jemmy.util.PNGEncoder;
import org.netbeans.junit.AssertionFailedErrorException;
import org.netbeans.junit.NbModuleSuite;
import org.netbeans.junit.NbTestCase;

        } catch (Exception e) {
            throw new JemmyException("Initialization of timeouts failed.", e);
        }
        // #210618 - workaround that custom property editors are not properly
        // registered when IDE is launched by NbModuleSuite
        new QueueTool().invokeSmoothly(new Runnable() {
            @Override
            public void run() {
                try {
                    PropertyEditor pe = PropertyEditorManager.findEditor(String.class);
                    if (pe != null && !pe.getClass().getName().equals("sun.beans.editors.StringEditor")) {
                        // OK
                        return;
                    }
                    // CoreBridgeImpl.editorsRegistered = false;
                    // CoreBridgeImpl.doRegisterPropertyEditors();
                    Class cl = Class.forName("org.netbeans.core.CoreBridgeImpl");
                    Field fieldReg = cl.getDeclaredField("editorsRegistered");
                    fieldReg.setAccessible(true);
                    fieldReg.setBoolean(null, false);
                    Method methodRegisterPE = cl.getDeclaredMethod("doRegisterPropertyEditors");
                    methodRegisterPE.setAccessible(true);
                    methodRegisterPE.invoke(null);
                } catch (Exception e) {
                    throw new JemmyException("Cannot call CoreBridgeImpl.doRegisterPropertyEditors().", e);
                }
                // Add core.execution property editor search path.
                String coreExecutionPath = "org.netbeans.core.execution.beaninfo.editors";
                List<String> paths = Arrays.asList(PropertyEditorManager.getEditorSearchPath());
                if (!paths.contains(coreExecutionPath)) {
                    paths = new ArrayList<String>(paths);
                    paths.add(coreExecutionPath);
                    PropertyEditorManager.setEditorSearchPath(paths.toArray(new String[0]));
                }
            }
        });
    }

    /** Overridden method from JUnit framework execution to perform conditional

    }

    protected static junit.framework.Test createModuleTest(String modules, String clusters, Class testClass, String... testNames) {
        return NbModuleSuite.emptyConfiguration().
            enableModules(modules).
            clusters(clusters).
            addTest(testClass, testNames).
            honorAutoloadEager(true).
            suite();
    }

    protected static junit.framework.Test createModuleTest(Class testClass, String... testNames) {

Lines 212-217 Link Here

(-)a/nbbuild/cluster.properties (+1 lines)
212	options.keymap,\	212	options.keymap,\
213	print,\	213	print,\
214	progress.ui,\	214	progress.ui,\
		215	propertyeditors,\
215	queries,\	216	queries,\
216	sampler,\	217	sampler,\
217	sendopts,\	218	sendopts,\

Lines 1-7 Link Here

(-)a/o.n.core/manifest.mf (-1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.core/2	2	OpenIDE-Module: org.netbeans.core/2
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/core/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/core/Bundle.properties
4	OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml
5	AutoUpdate-Show-In-Client: false	4	AutoUpdate-Show-In-Client: false
6	AutoUpdate-Essential-Module: true	5	AutoUpdate-Essential-Module: true
7	OpenIDE-Module-Specification-Version: 3.34	6	OpenIDE-Module-Specification-Version: 3.34




    }
    
    public void registerPropertyEditors() {
        doRegisterPropertyEditors();
    }

    /**Flag to avoid multiple adds of the same path to the
     * of PropertyEditorManager if multiple tests call 
     * registerPropertyEditors() */
    private static boolean editorsRegistered=false;
    /** Register NB specific property editors.
     *  Allows property editor unit tests to work correctly without 
     *  initializing full NetBeans environment.
     *  @since 1.98 */
    private static final void doRegisterPropertyEditors() {
        //issue 31879
        if (editorsRegistered) return;
        String[] syspesp = PropertyEditorManager.getEditorSearchPath();
        String[] nbpesp = new String[] {
            "org.netbeans.beaninfo.editors", // NOI18N
            "org.openide.explorer.propertysheet.editors", // NOI18N
        };
        String[] allpesp = new String[syspesp.length + nbpesp.length];
        System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
        System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
        PropertyEditorManager.setEditorSearchPath(allpesp);
        PropertyEditorManager.registerEditor (java.lang.Character.TYPE, org.netbeans.beaninfo.editors.CharEditor.class);
        PropertyEditorManager.registerEditor(String[].class, org.netbeans.beaninfo.editors.StringArrayEditor.class); 
        // use replacement hintable/internationalizable primitive editors - issues 20376, 5278
        PropertyEditorManager.registerEditor (Integer.TYPE, org.netbeans.beaninfo.editors.IntEditor.class);
        PropertyEditorManager.registerEditor (Boolean.TYPE, org.netbeans.beaninfo.editors.BoolEditor.class);
        editorsRegistered = true;
    }

}




        }
        return false;
    }

    /** Used in layer xml to register FactoryEditor. */
    private static org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor createHtmlBrowserFactoryEditor()  {
        return new org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor(){
            public void setValue(Object value) {
                setWWWBrowser((HtmlBrowser.Factory)value);
            }

            public Object getValue() {
                return getWWWBrowser();
            }
        };
    }
}




                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>2</release-version>
                        <specification-version>3.11</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.core.startup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>





package org.netbeans.modules.options.classic;

import org.netbeans.beaninfo.editors.ListImageEditor;
import org.openide.util.NbBundle;
import org.openide.nodes.Node;
import org.openide.explorer.propertysheet.PropertyEnv;

import org.netbeans.modules.options.classic.SettingChildren.FileStateProperty;

/**
 * XXX: Should rather communicate with ListImageEditor or some other editor via properties...
 * @author  Vitezslav Stejskal
 */
class FileStateEditor {/* extends ListImageEditor {

    private String action_define = null;
    private String action_revert = null;

    
    private Node.Property<?> prop = null;

    /** Creates new FileStatePropertyEditor */
    public FileStateEditor () {
        super ();
        

        return new String [] {
            action_define
        };
    }*/
}




import org.openide.filesystems.FileStateInvalidException;
import org.openide.util.ImageUtilities;
import org.openide.util.NbBundle;
import org.netbeans.beaninfo.editors.ListImageEditor;
import java.awt.Image;
import java.beans.PropertyEditor;
import java.lang.reflect.InvocationTargetException;

            
            this.primaryFile = primaryFile;
            this.layer = layer;
/*
            setValue (ListImageEditor.PROP_VALUES, new Integer [] {
                FileStateManager.FSTATE_DEFINED,
                FileStateManager.FSTATE_IGNORED,

                ImageUtilities.loadImage ("org/netbeans/core/resources/setting-inherited.gif"), // NOI18N
                ImageUtilities.loadImage ("org/openide/resources/actions/empty.gif") // NOI18N
            });
            */
        }

        public boolean canWrite () {

        }

        public PropertyEditor getPropertyEditor () {
            // XXX: return new FileStateEditor ();
            return null;
        }
        
        public String getShortDescription () {

Line 0 Link Here

(-)a/propertyeditors/build.xml (+5 lines)
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<project basedir="." default="netbeans" name="propertyeditors">
	3	<description>Builds, tests, and runs the project org.netbeans.modules.propertyeditors</description>
	4	<import file="../nbbuild/templates/projectized.xml"/>
	5	</project>

Line 0 Link Here

(-)a/propertyeditors/manifest.mf (+5 lines)
	1	Manifest-Version: 1.0
	2	OpenIDE-Module: org.netbeans.modules.propertyeditors
	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/propertyeditors/Bundle.properties
	4	OpenIDE-Module-Specification-Version: 1.0
	5	OpenIDE-Module-Layer: org/netbeans/modules/propertyeditors/mf-layer.xml

Line 0 Link Here

(-)a/propertyeditors/nbproject/project.properties (+2 lines)
	1	javac.source=1.6
	2	javac.compilerargs=-Xlint -Xlint:-serial




<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
    <type>org.netbeans.modules.apisupport.project</type>
    <configuration>
        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
            <code-name-base>org.netbeans.modules.propertyeditors</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.openide.awt</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.45</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.dialogs</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.2</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.explorer</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>6.23</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.filesystems</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.0</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.loaders</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.13</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.modules</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.nodes</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>7.23</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.25</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.openide.util.lookup</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <specification-version>8.0</specification-version>
                    </run-dependency>
                </dependency>
                </module-dependencies>
            <test-dependencies>
                <test-type>
                    <name>unit</name>
                    <test-dependency>
                        <code-name-base>org.netbeans.libs.junit4</code-name-base>
                        <compile-dependency/>
                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.netbeans.modules.nbjunit</code-name-base>
                        <recursive/>
                        <compile-dependency/>
                    </test-dependency>
                </test-type>
            </test-dependencies>
            <public-packages/>
        </data>
    </configuration>
</project>





import java.util.StringTokenizer;
import java.text.MessageFormat;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
import org.openide.util.Exceptions;

/** Support for property editors for several integers.
* for example:  Point - [2,4], Insets [2,3,4,4],...

        String msg = new MessageFormat(VALUE_FORMAT).format(new Object[] 
            { className , getHintFormat() } );
        IllegalArgumentException iae = new IllegalArgumentException(msg);
        Exceptions.attachLocalizedMessage(iae, msg);
                                                : e.getMessage(), msg, e,
                                 new java.util.Date()); //NOI18N
        throw iae;                                          
    }


Lines 45-51 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java (-3 / +2 lines)
45	package org.netbeans.beaninfo.editors;	45	package org.netbeans.beaninfo.editors;
46		46
47	import java.text.MessageFormat;	47	import java.text.MessageFormat;
48	import org.netbeans.core.UIExceptions;	48	import org.openide.util.Exceptions;
49		49
50	import org.openide.util.Lookup;	50	import org.openide.util.Lookup;
51	import org.openide.util.NbBundle;	51	import org.openide.util.NbBundle;
Lines 101-108 Link Here
101	String msg = MessageFormat.format(	101	String msg = MessageFormat.format(
102	NbBundle.getMessage(	102	NbBundle.getMessage(
103	ClassEditor.class, "FMT_EXC_CANT_LOAD_CLASS"), new Object[] {text}); //NOI18N	103	ClassEditor.class, "FMT_EXC_CANT_LOAD_CLASS"), new Object[] {text}); //NOI18N
104	UIExceptions.annotateUser(iae, e.getMessage(), msg, e,	104	Exceptions.attachLocalizedMessage(iae, msg);
105	new java.util.Date());
106	throw iae;	105	throw iae;
107	}	106	}
108	}	107	}




import javax.swing.ListCellRenderer;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;



                                                    new Color(red, green, blue)));
                            return;
                        } catch( IllegalArgumentException iaE ) {
                            Exceptions.attachLocalizedMessage(iaE, iaE.getLocalizedMessage());
                                                     iaE.getLocalizedMessage(),
                                                     null, null);
                            throw iaE;
                        }
                    }

                NbBundle.getMessage (ColorEditor.class, "FMT_IllegalEntry"), 
                new Object[]{text});
            IllegalArgumentException iae = new IllegalArgumentException (text);
            Exceptions.attachLocalizedMessage(iae, msg);
            throw iae;
        }





import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ResourceBundle;
import org.netbeans.core.UIExceptions;
import org.openide.awt.Mnemonics;

import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

            int height = Integer.parseInt (heightField.getText ());
            if ((width < 0) || (height < 0)) {
                IllegalStateException ise = new IllegalStateException();
                Exceptions.attachLocalizedMessage(ise, NbBundle.getMessage(DimensionCustomEditor.class, "CTL_NegativeSize"));
                    NbBundle.getMessage(DimensionCustomEditor.class, "CTL_NegativeSize"), null, null);
                throw ise;
            }
            return new Dimension (width, height);
        } catch (NumberFormatException e) {
            IllegalStateException ise = new IllegalStateException();
            Exceptions.attachLocalizedMessage(ise, 
                NbBundle.getMessage(DimensionCustomEditor.class, "CTL_InvalidValue"));
            throw ise;
        }
    }




package org.netbeans.beaninfo.editors;

import java.awt.Dimension;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/** A property editor for Dimension class.

                "CTL_NegativeSize"); //NOI18N
            IllegalArgumentException iae = new IllegalArgumentException (
                "Negative value"); //NOI18N
            Exceptions.attachLocalizedMessage(iae, msg);
                                     new java.util.Date());
            throw iae;
        }
        else

Lines 59-64 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java (-1 / +2 lines)
59	import org.openide.nodes.Node;	59	import org.openide.nodes.Node;
60	import org.openide.explorer.propertysheet.ExPropertyEditor;	60	import org.openide.explorer.propertysheet.ExPropertyEditor;
61	import org.openide.explorer.propertysheet.PropertyEnv;	61	import org.openide.explorer.propertysheet.PropertyEnv;
		62	import org.openide.filesystems.FileChooserBuilder;
62	import org.openide.util.HelpCtx;	63	import org.openide.util.HelpCtx;
63	import org.openide.util.NbBundle;	64	import org.openide.util.NbBundle;
64		65
Lines 210-216 Link Here
210	return new StringCustomEditor(getAsText(), false);	211	return new StringCustomEditor(getAsText(), false);
211	}	212	}
212	if (chooser == null) {	213	if (chooser == null) {
213	chooser = FileEditor.createHackedFileChooser();	214	chooser = new FileChooserBuilder(FileArrayEditor.class).createFileChooser();
214	chooser.setMultiSelectionEnabled(true);	215	chooser.setMultiSelectionEnabled(true);
215		216
216	Object vv = getValue ();	217	Object vv = getValue ();




import org.openide.nodes.Node;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.filesystems.FileChooserBuilder;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;


            return new StringCustomEditor(info, false, true, null, this, env);
        }
        if (chooser == null) {
            chooser = new FileChooserBuilder(FileEditor.class).createFileChooser();
        
            File originalFile = (File)getValue ();
            if (originalFile != null && ! originalFile.isAbsolute() && baseDirectory != null) {

        lastCurrentDir = chooser.getCurrentDirectory();
    }
    
    // XXX #18270. Enter doesn't work when expecting folder change,
    // Accessibility problem. We hack default behaviour here.
    /** Creates hacked fileChooser, responding on Enter the way it
     * performs folder change. */
    public static JFileChooser createHackedFileChooser() {
        JFileChooser chooser = new JFileChooser();
        hackFileChooser(chooser);
        return chooser;
    }
    
    /** Hacks fileChooser, responding on Enter the way it
     * performs folder change. */
    public static void hackFileChooser(final JFileChooser chooser) {




import javax.swing.*;
import javax.swing.border.*;
import javax.swing.event.*;
import org.netbeans.core.UIExceptions;
import org.openide.DialogDisplayer;

import org.openide.NotifyDescriptor;

                size = Integer.parseInt (tfSize.getText ());
                if (size <= 0) {
                    IllegalArgumentException iae = new IllegalArgumentException ();
                    Exceptions.attachLocalizedMessage (iae, 
                            size == 0 ? NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithParam", tfSize.getText ()) : // NOI18N
                                NbBundle.getMessage (FontEditor.class, "CTL_NegativeSize") // NOI18N
                            );
                    tfSize.setText (String.valueOf (font.getSize ()));
                    throw iae;
                }
                updateSizeList(size);
            } catch (NumberFormatException e) {
                Exceptions.attachLocalizedMessage (e, 
                        NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithExc", e) // NOI18N
                        );
                tfSize.setText (String.valueOf (font.getSize ()));
                throw e;
            }

Lines 47-53 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java (-2 / +1 lines)
47	import java.beans.PropertyEditorSupport;	47	import java.beans.PropertyEditorSupport;
48	import java.text.MessageFormat;	48	import java.text.MessageFormat;
49	import java.util.ArrayList;	49	import java.util.ArrayList;
50	import org.netbeans.core.UIExceptions;
51	import org.openide.cookies.InstanceCookie;	50	import org.openide.cookies.InstanceCookie;
52	import org.openide.filesystems.FileObject;	51	import org.openide.filesystems.FileObject;
53	import org.openide.filesystems.FileStateInvalidException;	52	import org.openide.filesystems.FileStateInvalidException;
Lines 116-122 Link Here
116	HtmlBrowser.class, "FMT_EXC_GENERIC_BAD_VALUE"), //NOI18N	115	HtmlBrowser.class, "FMT_EXC_GENERIC_BAD_VALUE"), //NOI18N
117	new Object[] {str});	116	new Object[] {str});
118	}	117	}
119	UIExceptions.annotateUser(iae, str, msg, e, new java.util.Date());	118	Exceptions.attachLocalizedMessage(iae, msg);
120	throw iae;	119	throw iae;
121	}	120	}
122	}	121	}




import javax.swing.JLabel;
import javax.swing.JTextField;
import javax.swing.UIManager;
import org.netbeans.core.UIExceptions;
import org.openide.awt.Mnemonics;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

            int height = Integer.parseInt (heightField.getText ());
//            if ((x < 0) || (y < 0) || (width < 0) || (height < 0)) {
//                IllegalStateException ise = new IllegalStateException();
//                Exceptions.attachLocalizedMessage(ise, null,
//                                         NbBundle.getMessage(InsetsCustomEditor.class,
//                                                             "CTL_NegativeSize"),
//                                         null, null);

            return new Insets (x, y, width, height);
        } catch (NumberFormatException e) {
            IllegalStateException ise = new IllegalStateException();
            Exceptions.attachLocalizedMessage(ise, 
                                     NbBundle.getMessage(InsetsCustomEditor.class,
                                                         "CTL_InvalidValue"));
                                     null, null);
            throw ise;
        }
    }

Lines 45-51 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/InsetsEditor.java (-1 lines)
45	package org.netbeans.beaninfo.editors;	45	package org.netbeans.beaninfo.editors;
46		46
47	import java.awt.Insets;	47	import java.awt.Insets;
48	import org.netbeans.core.UIExceptions;
49	import org.openide.explorer.propertysheet.ExPropertyEditor;	48	import org.openide.explorer.propertysheet.ExPropertyEditor;
50	import org.openide.explorer.propertysheet.PropertyEnv;	49	import org.openide.explorer.propertysheet.PropertyEnv;
51	import org.openide.util.NbBundle;	50	import org.openide.util.NbBundle;




package org.netbeans.beaninfo.editors;
import java.util.Arrays;
import org.netbeans.beaninfo.editors.ExPropertyEditorSupport.EnvException;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.*;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
/** An editor for primitive integer types which allows hinting of tag
 *  values and handles whitespace in setAsText better than the default

            String msg = NbBundle.getMessage(
                IntEditor.class, "EXC_ILLEGAL_VALUE_TEXT") + s; //NOI18N
            RuntimeException iae = new IllegalArgumentException(msg); //NOI18N
            Exceptions.attachLocalizedMessage(iae, msg);
            throw iae;
        }
    }

                msg.append(arrToStr(keys));
                String message = msg.toString();
                RuntimeException iae = new IllegalArgumentException(message);
                Exceptions.attachLocalizedMessage(iae, message);
                                         new java.util.Date());
                throw iae;
            } else {
                setValue(Integer.valueOf(idx));




import java.awt.Image;
import java.beans.PropertyEditorSupport;
import java.beans.FeatureDescriptor;
import org.netbeans.core.UIExceptions;

import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.nodes.Node;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;



                "negative: " + str); //NOI18N
            String msg = NbBundle.getMessage(ListImageEditor.class, 
                "CTL_NegativeSize"); //NOI18N
            Exceptions.attachLocalizedMessage(iae, msg);
                                     new java.util.Date());
            throw iae;
        }
        setValue (findObject (values, i));




import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.Iterator;
import javax.swing.ButtonGroup;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.util.Lookup;
import org.openide.util.Utilities;

            NbBundle.getMessage(
                ObjectEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"),  //NOI18N
                new Object[] {str});
        Exceptions.attachLocalizedMessage(iae, msg);
        throw iae;        
    }
    




import java.awt.Point;
import java.awt.Dimension;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import org.netbeans.core.UIExceptions;
import org.openide.awt.Mnemonics;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/** Custom property editor for Point and Dimension

            if ( dimensionMode ) {
                if ((x < 0) || (y < 0)) {
                    IllegalStateException ise = new IllegalStateException();
                    Exceptions.attachLocalizedMessage(ise, 
                                             NbBundle.getMessage(PointCustomEditor.class,
                                                                 "CTL_NegativeSize"));
                                             null, null);
                    throw ise;
                }
                return new Dimension (x, y);

            }
        } catch (NumberFormatException e) {
            IllegalStateException ise = new IllegalStateException();
            Exceptions.attachLocalizedMessage(ise, 
                                     NbBundle.getMessage(PointCustomEditor.class,
                                                         "CTL_InvalidValue"));
                                     null, null);
            throw ise;
        }
    }

Lines 52-58 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java (-2 / +2 lines)
52	import java.util.Date;	52	import java.util.Date;
53	import java.util.Enumeration;	53	import java.util.Enumeration;
54	import java.util.Properties;	54	import java.util.Properties;
55	import org.netbeans.core.UIExceptions;	55	import org.openide.util.Exceptions;
56	import org.openide.util.NbBundle;	56	import org.openide.util.NbBundle;
57		57
58		58
Lines 108-114 Link Here
108	NbBundle.getMessage(	108	NbBundle.getMessage(
109	PropertiesEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"), new Object[] {text}); //NOI18N	109	PropertiesEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"), new Object[] {text}); //NOI18N
110	}	110	}
111	UIExceptions.annotateUser(iae, iae.getMessage(), msg, ioe, new Date());	111	Exceptions.attachLocalizedMessage(iae, msg);
112	throw iae;	112	throw iae;
113	}	113	}
114	}	114	}





package org.netbeans.beaninfo.editors;

import java.awt.Color;
import java.awt.Component;
import java.awt.Rectangle;
import java.awt.event.KeyListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.HashMap;
import java.util.ResourceBundle;
import javax.swing.JLabel;
import javax.swing.JTextField;
import javax.swing.UIManager;
import org.netbeans.core.UIExceptions;
import org.openide.awt.Mnemonics;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

            int height = Integer.parseInt (heightField.getText ());
            if ((x < 0) || (y < 0) || (width < 0) || (height < 0)) {
                IllegalStateException ise = new IllegalStateException();
                Exceptions.attachLocalizedMessage(ise, 
                                         NbBundle.getMessage(RectangleCustomEditor.class,
                                                             "CTL_NegativeSize"));
                                         null, null);
                throw ise;
            }
            return new Rectangle (x, y, width, height);
        } catch (NumberFormatException e) {
            IllegalStateException ise = new IllegalStateException();
            Exceptions.attachLocalizedMessage(ise, 
                                     NbBundle.getMessage(RectangleCustomEditor.class,
                                                         "CTL_InvalidValue"));
                                     null, null);
            throw ise;
        }
    }




package org.netbeans.beaninfo.editors;

import java.awt.Rectangle;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/** A property editor for Rectangle class.

                "CTL_NegativeSize"); //NOI18N
            IllegalArgumentException iae = new IllegalArgumentException (
                "Negative value"); //NOI18N
            Exceptions.attachLocalizedMessage(iae, msg);
                                     new java.util.Date());
            throw iae;

        }




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2012 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2012 Sun Microsystems, Inc.
 */
package org.netbeans.beaninfo.editors;

import java.beans.PropertyEditorManager;
import org.openide.modules.OnStart;

/**
 *
 * @author Jaroslav Tulach <jtulach@netbeans.org>
 */
@OnStart
public class RegisterEditors implements Runnable {
    private static boolean editorsRegistered;

    @Override
    public void run() {
        registerPropertyEditors();
    }
    /**
     * Register NB specific property editors. Allows property editor unit tests
     * to work correctly without initializing full NetBeans environment.
     */
    public static void registerPropertyEditors() {
        //issue 31879
        if (editorsRegistered) {
            return;
        }
        String[] syspesp = PropertyEditorManager.getEditorSearchPath();
        String[] nbpesp = new String[]{
            "org.netbeans.beaninfo.editors", // NOI18N
            "org.openide.explorer.propertysheet.editors", // NOI18N
        };
        String[] allpesp = new String[syspesp.length + nbpesp.length];
        System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
        System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
        PropertyEditorManager.setEditorSearchPath(allpesp);
        PropertyEditorManager.registerEditor(java.lang.Character.TYPE, org.netbeans.beaninfo.editors.CharEditor.class);
        PropertyEditorManager.registerEditor(String[].class, org.netbeans.beaninfo.editors.StringArrayEditor.class);
        // use replacement hintable/internationalizable primitive editors - issues 20376, 5278
        PropertyEditorManager.registerEditor(Integer.TYPE, org.netbeans.beaninfo.editors.IntEditor.class);
        PropertyEditorManager.registerEditor(Boolean.TYPE, org.netbeans.beaninfo.editors.BoolEditor.class);
        editorsRegistered = true;
    }

    /** Used in layer xml to register FactoryEditor. */
    private static org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor createHtmlBrowserFactoryEditor()  {
        return new org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor(){
            public void setValue(Object value) {
// XXX                setWWWBrowser((org.openide.awt.HtmlBrowser.Factory)value);
            }

            public Object getValue() {
// XXX                return getWWWBrowser();
                return null;
            }
        };
    }
    
}

Lines 48-54 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/URLEditor.java (-3 / +2 lines)
48	import java.net.URL;	48	import java.net.URL;
49	import java.net.MalformedURLException;	49	import java.net.MalformedURLException;
50	import java.text.MessageFormat;	50	import java.text.MessageFormat;
51	import org.netbeans.core.UIExceptions;	51	import org.openide.util.Exceptions;
52	import org.openide.util.NbBundle;	52	import org.openide.util.NbBundle;
53		53
54	/** A property editor for java.net.URL class.	54	/** A property editor for java.net.URL class.
Lines 72-79 Link Here
72	String msg = MessageFormat.format(	72	String msg = MessageFormat.format(
73	NbBundle.getMessage(	73	NbBundle.getMessage(
74	URLEditor.class, "FMT_EXC_BAD_URL"), new Object[] {s}); //NOI18N	74	URLEditor.class, "FMT_EXC_BAD_URL"), new Object[] {s}); //NOI18N
75	UIExceptions.annotateUser(iae, e.getMessage(), msg, e,	75	Exceptions.attachLocalizedMessage(iae, msg);
76	new java.util.Date());
77	throw iae;	76	throw iae;
78	}	77	}
79	}	78	}





import java.beans.*;
import java.text.MessageFormat;
import org.netbeans.core.UIExceptions;
import org.openide.explorer.propertysheet.ExPropertyEditor;
import org.openide.explorer.propertysheet.PropertyEnv;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;

/**

                NbBundle.getMessage(
                    WrappersEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"), text); //NOI18N
            }
            Exceptions.attachLocalizedMessage(iae, msg);
                                     new java.util.Date());
            throw iae;
        }
    }

Line 0 Link Here

(-)a/propertyeditors/src/org/netbeans/modules/propertyeditors/Bundle.properties (+1 lines)
	1	OpenIDE-Module-Name=Platform Property Editors




import java.beans.PropertyEditorManager;
import junit.textui.TestRunner;
import org.netbeans.junit.*;
import org.openide.filesystems.FileUtil;

/** Test finding of property editors registred by core.
 * @author Jiri Rechtacek

public class FindEditorTest extends NbTestCase {

    static {
       RegisterEditors.registerPropertyEditors();
        //test can pass when editor tests are run standalone
       org.netbeans.core.CoreBridgeImpl.getDefault().registerPropertyEditors(); 
    }
    
    public FindEditorTest(String name) {

Return to bug 210618

Lines 159-193 Link Here

(-)a/o.n.core/src/org/netbeans/core/CoreBridgeImpl.java (-25 lines)
159	}	159	}
160		160
161	public void registerPropertyEditors() {	161	public void registerPropertyEditors() {
162	doRegisterPropertyEditors();
163	}	162	}
164		163
165	/**Flag to avoid multiple adds of the same path to the	164	/**Flag to avoid multiple adds of the same path to the
166	* of PropertyEditorManager if multiple tests call	165	* of PropertyEditorManager if multiple tests call
167	* registerPropertyEditors() */	166	* registerPropertyEditors() */
168	private static boolean editorsRegistered=false;	167	private static boolean editorsRegistered=false;
169	/** Register NB specific property editors.
170	* Allows property editor unit tests to work correctly without
171	* initializing full NetBeans environment.
172	* @since 1.98 */
173	private static final void doRegisterPropertyEditors() {
174	//issue 31879
175	if (editorsRegistered) return;
176	String[] syspesp = PropertyEditorManager.getEditorSearchPath();
177	String[] nbpesp = new String[] {
178	"org.netbeans.beaninfo.editors", // NOI18N
179	"org.openide.explorer.propertysheet.editors", // NOI18N
180	};
181	String[] allpesp = new String[syspesp.length + nbpesp.length];
182	System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
183	System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
184	PropertyEditorManager.setEditorSearchPath(allpesp);
185	PropertyEditorManager.registerEditor (java.lang.Character.TYPE, org.netbeans.beaninfo.editors.CharEditor.class);
186	PropertyEditorManager.registerEditor(String[].class, org.netbeans.beaninfo.editors.StringArrayEditor.class);
187	// use replacement hintable/internationalizable primitive editors - issues 20376, 5278
188	PropertyEditorManager.registerEditor (Integer.TYPE, org.netbeans.beaninfo.editors.IntEditor.class);
189	PropertyEditorManager.registerEditor (Boolean.TYPE, org.netbeans.beaninfo.editors.BoolEditor.class);
190	editorsRegistered = true;
191	}
192
193	}	168	}

Lines 228-244 Link Here

(-)a/o.n.core/src/org/netbeans/core/IDESettings.java (-13 lines)
228	}	228	}
229	return false;	229	return false;
230	}	230	}
231
232	/** Used in layer xml to register FactoryEditor. */
233	private static org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor createHtmlBrowserFactoryEditor() {
234	return new org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor(){
235	public void setValue(Object value) {
236	setWWWBrowser((HtmlBrowser.Factory)value);
237	}
238
239	public Object getValue() {
240	return getWWWBrowser();
241	}
242	};
243	}
244	}	231	}

Lines 53-60 Link Here

(-)a/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbClassPathCustomEditor.java (-5 / +5 lines)
53	import javax.swing.DefaultListModel;	53	import javax.swing.DefaultListModel;
54	import javax.swing.JFileChooser;	54	import javax.swing.JFileChooser;
55	import javax.swing.filechooser.FileFilter;	55	import javax.swing.filechooser.FileFilter;
56	import org.netbeans.beaninfo.editors.FileEditor;
57	import org.openide.execution.NbClassPath;	56	import org.openide.execution.NbClassPath;
		57	import org.openide.filesystems.FileChooserBuilder;
58	import org.openide.util.HelpCtx;	58	import org.openide.util.HelpCtx;
59	import org.openide.util.NbBundle;	59	import org.openide.util.NbBundle;
60	import org.openide.util.NbCollections;	60	import org.openide.util.NbCollections;
Lines 284-290 Link Here
284		284
285	private void addJarButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addJarButtonActionPerformed	285	private void addJarButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addJarButtonActionPerformed
286		286
287	JFileChooser chooser = FileEditor.createHackedFileChooser();	287	JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
288	chooser.setFileHidingEnabled(false);	288	chooser.setFileHidingEnabled(false);
289	setHelpToChooser( chooser );	289	setHelpToChooser( chooser );
290		290
Lines 326-332 Link Here
326	}//GEN-LAST:event_addJarButtonActionPerformed	326	}//GEN-LAST:event_addJarButtonActionPerformed
327		327
328	private void addDirButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addDirButtonActionPerformed	328	private void addDirButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addDirButtonActionPerformed
329	JFileChooser chooser = FileEditor.createHackedFileChooser();	329	JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
330	chooser.setFileHidingEnabled(false);	330	chooser.setFileHidingEnabled(false);
331	setHelpToChooser( chooser );	331	setHelpToChooser( chooser );
332	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);	332	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
Lines 384-390 Link Here
384	File selectedF = new File(selectedItem);	384	File selectedF = new File(selectedItem);
385	if (selectedF.isDirectory()) {	385	if (selectedF.isDirectory()) {
386		386
387	JFileChooser chooser = FileEditor.createHackedFileChooser();	387	JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
388	setHelpToChooser( chooser );	388	setHelpToChooser( chooser );
389	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);	389	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
390	chooser.setDialogTitle(getString("CTL_Edit_Local_Dialog_Title"));	390	chooser.setDialogTitle(getString("CTL_Edit_Local_Dialog_Title"));
Lines 411-417 Link Here
411	}	411	}
412	}	412	}
413	} else if (selectedF.isFile()) {	413	} else if (selectedF.isFile()) {
414	JFileChooser chooser = FileEditor.createHackedFileChooser();	414	JFileChooser chooser = new FileChooserBuilder(NbClassPathCustomEditor.class).createFileChooser();
415	setHelpToChooser( chooser );	415	setHelpToChooser( chooser );
416		416
417	chooser.setFileFilter(new FileFilter() {	417	chooser.setFileFilter(new FileFilter() {

Lines 60-73 Link Here

(-)a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java (-4 / +6 lines)
60	import javax.swing.UIManager;	60	import javax.swing.UIManager;
61	import javax.swing.event.DocumentEvent;	61	import javax.swing.event.DocumentEvent;
62	import javax.swing.event.DocumentListener;	62	import javax.swing.event.DocumentListener;
63	import org.netbeans.beaninfo.editors.HtmlBrowser;
64	import org.netbeans.core.ProxySettings;	63	import org.netbeans.core.ProxySettings;
65	import org.netbeans.spi.options.OptionsPanelController;	64	import org.netbeans.spi.options.OptionsPanelController;
66	import org.openide.DialogDescriptor;	65	import org.openide.DialogDescriptor;
67	import org.openide.DialogDisplayer;	66	import org.openide.DialogDisplayer;
68	import org.openide.awt.Mnemonics;	67	import org.openide.awt.Mnemonics;
69	import org.openide.util.ImageUtilities;	68	import org.openide.util.ImageUtilities;
70	import org.openide.util.Lookup;
71	import org.openide.util.NbBundle;	69	import org.openide.util.NbBundle;
72		70
73	/**	71	/**
Lines 79-85 Link Here
79		77
80	private boolean changed = false;	78	private boolean changed = false;
81	private GeneralOptionsModel model;	79	private GeneralOptionsModel model;
82	private HtmlBrowser.FactoryEditor editor;	80	//XXX private HtmlBrowser.FactoryEditor editor;
83	private AdvancedProxyPanel advancedPanel;	81	private AdvancedProxyPanel advancedPanel;
84	// private PropertyChangeSupport support = new PropertyChangeSupport(this);	82	// private PropertyChangeSupport support = new PropertyChangeSupport(this);
85	private boolean valid = true;	83	private boolean valid = true;
Lines 598-603 Link Here
598	}	596	}
599		597
600	private void updateWebBrowsers() {	598	private void updateWebBrowsers() {
		599	/** XXX: communicate via NbPreferences
601	if (editor == null) {	600	if (editor == null) {
602	editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);	601	editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);
603	}	602	}
Lines 619-624 Link Here
619	editBrowserButton.setVisible(false);	618	editBrowserButton.setVisible(false);
620	jSeparator2.setVisible(false);	619	jSeparator2.setVisible(false);
621	}	620	}
		621	*/
622	}	622	}
623		623
624	void applyChanges () {	624	void applyChanges () {
Lines 648-659 Link Here
648	model.setSocksPort (tfProxyPort.getText ());	648	model.setSocksPort (tfProxyPort.getText ());
649	}	649	}
650		650
		651	/* XXX: via NbPreferences...
651	// web browser settings	652	// web browser settings
652	if (editor == null) {	653	if (editor == null) {
653	editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);	654	editor = Lookup.getDefault().lookup(HtmlBrowser.FactoryEditor.class);
654	}	655	}
655	editor.setAsText ((String) cbWebBrowser.getSelectedItem ());	656	editor.setAsText ((String) cbWebBrowser.getSelectedItem ());
656		657	*/
		658
657	model.setUsageStatistics(jUsageCheck.isSelected());	659	model.setUsageStatistics(jUsageCheck.isSelected());
658	}	660	}
659		661

Lines 23-37 Link Here

(-)a/jellytools.platform/nbproject/project.xml (-9 lines)
23	</run-dependency>	23	</run-dependency>
24	</dependency>	24	</dependency>
25	<dependency>	25	<dependency>
26	<code-name-base>org.netbeans.core</code-name-base>
27	<build-prerequisite/>
28	<compile-dependency/>
29	<run-dependency>
30	<release-version>2</release-version>
31	<specification-version>3.10</specification-version>
32	</run-dependency>
33	</dependency>
34	<dependency>
35	<code-name-base>org.netbeans.core.multiview</code-name-base>	26	<code-name-base>org.netbeans.core.multiview</code-name-base>
36	<build-prerequisite/>	27	<build-prerequisite/>
37	<compile-dependency/>	28	<compile-dependency/>

Lines 45-61 Link Here

(-)a/jellytools.platform/src/org/netbeans/jellytools/JellyTestCase.java (-40 / +7 lines)
45		45
46	import java.awt.Component;	46	import java.awt.Component;
47	import java.awt.Window;	47	import java.awt.Window;
48	import java.beans.PropertyEditor;
49	import java.beans.PropertyEditorManager;
50	import java.io.File;	48	import java.io.File;
51	import java.io.IOException;	49	import java.io.IOException;
52	import java.io.PrintStream;	50	import java.io.PrintStream;
53	import java.lang.reflect.Array;	51	import java.lang.reflect.Array;
54	import java.lang.reflect.Field;
55	import java.lang.reflect.InvocationTargetException;	52	import java.lang.reflect.InvocationTargetException;
56	import java.lang.reflect.Method;	53	import java.lang.reflect.Method;
57	import java.util.ArrayList;	54	import java.util.ArrayList;
58	import java.util.Arrays;
59	import java.util.List;	55	import java.util.List;
60	import java.util.Map;	56	import java.util.Map;
61	import javax.swing.JDialog;	57	import javax.swing.JDialog;
Lines 66-76 Link Here
66	import org.netbeans.jemmy.EventTool;	62	import org.netbeans.jemmy.EventTool;
67	import org.netbeans.jemmy.JemmyException;	63	import org.netbeans.jemmy.JemmyException;
68	import org.netbeans.jemmy.JemmyProperties;	64	import org.netbeans.jemmy.JemmyProperties;
69	import org.netbeans.jemmy.QueueTool;
70	import org.netbeans.jemmy.TestOut;	65	import org.netbeans.jemmy.TestOut;
71	import org.netbeans.jemmy.operators.JDialogOperator;	66	import org.netbeans.jemmy.operators.JDialogOperator;
		67	import org.netbeans.jemmy.util.PNGEncoder;
72	import org.netbeans.jemmy.util.Dumper;	68	import org.netbeans.jemmy.util.Dumper;
73	import org.netbeans.jemmy.util.PNGEncoder;
74	import org.netbeans.junit.AssertionFailedErrorException;	69	import org.netbeans.junit.AssertionFailedErrorException;
75	import org.netbeans.junit.NbModuleSuite;	70	import org.netbeans.junit.NbModuleSuite;
76	import org.netbeans.junit.NbTestCase;	71	import org.netbeans.junit.NbTestCase;
Lines 132-170 Link Here
132	} catch (Exception e) {	127	} catch (Exception e) {
133	throw new JemmyException("Initialization of timeouts failed.", e);	128	throw new JemmyException("Initialization of timeouts failed.", e);
134	}	129	}
135	// #210618 - workaround that custom property editors are not properly
136	// registered when IDE is launched by NbModuleSuite
137	new QueueTool().invokeSmoothly(new Runnable() {
138	@Override
139	public void run() {
140	try {
141	PropertyEditor pe = PropertyEditorManager.findEditor(String.class);
142	if (pe != null && !pe.getClass().getName().equals("sun.beans.editors.StringEditor")) {
143	// OK
144	return;
145	}
146	// CoreBridgeImpl.editorsRegistered = false;
147	// CoreBridgeImpl.doRegisterPropertyEditors();
148	Class cl = Class.forName("org.netbeans.core.CoreBridgeImpl");
149	Field fieldReg = cl.getDeclaredField("editorsRegistered");
150	fieldReg.setAccessible(true);
151	fieldReg.setBoolean(null, false);
152	Method methodRegisterPE = cl.getDeclaredMethod("doRegisterPropertyEditors");
153	methodRegisterPE.setAccessible(true);
154	methodRegisterPE.invoke(null);
155	} catch (Exception e) {
156	throw new JemmyException("Cannot call CoreBridgeImpl.doRegisterPropertyEditors().", e);
157	}
158	// Add core.execution property editor search path.
159	String coreExecutionPath = "org.netbeans.core.execution.beaninfo.editors";
160	List<String> paths = Arrays.asList(PropertyEditorManager.getEditorSearchPath());
161	if (!paths.contains(coreExecutionPath)) {
162	paths = new ArrayList<String>(paths);
163	paths.add(coreExecutionPath);
164	PropertyEditorManager.setEditorSearchPath(paths.toArray(new String[0]));
165	}
166	}
167	});
168	}	130	}
169		131
170	/** Overridden method from JUnit framework execution to perform conditional	132	/** Overridden method from JUnit framework execution to perform conditional
Lines 528-534 Link Here
528	}	490	}
529		491
530	protected static junit.framework.Test createModuleTest(String modules, String clusters, Class testClass, String... testNames) {	492	protected static junit.framework.Test createModuleTest(String modules, String clusters, Class testClass, String... testNames) {
531	return NbModuleSuite.create(testClass, clusters, modules, testNames);	493	return NbModuleSuite.emptyConfiguration().
		494	enableModules(modules).
		495	clusters(clusters).
		496	addTest(testClass, testNames).
		497	honorAutoloadEager(true).
		498	suite();
532	}	499	}
533		500
534	protected static junit.framework.Test createModuleTest(Class testClass, String... testNames) {	501	protected static junit.framework.Test createModuleTest(Class testClass, String... testNames) {

Lines 59-73 Link Here

(-)a/options.api/nbproject/project.xml (-9 lines)
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>
62	<code-name-base>org.netbeans.core</code-name-base>
63	<build-prerequisite/>
64	<compile-dependency/>
65	<run-dependency>
66	<release-version>2</release-version>
67	<specification-version>3.11</specification-version>
68	</run-dependency>
69	</dependency>
70	<dependency>
71	<code-name-base>org.netbeans.core.startup</code-name-base>	62	<code-name-base>org.netbeans.core.startup</code-name-base>
72	<build-prerequisite/>	63	<build-prerequisite/>
73	<compile-dependency/>	64	<compile-dependency/>

Lines 44-50 Link Here

(-)a/options.api/src/org/netbeans/modules/options/classic/FileStateEditor.java (-5 / +3 lines)
44		44
45	package org.netbeans.modules.options.classic;	45	package org.netbeans.modules.options.classic;
46		46
47	import org.netbeans.beaninfo.editors.ListImageEditor;
48	import org.openide.util.NbBundle;	47	import org.openide.util.NbBundle;
49	import org.openide.nodes.Node;	48	import org.openide.nodes.Node;
50	import org.openide.explorer.propertysheet.PropertyEnv;	49	import org.openide.explorer.propertysheet.PropertyEnv;
Lines 54-63 Link Here
54	import org.netbeans.modules.options.classic.SettingChildren.FileStateProperty;	53	import org.netbeans.modules.options.classic.SettingChildren.FileStateProperty;
55		54
56	/**	55	/**
57	*	56	* XXX: Should rather communicate with ListImageEditor or some other editor via properties...
58	* @author Vitezslav Stejskal	57	* @author Vitezslav Stejskal
59	*/	58	*/
60	class FileStateEditor extends ListImageEditor {	59	class FileStateEditor {/* extends ListImageEditor {
61		60
62	private String action_define = null;	61	private String action_define = null;
63	private String action_revert = null;	62	private String action_revert = null;
Lines 65-71 Link Here
65		64
66	private Node.Property<?> prop = null;	65	private Node.Property<?> prop = null;
67		66
68	/** Creates new FileStatePropertyEditor */
69	public FileStateEditor () {	67	public FileStateEditor () {
70	super ();	68	super ();
71		69
Lines 137-141 Link Here
137	return new String [] {	135	return new String [] {
138	action_define	136	action_define
139	};	137	};
140	}	138	}*/
141	}	139	}

Line 0 Link Here

(-)a/propertyeditors/nbproject/project.xml (+98 lines)
		1	<?xml version="1.0" encoding="UTF-8"?>
		2	<project xmlns="http://www.netbeans.org/ns/project/1">
		3	<type>org.netbeans.modules.apisupport.project</type>
		4	<configuration>
		5	<data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
		6	<code-name-base>org.netbeans.modules.propertyeditors</code-name-base>
		7	<module-dependencies>
		8	<dependency>
		9	<code-name-base>org.openide.awt</code-name-base>
		10	<build-prerequisite/>
		11	<compile-dependency/>
		12	<run-dependency>
		13	<specification-version>7.45</specification-version>
		14	</run-dependency>
		15	</dependency>
		16	<dependency>
		17	<code-name-base>org.openide.dialogs</code-name-base>
		18	<build-prerequisite/>
		19	<compile-dependency/>
		20	<run-dependency>
		21	<specification-version>6.2</specification-version>
		22	</run-dependency>
		23	</dependency>
		24	<dependency>
		25	<code-name-base>org.openide.explorer</code-name-base>
		26	<build-prerequisite/>
		27	<compile-dependency/>
		28	<run-dependency>
		29	<specification-version>6.23</specification-version>
		30	</run-dependency>
		31	</dependency>
		32	<dependency>
		33	<code-name-base>org.openide.filesystems</code-name-base>
		34	<build-prerequisite/>
		35	<compile-dependency/>
		36	<run-dependency>
		37	<specification-version>8.0</specification-version>
		38	</run-dependency>
		39	</dependency>
		40	<dependency>
		41	<code-name-base>org.openide.loaders</code-name-base>
		42	<build-prerequisite/>
		43	<compile-dependency/>
		44	<run-dependency>
		45	<specification-version>7.13</specification-version>
		46	</run-dependency>
		47	</dependency>
		48	<dependency>
		49	<code-name-base>org.openide.modules</code-name-base>
		50	<build-prerequisite/>
		51	<compile-dependency/>
		52	<run-dependency>
		53	<specification-version>7.25</specification-version>
		54	</run-dependency>
		55	</dependency>
		56	<dependency>
		57	<code-name-base>org.openide.nodes</code-name-base>
		58	<build-prerequisite/>
		59	<compile-dependency/>
		60	<run-dependency>
		61	<specification-version>7.23</specification-version>
		62	</run-dependency>
		63	</dependency>
		64	<dependency>
65	<code-name-base>org.openide.util</code-name-base>
66	<build-prerequisite/>
67	<compile-dependency/>
68	<run-dependency>
69	<specification-version>8.25</specification-version>
70	</run-dependency>
71	</dependency>
72	<dependency>
73	<code-name-base>org.openide.util.lookup</code-name-base>
74	<build-prerequisite/>
75	<compile-dependency/>
76	<run-dependency>
77	<specification-version>8.0</specification-version>
78	</run-dependency>
79	</dependency>
80	</module-dependencies>
81	<test-dependencies>
82	<test-type>
83	<name>unit</name>
84	<test-dependency>
85	<code-name-base>org.netbeans.libs.junit4</code-name-base>
86	<compile-dependency/>
87	</test-dependency>
88	<test-dependency>
89	<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
90	<recursive/>
91	<compile-dependency/>
92	</test-dependency>
93	</test-type>
94	</test-dependencies>
95	<public-packages/>
96	</data>
97	</configuration>
98	</project>

Lines 46-55 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/ArrayOfIntSupport.java (-4 / +2 lines)
46		46
47	import java.util.StringTokenizer;	47	import java.util.StringTokenizer;
48	import java.text.MessageFormat;	48	import java.text.MessageFormat;
49	import org.netbeans.core.UIExceptions;
50	import org.openide.explorer.propertysheet.ExPropertyEditor;	49	import org.openide.explorer.propertysheet.ExPropertyEditor;
51	import org.openide.explorer.propertysheet.PropertyEnv;	50	import org.openide.explorer.propertysheet.PropertyEnv;
52	import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;	51	import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
		52	import org.openide.util.Exceptions;
53		53
54	/** Support for property editors for several integers.	54	/** Support for property editors for several integers.
55	* for example: Point - [2,4], Insets [2,3,4,4],...	55	* for example: Point - [2,4], Insets [2,3,4,4],...
Lines 199-207 Link Here
199	String msg = new MessageFormat(VALUE_FORMAT).format(new Object[]	199	String msg = new MessageFormat(VALUE_FORMAT).format(new Object[]
200	{ className , getHintFormat() } );	200	{ className , getHintFormat() } );
201	IllegalArgumentException iae = new IllegalArgumentException(msg);	201	IllegalArgumentException iae = new IllegalArgumentException(msg);
202	UIExceptions.annotateUser(iae, e == null ? ""	202	Exceptions.attachLocalizedMessage(iae, msg);
203	: e.getMessage(), msg, e,
204	new java.util.Date()); //NOI18N
205	throw iae;	203	throw iae;
206	}	204	}
207		205

Lines 78-85 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java (-5 / +3 lines)
78	import javax.swing.ListCellRenderer;	78	import javax.swing.ListCellRenderer;
79	import javax.swing.UIDefaults;	79	import javax.swing.UIDefaults;
80	import javax.swing.UIManager;	80	import javax.swing.UIManager;
81	import org.netbeans.core.UIExceptions;
82	import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;	81	import org.openide.explorer.propertysheet.editors.XMLPropertyEditor;
		82	import org.openide.util.Exceptions;
83	import org.openide.util.NbBundle;	83	import org.openide.util.NbBundle;
84		84
85		85
Lines 322-330 Link Here
322	new Color(red, green, blue)));	322	new Color(red, green, blue)));
323	return;	323	return;
324	} catch( IllegalArgumentException iaE ) {	324	} catch( IllegalArgumentException iaE ) {
325	UIExceptions.annotateUser(iaE, null,	325	Exceptions.attachLocalizedMessage(iaE, iaE.getLocalizedMessage());
326	iaE.getLocalizedMessage(),
327	null, null);
328	throw iaE;	326	throw iaE;
329	}	327	}
330	}	328	}
Lines 361-367 Link Here
361	NbBundle.getMessage (ColorEditor.class, "FMT_IllegalEntry"),	359	NbBundle.getMessage (ColorEditor.class, "FMT_IllegalEntry"),
362	new Object[]{text});	360	new Object[]{text});
363	IllegalArgumentException iae = new IllegalArgumentException (text);	361	IllegalArgumentException iae = new IllegalArgumentException (text);
364	UIExceptions.annotateUser(iae, text, msg, null, null);	362	Exceptions.attachLocalizedMessage(iae, msg);
365	throw iae;	363	throw iae;
366	}	364	}
367		365

Lines 48-57 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java (-5 / +4 lines)
48	import java.beans.PropertyChangeEvent;	48	import java.beans.PropertyChangeEvent;
49	import java.beans.PropertyChangeListener;	49	import java.beans.PropertyChangeListener;
50	import java.util.ResourceBundle;	50	import java.util.ResourceBundle;
51	import org.netbeans.core.UIExceptions;
52	import org.openide.awt.Mnemonics;	51	import org.openide.awt.Mnemonics;
53		52
54	import org.openide.explorer.propertysheet.PropertyEnv;	53	import org.openide.explorer.propertysheet.PropertyEnv;
		54	import org.openide.util.Exceptions;
55	import org.openide.util.NbBundle;	55	import org.openide.util.NbBundle;
56		56
57	/**	57	/**
Lines 104-118 Link Here
104	int height = Integer.parseInt (heightField.getText ());	104	int height = Integer.parseInt (heightField.getText ());
105	if ((width < 0) \|\| (height < 0)) {	105	if ((width < 0) \|\| (height < 0)) {
106	IllegalStateException ise = new IllegalStateException();	106	IllegalStateException ise = new IllegalStateException();
107	UIExceptions.annotateUser(ise, null,	107	Exceptions.attachLocalizedMessage(ise, NbBundle.getMessage(DimensionCustomEditor.class, "CTL_NegativeSize"));
108	NbBundle.getMessage(DimensionCustomEditor.class, "CTL_NegativeSize"), null, null);
109	throw ise;	108	throw ise;
110	}	109	}
111	return new Dimension (width, height);	110	return new Dimension (width, height);
112	} catch (NumberFormatException e) {	111	} catch (NumberFormatException e) {
113	IllegalStateException ise = new IllegalStateException();	112	IllegalStateException ise = new IllegalStateException();
114	UIExceptions.annotateUser(ise, null,	113	Exceptions.attachLocalizedMessage(ise,
115	NbBundle.getMessage(DimensionCustomEditor.class, "CTL_InvalidValue"), null, null);	114	NbBundle.getMessage(DimensionCustomEditor.class, "CTL_InvalidValue"));
116	throw ise;	115	throw ise;
117	}	116	}
118	}	117	}

Lines 51-57 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java (-7 / +6 lines)
51	import javax.swing.*;	51	import javax.swing.*;
52	import javax.swing.border.*;	52	import javax.swing.border.*;
53	import javax.swing.event.*;	53	import javax.swing.event.*;
54	import org.netbeans.core.UIExceptions;
55	import org.openide.DialogDisplayer;	54	import org.openide.DialogDisplayer;
56		55
57	import org.openide.NotifyDescriptor;	56	import org.openide.NotifyDescriptor;
Lines 461-478 Link Here
461	size = Integer.parseInt (tfSize.getText ());	460	size = Integer.parseInt (tfSize.getText ());
462	if (size <= 0) {	461	if (size <= 0) {
463	IllegalArgumentException iae = new IllegalArgumentException ();	462	IllegalArgumentException iae = new IllegalArgumentException ();
464	UIExceptions.annotateUser (iae, null,	463	Exceptions.attachLocalizedMessage (iae,
465	size == 0 ? NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithParam", tfSize.getText ()) : // NOI18N	464	size == 0 ? NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithParam", tfSize.getText ()) : // NOI18N
466	NbBundle.getMessage (FontEditor.class, "CTL_NegativeSize"), // NOI18N	465	NbBundle.getMessage (FontEditor.class, "CTL_NegativeSize") // NOI18N
467	null, null);	466	);
468	tfSize.setText (String.valueOf (font.getSize ()));	467	tfSize.setText (String.valueOf (font.getSize ()));
469	throw iae;	468	throw iae;
470	}	469	}
471	updateSizeList(size);	470	updateSizeList(size);
472	} catch (NumberFormatException e) {	471	} catch (NumberFormatException e) {
473	UIExceptions.annotateUser (e, null,	472	Exceptions.attachLocalizedMessage (e,
474	NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithExc", e), // NOI18N	473	NbBundle.getMessage (FontEditor.class, "CTL_InvalidValueWithExc", e) // NOI18N
475	null, null);	474	);
476	tfSize.setText (String.valueOf (font.getSize ()));	475	tfSize.setText (String.valueOf (font.getSize ()));
477	throw e;	476	throw e;
478	}	477	}

Lines 54-62 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java (-5 / +4 lines)
54	import javax.swing.JLabel;	54	import javax.swing.JLabel;
55	import javax.swing.JTextField;	55	import javax.swing.JTextField;
56	import javax.swing.UIManager;	56	import javax.swing.UIManager;
57	import org.netbeans.core.UIExceptions;
58	import org.openide.awt.Mnemonics;	57	import org.openide.awt.Mnemonics;
59	import org.openide.explorer.propertysheet.PropertyEnv;	58	import org.openide.explorer.propertysheet.PropertyEnv;
		59	import org.openide.util.Exceptions;
60	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
61		61
62	/**	62	/**
Lines 131-137 Link Here
131	int height = Integer.parseInt (heightField.getText ());	131	int height = Integer.parseInt (heightField.getText ());
132	// if ((x < 0) \|\| (y < 0) \|\| (width < 0) \|\| (height < 0)) {	132	// if ((x < 0) \|\| (y < 0) \|\| (width < 0) \|\| (height < 0)) {
133	// IllegalStateException ise = new IllegalStateException();	133	// IllegalStateException ise = new IllegalStateException();
134	// UIExceptions.annotateUser(ise, null,	134	// Exceptions.attachLocalizedMessage(ise, null,
135	// NbBundle.getMessage(InsetsCustomEditor.class,	135	// NbBundle.getMessage(InsetsCustomEditor.class,
136	// "CTL_NegativeSize"),	136	// "CTL_NegativeSize"),
137	// null, null);	137	// null, null);
Lines 140-149 Link Here
140	return new Insets (x, y, width, height);	140	return new Insets (x, y, width, height);
141	} catch (NumberFormatException e) {	141	} catch (NumberFormatException e) {
142	IllegalStateException ise = new IllegalStateException();	142	IllegalStateException ise = new IllegalStateException();
143	UIExceptions.annotateUser(ise, null,	143	Exceptions.attachLocalizedMessage(ise,
144	NbBundle.getMessage(InsetsCustomEditor.class,	144	NbBundle.getMessage(InsetsCustomEditor.class,
145	"CTL_InvalidValue"),	145	"CTL_InvalidValue"));
146	null, null);
147	throw ise;	146	throw ise;
148	}	147	}
149	}	148	}

Lines 47-57 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/ListImageEditor.java (-3 / +2 lines)
47	import java.awt.Image;	47	import java.awt.Image;
48	import java.beans.PropertyEditorSupport;	48	import java.beans.PropertyEditorSupport;
49	import java.beans.FeatureDescriptor;	49	import java.beans.FeatureDescriptor;
50	import org.netbeans.core.UIExceptions;
51		50
52	import org.openide.explorer.propertysheet.PropertyEnv;	51	import org.openide.explorer.propertysheet.PropertyEnv;
53	import org.openide.explorer.propertysheet.ExPropertyEditor;	52	import org.openide.explorer.propertysheet.ExPropertyEditor;
54	import org.openide.nodes.Node;	53	import org.openide.nodes.Node;
		54	import org.openide.util.Exceptions;
55	import org.openide.util.NbBundle;	55	import org.openide.util.NbBundle;
56		56
57		57
Lines 142-149 Link Here
142	"negative: " + str); //NOI18N	142	"negative: " + str); //NOI18N
143	String msg = NbBundle.getMessage(ListImageEditor.class,	143	String msg = NbBundle.getMessage(ListImageEditor.class,
144	"CTL_NegativeSize"); //NOI18N	144	"CTL_NegativeSize"); //NOI18N
145	UIExceptions.annotateUser(iae, iae.getMessage(), msg, null,	145	Exceptions.attachLocalizedMessage(iae, msg);
146	new java.util.Date());
147	throw iae;	146	throw iae;
148	}	147	}
149	setValue (findObject (values, i));	148	setValue (findObject (values, i));

Lines 47-56 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java (-8 / +5 lines)
47	import java.awt.Point;	47	import java.awt.Point;
48	import java.awt.Dimension;	48	import java.awt.Dimension;
49	import java.beans.PropertyChangeEvent;	49	import java.beans.PropertyChangeEvent;
50	import java.beans.PropertyChangeListener;
51	import org.netbeans.core.UIExceptions;
52	import org.openide.awt.Mnemonics;	50	import org.openide.awt.Mnemonics;
53	import org.openide.explorer.propertysheet.PropertyEnv;	51	import org.openide.explorer.propertysheet.PropertyEnv;
		52	import org.openide.util.Exceptions;
54	import org.openide.util.NbBundle;	53	import org.openide.util.NbBundle;
55		54
56	/** Custom property editor for Point and Dimension	55	/** Custom property editor for Point and Dimension
Lines 136-145 Link Here
136	if ( dimensionMode ) {	135	if ( dimensionMode ) {
137	if ((x < 0) \|\| (y < 0)) {	136	if ((x < 0) \|\| (y < 0)) {
138	IllegalStateException ise = new IllegalStateException();	137	IllegalStateException ise = new IllegalStateException();
139	UIExceptions.annotateUser(ise, null,	138	Exceptions.attachLocalizedMessage(ise,
140	NbBundle.getMessage(PointCustomEditor.class,	139	NbBundle.getMessage(PointCustomEditor.class,
141	"CTL_NegativeSize"),	140	"CTL_NegativeSize"));
142	null, null);
143	throw ise;	141	throw ise;
144	}	142	}
145	return new Dimension (x, y);	143	return new Dimension (x, y);
Lines 148-157 Link Here
148	}	146	}
149	} catch (NumberFormatException e) {	147	} catch (NumberFormatException e) {
150	IllegalStateException ise = new IllegalStateException();	148	IllegalStateException ise = new IllegalStateException();
151	UIExceptions.annotateUser(ise, null,	149	Exceptions.attachLocalizedMessage(ise,
152	NbBundle.getMessage(PointCustomEditor.class,	150	NbBundle.getMessage(PointCustomEditor.class,
153	"CTL_InvalidValue"),	151	"CTL_InvalidValue"));
154	null, null);
155	throw ise;	152	throw ise;
156	}	153	}
157	}	154	}

Line 0 Link Here

(-)a/propertyeditors/src/org/netbeans/beaninfo/editors/RegisterEditors.java (+99 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.beaninfo.editors;
		43
		44	import java.beans.PropertyEditorManager;
		45	import org.openide.modules.OnStart;
		46
		47	/**
		48	*
		49	* @author Jaroslav Tulach <jtulach@netbeans.org>
		50	*/
		51	@OnStart
		52	public class RegisterEditors implements Runnable {
		53	private static boolean editorsRegistered;
		54
		55	@Override
		56	public void run() {
		57	registerPropertyEditors();
		58	}
		59	/**
		60	* Register NB specific property editors. Allows property editor unit tests
		61	* to work correctly without initializing full NetBeans environment.
		62	*/
		63	public static void registerPropertyEditors() {
		64	//issue 31879
65	if (editorsRegistered) {
66	return;
67	}
68	String[] syspesp = PropertyEditorManager.getEditorSearchPath();
69	String[] nbpesp = new String[]{
70	"org.netbeans.beaninfo.editors", // NOI18N
71	"org.openide.explorer.propertysheet.editors", // NOI18N
72	};
73	String[] allpesp = new String[syspesp.length + nbpesp.length];
74	System.arraycopy(nbpesp, 0, allpesp, 0, nbpesp.length);
75	System.arraycopy(syspesp, 0, allpesp, nbpesp.length, syspesp.length);
76	PropertyEditorManager.setEditorSearchPath(allpesp);
77	PropertyEditorManager.registerEditor(java.lang.Character.TYPE, org.netbeans.beaninfo.editors.CharEditor.class);
78	PropertyEditorManager.registerEditor(String[].class, org.netbeans.beaninfo.editors.StringArrayEditor.class);
79	// use replacement hintable/internationalizable primitive editors - issues 20376, 5278
80	PropertyEditorManager.registerEditor(Integer.TYPE, org.netbeans.beaninfo.editors.IntEditor.class);
81	PropertyEditorManager.registerEditor(Boolean.TYPE, org.netbeans.beaninfo.editors.BoolEditor.class);
82	editorsRegistered = true;
83	}
84
85	/** Used in layer xml to register FactoryEditor. */
86	private static org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor createHtmlBrowserFactoryEditor() {
87	return new org.netbeans.beaninfo.editors.HtmlBrowser.FactoryEditor(){
88	public void setValue(Object value) {
89	// XXX setWWWBrowser((org.openide.awt.HtmlBrowser.Factory)value);
90	}
91
92	public Object getValue() {
93	// XXX return getWWWBrowser();
94	return null;
95	}
96	};
97	}
98
99	}

Lines 46-54 Link Here

(-)a/o.n.core/src/org/netbeans/beaninfo/editors/WrappersEditor.java (-3 / +2 lines)
46		46
47	import java.beans.*;	47	import java.beans.*;
48	import java.text.MessageFormat;	48	import java.text.MessageFormat;
49	import org.netbeans.core.UIExceptions;
50	import org.openide.explorer.propertysheet.ExPropertyEditor;	49	import org.openide.explorer.propertysheet.ExPropertyEditor;
51	import org.openide.explorer.propertysheet.PropertyEnv;	50	import org.openide.explorer.propertysheet.PropertyEnv;
		51	import org.openide.util.Exceptions;
52	import org.openide.util.NbBundle;	52	import org.openide.util.NbBundle;
53		53
54	/**	54	/**
Lines 102-109 Link Here
102	NbBundle.getMessage(	102	NbBundle.getMessage(
103	WrappersEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"), text); //NOI18N	103	WrappersEditor.class, "FMT_EXC_GENERIC_BAD_VALUE"), text); //NOI18N
104	}	104	}
105	UIExceptions.annotateUser(iae, iae.getMessage(), msg, e,	105	Exceptions.attachLocalizedMessage(iae, msg);
106	new java.util.Date());
107	throw iae;	106	throw iae;
108	}	107	}
109	}	108	}

Lines 47-53 Link Here

(-)a/o.n.core/test/unit/src/org/netbeans/beaninfo/editors/FindEditorTest.java (-4 / +1 lines)
47	import java.beans.PropertyEditorManager;	47	import java.beans.PropertyEditorManager;
48	import junit.textui.TestRunner;	48	import junit.textui.TestRunner;
49	import org.netbeans.junit.*;	49	import org.netbeans.junit.*;
50	import org.openide.filesystems.FileUtil;
51		50
52	/** Test finding of property editors registred by core.	51	/** Test finding of property editors registred by core.
53	* @author Jiri Rechtacek	52	* @author Jiri Rechtacek
Lines 55-63 Link Here
55	public class FindEditorTest extends NbTestCase {	54	public class FindEditorTest extends NbTestCase {
56		55
57	static {	56	static {
58	//issue 31879, force registration of NB editors so this	57	RegisterEditors.registerPropertyEditors();
59	//test can pass when editor tests are run standalone
60	org.netbeans.core.CoreBridgeImpl.getDefault().registerPropertyEditors();
61	}	58	}
62		59
63	public FindEditorTest(String name) {	60	public FindEditorTest(String name) {