Attachment #125141 for bug #218312

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 218312
Collapse All | Expand All

Lines 4-10 Link Here

(-)a/cnd.debugger.common2/nbproject/project.properties (-1 / +1 lines)
4	build.compiler.deprecation=false	4	build.compiler.deprecation=false
5	javac.source=1.6	5	javac.source=1.6
6	javac.compilerargs=-Xlint -Xlint:-serial	6	javac.compilerargs=-Xlint -Xlint:-serial
7	spec.version.base=3.7.0	7	spec.version.base=3.8.0
8	extra.module.files=bin/GdbKillProc.exe	8	extra.module.files=bin/GdbKillProc.exe
9		9
10	# added by hand:	10	# added by hand:

Lines 159-165 Link Here

(-)a/cnd.debugger.common2/nbproject/project.xml (-1 / +1 lines)
159	<compile-dependency/>	159	<compile-dependency/>
160	<run-dependency>	160	<run-dependency>
161	<release-version>1</release-version>	161	<release-version>1</release-version>
162	<specification-version>1.10.2</specification-version>	162	<specification-version>1.28</specification-version>
163	</run-dependency>	163	</run-dependency>
164	</dependency>	164	</dependency>
165	<dependency>	165	<dependency>

Lines 54-59 Link Here

(-)a/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/options/GlobalOptionsPanel.java (+3 lines)
54	import javax.swing.border.*;	54	import javax.swing.border.*;
55	import javax.swing.tree.TreeSelectionModel;	55	import javax.swing.tree.TreeSelectionModel;
56	import java.beans.*;	56	import java.beans.*;
		57	import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
		58	import org.netbeans.spi.options.OptionsPanelController;
57		59
58	import org.openide.util.NbCollections;	60	import org.openide.util.NbCollections;
59	import org.openide.explorer.ExplorerManager;	61	import org.openide.explorer.ExplorerManager;
Lines 67-72 Link Here
67	// roughly modelled on	69	// roughly modelled on
68	// org.netbeans.modules.cnd.execution.profiles.ui.ProfileCustomizer	70	// org.netbeans.modules.cnd.execution.profiles.ui.ProfileCustomizer
69		71
		72	@OptionsPanelController.Keywords(keywords={"c/c++ debugging"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=3)
70	public class GlobalOptionsPanel extends JPanel {	73	public class GlobalOptionsPanel extends JPanel {
71		74
72	private OptionSet options;	75	private OptionSet options;

Lines 3-9 Link Here

(-)a/cnd.makeproject/nbproject/project.properties (-1 / +1 lines)
3		3
4	sigtest.mail=cvs@cnd.netbeans.org	4	sigtest.mail=cvs@cnd.netbeans.org
5		5
6	spec.version.base=2.13.0	6	spec.version.base=2.14.0
7		7
8	test.config.stableBTD.includes=*/Test.class	8	test.config.stableBTD.includes=*/Test.class
9	test.config.stableBTD.excludes=\	9	test.config.stableBTD.excludes=\

Lines 147-153 Link Here

(-)a/cnd.makeproject/nbproject/project.xml (-1 / +1 lines)
147	<compile-dependency/>	147	<compile-dependency/>
148	<run-dependency>	148	<run-dependency>
149	<release-version>1</release-version>	149	<release-version>1</release-version>
150	<specification-version>1.5</specification-version>	150	<specification-version>1.28</specification-version>
151	</run-dependency>	151	</run-dependency>
152	</dependency>	152	</dependency>
153	<dependency>	153	<dependency>




import javax.swing.JSeparator;
import org.netbeans.modules.cnd.makeproject.MakeOptions;
import org.netbeans.modules.cnd.makeproject.api.MakeProjectOptions;
import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.cnd.utils.ui.NamedOption;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;

/**
 * Replaces the old project system options panel.
 */
@OptionsPanelController.Keywords(keywords={"c/c++ project options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=1)
public class ProjectOptionsPanel extends JPanel {

    private boolean changed;

Lines 1-6 Link Here

(-)a/cnd.toolchain/nbproject/project.properties (-1 / +1 lines)
1	is.autoload=true	1	is.autoload=true
2	javac.source=1.6	2	javac.source=1.6
3	javac.compilerargs=-Xlint -Xlint:-serial	3	javac.compilerargs=-Xlint -Xlint:-serial
4	spec.version.base=1.14.0	4	spec.version.base=1.15.0
5		5
6	test.config.stableBTD.includes=*/Test.class	6	test.config.stableBTD.includes=*/Test.class

Lines 87-93 Link Here

(-)a/cnd.toolchain/nbproject/project.xml (-1 / +1 lines)
87	<compile-dependency/>	87	<compile-dependency/>
88	<run-dependency>	88	<run-dependency>
89	<release-version>1</release-version>	89	<release-version>1</release-version>
90	<specification-version>1.17</specification-version>	90	<specification-version>1.28</specification-version>
91	</run-dependency>	91	</run-dependency>
92	</dependency>	92	</dependency>
93	<dependency>	93	<dependency>




import org.netbeans.modules.cnd.api.toolchain.ui.ToolsCacheManager;
import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;
import org.netbeans.modules.cnd.utils.NamedRunnable;
import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;

@OptionsPanelController.Keywords(keywords={"c/c++ code assistance"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=2)
public class ParserSettingsPanel extends JPanel implements ChangeListener, ActionListener, IsChangedListener {

    private Map<Tool, PredefinedPanel> predefinedPanels = new WeakHashMap<Tool, PredefinedPanel>();




import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;
import org.netbeans.modules.cnd.toolchain.compilerset.CompilerSetImpl;
import org.netbeans.modules.cnd.toolchain.compilerset.CompilerSetManagerImpl;
import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
import org.netbeans.modules.nativeexecution.api.util.ConnectionManager;
import org.netbeans.modules.nativeexecution.api.util.ConnectionManager.CancellationException;
import org.netbeans.modules.nativeexecution.api.util.HostInfoUtils;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;

import org.openide.util.RequestProcessor;

/** Display the "Tools Default" panel */
@OptionsPanelController.Keywords(keywords={"c/c++ build tools"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=0)
public final class ToolsPanel extends JPanel implements ActionListener,
        ListSelectionListener, ItemListener {


Lines 3-9 Link Here

(-)a/cnd/nbproject/project.properties (-1 / +1 lines)
3	javahelp.hs=cnd.hs	3	javahelp.hs=cnd.hs
4	sigtest.mail=cvs@cnd.netbeans.org	4	sigtest.mail=cvs@cnd.netbeans.org
5		5
6	spec.version.base=1.19.0	6	spec.version.base=1.20.0
7		7
8	nbm.executable.files=bin/dorun.sh	8	nbm.executable.files=bin/dorun.sh
9		9

Lines 96-102 Link Here

(-)a/cnd/nbproject/project.xml (-1 / +1 lines)
96	<compile-dependency/>	96	<compile-dependency/>
97	<run-dependency>	97	<run-dependency>
98	<release-version>1</release-version>	98	<release-version>1</release-version>
99	<specification-version>1.5</specification-version>	99	<specification-version>1.28</specification-version>
100	</run-dependency>	100	</run-dependency>
101	</dependency>	101	</dependency>
102	<dependency>	102	<dependency>




import javax.swing.JPanel;
import javax.swing.LayoutStyle;
import org.netbeans.modules.cnd.utils.MIMEExtensions;
import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.cnd.utils.ui.NamedOption;
import org.netbeans.modules.cnd.utils.ui.StringArrayCustomEditor;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;

 *
 * @author sg155630
 */
@OptionsPanelController.Keywords(keywords={"c/c++ other options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=4)
/*package-local*/ final class CndOtherOptionsPanel extends javax.swing.JPanel implements ActionListener {

    public CndOtherOptionsPanel() {

Lines 2-5 Link Here

(-)a/hudson.php/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.hudson.php	2	OpenIDE-Module: org.netbeans.modules.hudson.php
3	OpenIDE-Module-Layer: org/netbeans/modules/hudson/php/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/hudson/php/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/php/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/php/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.5	5	OpenIDE-Module-Specification-Version: 1.6

Lines 28-34 Link Here

(-)a/hudson.php/nbproject/project.xml (-1 / +1 lines)
28	<compile-dependency/>	28	<compile-dependency/>
29	<run-dependency>	29	<run-dependency>
30	<release-version>1</release-version>	30	<release-version>1</release-version>
31	<specification-version>1.25</specification-version>	31	<specification-version>1.28</specification-version>
32	</run-dependency>	32	</run-dependency>
33	</dependency>	33	</dependency>
34	<dependency>	34	<dependency>

Lines 69-74 Link Here

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java (+2 lines)
69	import org.netbeans.modules.hudson.php.options.HudsonOptionsValidator;	69	import org.netbeans.modules.hudson.php.options.HudsonOptionsValidator;
70	import org.netbeans.modules.php.api.util.FileUtils;	70	import org.netbeans.modules.php.api.util.FileUtils;
71	import org.netbeans.modules.php.api.util.UiUtils;	71	import org.netbeans.modules.php.api.util.UiUtils;
		72	import org.netbeans.spi.options.OptionsPanelController;
72	import org.openide.awt.HtmlBrowser;	73	import org.openide.awt.HtmlBrowser;
73	import org.openide.awt.Mnemonics;	74	import org.openide.awt.Mnemonics;
74	import org.openide.filesystems.FileChooserBuilder;	75	import org.openide.filesystems.FileChooserBuilder;
Lines 80-85 Link Here
80	/**	81	/**
81	*	82	*
82	*/	83	*/
		84	@OptionsPanelController.Keywords(keywords={"php hudson"}, location=UiUtils.OPTIONS_PATH, index=4)
83	public class HudsonOptionsPanel extends JPanel {	85	public class HudsonOptionsPanel extends JPanel {
84		86
85	private static final long serialVersionUID = -464132465732132L;	87	private static final long serialVersionUID = -464132465732132L;

Lines 3-7 Link Here

(-)a/php.apigen/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.php.apigen	3	OpenIDE-Module: org.netbeans.modules.php.apigen
4	OpenIDE-Module-Layer: org/netbeans/modules/php/apigen/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/php/apigen/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/apigen/resources/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/apigen/resources/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.6	6	OpenIDE-Module-Specification-Version: 1.7
7	OpenIDE-Module-Recommends: cnb.org.netbeans.modules.languages.neon	7	OpenIDE-Module-Recommends: cnb.org.netbeans.modules.languages.neon

Lines 29-35 Link Here

(-)a/php.apigen/nbproject/project.xml (-1 / +1 lines)
29	<compile-dependency/>	29	<compile-dependency/>
30	<run-dependency>	30	<run-dependency>
31	<release-version>1</release-version>	31	<release-version>1</release-version>
32	<specification-version>1.25</specification-version>	32	<specification-version>1.28</specification-version>
33	</run-dependency>	33	</run-dependency>
34	</dependency>	34	</dependency>
35	<dependency>	35	<dependency>

Lines 66-71 Link Here

(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java (+2 lines)
66	import org.netbeans.modules.php.api.util.FileUtils;	66	import org.netbeans.modules.php.api.util.FileUtils;
67	import org.netbeans.modules.php.api.util.UiUtils;	67	import org.netbeans.modules.php.api.util.UiUtils;
68	import org.netbeans.modules.php.apigen.commands.ApiGenScript;	68	import org.netbeans.modules.php.apigen.commands.ApiGenScript;
		69	import org.netbeans.spi.options.OptionsPanelController;
69	import org.openide.awt.HtmlBrowser;	70	import org.openide.awt.HtmlBrowser;
70	import org.openide.awt.Mnemonics;	71	import org.openide.awt.Mnemonics;
71	import org.openide.filesystems.FileChooserBuilder;	72	import org.openide.filesystems.FileChooserBuilder;
Lines 74-79 Link Here
74	import org.openide.util.Exceptions;	75	import org.openide.util.Exceptions;
75	import org.openide.util.NbBundle;	76	import org.openide.util.NbBundle;
76		77
		78	@OptionsPanelController.Keywords(keywords={"php apigen"}, location=UiUtils.OPTIONS_PATH, index=5)
77	public class ApiGenOptionsPanel extends JPanel {	79	public class ApiGenOptionsPanel extends JPanel {
78		80
79	private static final long serialVersionUID = 458797646546L;	81	private static final long serialVersionUID = 458797646546L;

Lines 3-7 Link Here

(-)a/php.composer/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.php.composer	3	OpenIDE-Module: org.netbeans.modules.php.composer
4	OpenIDE-Module-Layer: org/netbeans/modules/php/composer/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/php/composer/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/composer/resources/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/composer/resources/Bundle.properties
6	OpenIDE-Module-Specification-Version: 0.4	6	OpenIDE-Module-Specification-Version: 0.5
7		7

Lines 20-26 Link Here

(-)a/php.composer/nbproject/project.xml (-1 / +1 lines)
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<release-version>1</release-version>	22	<release-version>1</release-version>
23	<specification-version>1.27</specification-version>	23	<specification-version>1.28</specification-version>
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>

Lines 64-69 Link Here

(-)a/php.composer/src/org/netbeans/modules/php/composer/ui/options/ComposerOptionsPanel.java (+2 lines)
64	import org.netbeans.modules.php.api.util.FileUtils;	64	import org.netbeans.modules.php.api.util.FileUtils;
65	import org.netbeans.modules.php.api.util.UiUtils;	65	import org.netbeans.modules.php.api.util.UiUtils;
66	import org.netbeans.modules.php.composer.commands.Composer;	66	import org.netbeans.modules.php.composer.commands.Composer;
		67	import org.netbeans.spi.options.OptionsPanelController;
67	import org.openide.awt.HtmlBrowser;	68	import org.openide.awt.HtmlBrowser;
68	import org.openide.awt.Mnemonics;	69	import org.openide.awt.Mnemonics;
69	import org.openide.filesystems.FileChooserBuilder;	70	import org.openide.filesystems.FileChooserBuilder;
Lines 72-77 Link Here
72	import org.openide.util.Exceptions;	73	import org.openide.util.Exceptions;
73	import org.openide.util.NbBundle;	74	import org.openide.util.NbBundle;
74		75
		76	@OptionsPanelController.Keywords(keywords={"php composer"}, location=UiUtils.OPTIONS_PATH, index=7)
75	public class ComposerOptionsPanel extends JPanel {	77	public class ComposerOptionsPanel extends JPanel {
76		78
77	private static final long serialVersionUID = 871513576876878676L;	79	private static final long serialVersionUID = 871513576876878676L;

Lines 2-5 Link Here

(-)a/php.doctrine2/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.doctrine2	2	OpenIDE-Module: org.netbeans.modules.php.doctrine2
3	OpenIDE-Module-Layer: org/netbeans/modules/php/doctrine2/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/doctrine2/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/doctrine2/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/doctrine2/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.11	5	OpenIDE-Module-Specification-Version: 1.12

Lines 29-35 Link Here

(-)a/php.doctrine2/nbproject/project.xml (-1 / +1 lines)
29	<compile-dependency/>	29	<compile-dependency/>
30	<run-dependency>	30	<run-dependency>
31	<release-version>1</release-version>	31	<release-version>1</release-version>
32	<specification-version>1.25</specification-version>	32	<specification-version>1.28</specification-version>
33	</run-dependency>	33	</run-dependency>
34	</dependency>	34	</dependency>
35	<dependency>	35	<dependency>

Lines 64-69 Link Here

(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java (+2 lines)
64	import org.netbeans.modules.php.api.util.FileUtils;	64	import org.netbeans.modules.php.api.util.FileUtils;
65	import org.netbeans.modules.php.api.util.UiUtils;	65	import org.netbeans.modules.php.api.util.UiUtils;
66	import org.netbeans.modules.php.doctrine2.commands.Doctrine2Script;	66	import org.netbeans.modules.php.doctrine2.commands.Doctrine2Script;
		67	import org.netbeans.spi.options.OptionsPanelController;
67	import org.openide.awt.HtmlBrowser;	68	import org.openide.awt.HtmlBrowser;
68	import org.openide.awt.Mnemonics;	69	import org.openide.awt.Mnemonics;
69	import org.openide.filesystems.FileChooserBuilder;	70	import org.openide.filesystems.FileChooserBuilder;
Lines 75-80 Link Here
75	/**	76	/**
76	* Panel for Doctrine2 options.	77	* Panel for Doctrine2 options.
77	*/	78	*/
		79	@OptionsPanelController.Keywords(keywords={"php doctrine2"}, location=UiUtils.OPTIONS_PATH, index=12)
78	public class Doctrine2OptionsPanel extends JPanel {	80	public class Doctrine2OptionsPanel extends JPanel {
79		81
80	private static final long serialVersionUID = 67643468774654L;	82	private static final long serialVersionUID = 67643468774654L;

Lines 3-7 Link Here

(-)a/php.phpdoc/manifest.mf (-1 / +1 lines)
3	OpenIDE-Module: org.netbeans.modules.php.phpdoc	3	OpenIDE-Module: org.netbeans.modules.php.phpdoc
4	OpenIDE-Module-Layer: org/netbeans/modules/php/phpdoc/resources/layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/php/phpdoc/resources/layer.xml
5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpdoc/resources/Bundle.properties	5	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpdoc/resources/Bundle.properties
6	OpenIDE-Module-Specification-Version: 1.10	6	OpenIDE-Module-Specification-Version: 1.11
7		7

Lines 20-26 Link Here

(-)a/php.phpdoc/nbproject/project.xml (-1 / +1 lines)
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<release-version>1</release-version>	22	<release-version>1</release-version>
23	<specification-version>1.19</specification-version>	23	<specification-version>1.28</specification-version>
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>

Lines 1-6 Link Here

(-)a/php.project/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	AutoUpdate-Show-In-Client: false	2	AutoUpdate-Show-In-Client: false
3	OpenIDE-Module-Specification-Version: 2.57	3	OpenIDE-Module-Specification-Version: 2.58
4	OpenIDE-Module: org.netbeans.modules.php.project	4	OpenIDE-Module: org.netbeans.modules.php.project
5	OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties	6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties

Lines 222-228 Link Here

(-)a/php.project/nbproject/project.xml (-1 / +1 lines)
222	<compile-dependency/>	222	<compile-dependency/>
223	<run-dependency>	223	<run-dependency>
224	<release-version>1</release-version>	224	<release-version>1</release-version>
225	<specification-version>1.5</specification-version>	225	<specification-version>1.28</specification-version>
226	</run-dependency>	226	</run-dependency>
227	</dependency>	227	</dependency>
228	<dependency>	228	<dependency>

Lines 71-76 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java (+2 lines)
71	import org.netbeans.modules.php.project.phpunit.PhpUnitSkelGen;	71	import org.netbeans.modules.php.project.phpunit.PhpUnitSkelGen;
72	import org.netbeans.modules.php.project.ui.LastUsedFolders;	72	import org.netbeans.modules.php.project.ui.LastUsedFolders;
73	import org.netbeans.modules.php.project.ui.Utils;	73	import org.netbeans.modules.php.project.ui.Utils;
		74	import org.netbeans.spi.options.OptionsPanelController;
74	import org.openide.awt.HtmlBrowser;	75	import org.openide.awt.HtmlBrowser;
75	import org.openide.awt.Mnemonics;	76	import org.openide.awt.Mnemonics;
76	import org.openide.filesystems.FileChooserBuilder;	77	import org.openide.filesystems.FileChooserBuilder;
Lines 82-87 Link Here
82	/**	83	/**
83	* @author Tomas Mysik	84	* @author Tomas Mysik
84	*/	85	*/
		86	@OptionsPanelController.Keywords(keywords={"php unit testing"}, location=UiUtils.OPTIONS_PATH, index=2)
85	public class PhpUnitOptionsPanel extends JPanel {	87	public class PhpUnitOptionsPanel extends JPanel {
86		88
87	private static final long serialVersionUID = -6453232134654321L;	89	private static final long serialVersionUID = -6453232134654321L;




import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import org.netbeans.modules.php.api.util.StringUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.project.annotations.UserAnnotationPanel;
import org.netbeans.modules.php.project.annotations.UserAnnotationTag;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;

@OptionsPanelController.Keywords(keywords={"php anotations"}, location=UiUtils.OPTIONS_PATH, index=3)
public class PhpAnnotationsPanel extends JPanel {

    private static final long serialVersionUID = 89732416546545L;

Lines 58-63 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpDebuggerPanel.java (+3 lines)
58	import javax.swing.event.ChangeListener;	58	import javax.swing.event.ChangeListener;
59	import javax.swing.event.DocumentEvent;	59	import javax.swing.event.DocumentEvent;
60	import javax.swing.event.DocumentListener;	60	import javax.swing.event.DocumentListener;
		61	import org.netbeans.modules.php.api.util.UiUtils;
		62	import org.netbeans.spi.options.OptionsPanelController;
61	import org.openide.DialogDisplayer;	63	import org.openide.DialogDisplayer;
62	import org.openide.NotifyDescriptor;	64	import org.openide.NotifyDescriptor;
63	import org.openide.awt.Mnemonics;	65	import org.openide.awt.Mnemonics;
Lines 67-72 Link Here
67	/**	69	/**
68	* UI for PHP debugging options.	70	* UI for PHP debugging options.
69	*/	71	*/
		72	@OptionsPanelController.Keywords(keywords={"php debugger"}, location=UiUtils.OPTIONS_PATH, index=1)
70	public class PhpDebuggerPanel extends JPanel {	73	public class PhpDebuggerPanel extends JPanel {
71		74
72	private static final long serialVersionUID = 9465641111345L;	75	private static final long serialVersionUID = 9465641111345L;

Lines 70-75 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java (+2 lines)
70	import org.netbeans.modules.php.project.ui.LastUsedFolders;	70	import org.netbeans.modules.php.project.ui.LastUsedFolders;
71	import org.netbeans.modules.php.project.ui.PathUiSupport;	71	import org.netbeans.modules.php.project.ui.PathUiSupport;
72	import org.netbeans.modules.php.project.ui.Utils;	72	import org.netbeans.modules.php.project.ui.Utils;
		73	import org.netbeans.spi.options.OptionsPanelController;
73	import org.openide.awt.Mnemonics;	74	import org.openide.awt.Mnemonics;
74	import org.openide.util.ChangeSupport;	75	import org.openide.util.ChangeSupport;
75	import org.openide.util.NbBundle;	76	import org.openide.util.NbBundle;
Lines 77-82 Link Here
77	/**	78	/**
78	* @author Tomas Mysik	79	* @author Tomas Mysik
79	*/	80	*/
		81	@OptionsPanelController.Keywords(keywords={"php"}, location=UiUtils.OPTIONS_PATH, index=0)
80	public final class PhpOptionsPanel extends JPanel {	82	public final class PhpOptionsPanel extends JPanel {
81		83
82	private static final long serialVersionUID = 10985641247986428L;	84	private static final long serialVersionUID = 10985641247986428L;

Lines 2-6 Link Here

(-)a/php.smarty/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.smarty	2	OpenIDE-Module: org.netbeans.modules.php.smarty
3	OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.70	5	OpenIDE-Module-Specification-Version: 1.71
6		6

Lines 137-143 Link Here

(-)a/php.smarty/nbproject/project.xml (-1 / +1 lines)
137	<compile-dependency/>	137	<compile-dependency/>
138	<run-dependency>	138	<run-dependency>
139	<release-version>1</release-version>	139	<release-version>1</release-version>
140	<specification-version>1.17</specification-version>	140	<specification-version>1.28</specification-version>
141	</run-dependency>	141	</run-dependency>
142	</dependency>	142	</dependency>
143	<dependency>	143	<dependency>




import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.smarty.SmartyFramework;
import org.netbeans.modules.php.smarty.SmartyFramework.ToggleCommentOption;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.util.ChangeSupport;

/**
 * @author Martin Fousek
 */
@OptionsPanelController.Keywords(keywords={"php smarty"}, location=UiUtils.OPTIONS_PATH, index=11)
public class SmartyOptionsPanel extends JPanel {
    private static final long serialVersionUID = -1384644114740L;


Lines 2-6 Link Here

(-)a/php.symfony/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.symfony	2	OpenIDE-Module: org.netbeans.modules.php.symfony
3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.23	5	OpenIDE-Module-Specification-Version: 1.24
6		6

Lines 47-53 Link Here

(-)a/php.symfony/nbproject/project.xml (-1 / +1 lines)
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
49	<release-version>1</release-version>	49	<release-version>1</release-version>
50	<specification-version>1.13</specification-version>	50	<specification-version>1.28</specification-version>
51	</run-dependency>	51	</run-dependency>
52	</dependency>	52	</dependency>
53	<dependency>	53	<dependency>




import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.symfony.SymfonyScript;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;

/**
 * @author Tomas Mysik
 */
@OptionsPanelController.Keywords(keywords={"php sympfony"}, location=UiUtils.OPTIONS_PATH, index=9)
public class SymfonyOptionsPanel extends JPanel {
    private static final long serialVersionUID = -1384645646121L;
    private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";


        symfonyLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleName"));         symfonyLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleDescription"));         symfonyTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleName"));         symfonyTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleDescription"));         browseButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleName"));         browseButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleDescription"));         searchButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleName"));         searchButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleDescription"));         symfonyScriptUsageLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleName"));         symfonyScriptUsageLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleDescription"));         runningInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleName"));         runningInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleDescription"));         ignoreCacheCheckBox.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleName"));         ignoreCacheCheckBox.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleDescription"));         defaultParametersLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleName"));         defaultParametersLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleDescription"));         defaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleName"));         defaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleDescription"));         defaultParametersForProjectTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleName"));         defaultParametersForProjectTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleDescription"));         infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleName"));         infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleDescription"));         defaultParametersForAppsLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleName"));         defaultParametersForAppsLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleDescription"));         defaultParametersForAppsTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleName"));         defaultParametersForAppsTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleDescription"));         noteLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleName"));         noteLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleDescription"));         includePathInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleName"));         includePathInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleDescription"));         installationInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleName"));         installationInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleDescription"));         learnMoreLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleName"));         learnMoreLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleDescription"));         errorLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleName"));         errorLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleDescription")); 
        getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.AccessibleContext.accessibleDescription")); // NOI18N
    }// </editor-fold>//GEN-END:initComponents

    private void browseButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
        File symfonyScript = new FileChooserBuilder(SymfonyOptionsPanel.class.getName() + SYMFONY_LAST_FOLDER_SUFFIX)

Lines 2-5 Link Here

(-)a/php.symfony2/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.symfony2/1	2	OpenIDE-Module: org.netbeans.modules.php.symfony2/1
3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony2/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/symfony2/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony2/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony2/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.9	5	OpenIDE-Module-Specification-Version: 1.10

Lines 38-44 Link Here

(-)a/php.symfony2/nbproject/project.xml (-1 / +1 lines)
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>1</release-version>
41	<specification-version>1.24</specification-version>	41	<specification-version>1.28</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 64-69 Link Here

(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java (+3 lines)
64	import javax.swing.event.DocumentEvent;	64	import javax.swing.event.DocumentEvent;
65	import javax.swing.event.DocumentListener;	65	import javax.swing.event.DocumentListener;
66	import javax.swing.filechooser.FileFilter;	66	import javax.swing.filechooser.FileFilter;
		67	import org.netbeans.modules.php.api.util.UiUtils;
		68	import org.netbeans.spi.options.OptionsPanelController;
67	import org.openide.awt.HtmlBrowser;	69	import org.openide.awt.HtmlBrowser;
68	import org.openide.awt.Mnemonics;	70	import org.openide.awt.Mnemonics;
69	import org.openide.filesystems.FileChooserBuilder;	71	import org.openide.filesystems.FileChooserBuilder;
Lines 75-80 Link Here
75	/**	77	/**
76	* Panel for SYmfony2 options.	78	* Panel for SYmfony2 options.
77	*/	79	*/
		80	@OptionsPanelController.Keywords(keywords={"php sympfony2"}, location=UiUtils.OPTIONS_PATH, index=8)
78	@NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)")	81	@NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)")
79	public class Symfony2OptionsPanel extends JPanel {	82	public class Symfony2OptionsPanel extends JPanel {
80		83

Lines 2-6 Link Here

(-)a/php.zend/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.php.zend	2	OpenIDE-Module: org.netbeans.modules.php.zend
3	OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml	3	OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties
5	OpenIDE-Module-Specification-Version: 1.14	5	OpenIDE-Module-Specification-Version: 1.15
6		6

Lines 38-44 Link Here

(-)a/php.zend/nbproject/project.xml (-1 / +1 lines)
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>1</release-version>
41	<specification-version>1.17</specification-version>	41	<specification-version>1.28</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>




import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.zend.ZendScript;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.awt.HtmlBrowser;

/**
 * @author Tomas Mysik
 */
@OptionsPanelController.Keywords(keywords={"php zend"}, location=UiUtils.OPTIONS_PATH, index=10)
public final class ZendOptionsPanel extends JPanel {
    private static final long serialVersionUID = -13564875423210L;
    private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";

Return to bug 218312

Lines 53-59 Link Here

(-)a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/options/ProjectOptionsPanel.java (+3 lines)
53	import javax.swing.JSeparator;	53	import javax.swing.JSeparator;
54	import org.netbeans.modules.cnd.makeproject.MakeOptions;	54	import org.netbeans.modules.cnd.makeproject.MakeOptions;
55	import org.netbeans.modules.cnd.makeproject.api.MakeProjectOptions;	55	import org.netbeans.modules.cnd.makeproject.api.MakeProjectOptions;
		56	import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
56	import org.netbeans.modules.cnd.utils.ui.NamedOption;	57	import org.netbeans.modules.cnd.utils.ui.NamedOption;
		58	import org.netbeans.spi.options.OptionsPanelController;
57	import org.openide.awt.Mnemonics;	59	import org.openide.awt.Mnemonics;
58	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
59	import org.openide.util.lookup.Lookups;	61	import org.openide.util.lookup.Lookups;
Lines 61-66 Link Here
61	/**	63	/**
62	* Replaces the old project system options panel.	64	* Replaces the old project system options panel.
63	*/	65	*/
		66	@OptionsPanelController.Keywords(keywords={"c/c++ project options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=1)
64	public class ProjectOptionsPanel extends JPanel {	67	public class ProjectOptionsPanel extends JPanel {
65		68
66	private boolean changed;	69	private boolean changed;

Lines 73-83 Link Here

(-)a/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/compiler/ParserSettingsPanel.java (+3 lines)
73	import org.netbeans.modules.cnd.api.toolchain.ui.ToolsCacheManager;	73	import org.netbeans.modules.cnd.api.toolchain.ui.ToolsCacheManager;
74	import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;	74	import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;
75	import org.netbeans.modules.cnd.utils.NamedRunnable;	75	import org.netbeans.modules.cnd.utils.NamedRunnable;
		76	import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
76	import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;	77	import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
77	import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;	78	import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
		79	import org.netbeans.spi.options.OptionsPanelController;
78	import org.openide.util.NbBundle;	80	import org.openide.util.NbBundle;
79	import org.openide.util.RequestProcessor;	81	import org.openide.util.RequestProcessor;
80		82
		83	@OptionsPanelController.Keywords(keywords={"c/c++ code assistance"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=2)
81	public class ParserSettingsPanel extends JPanel implements ChangeListener, ActionListener, IsChangedListener {	84	public class ParserSettingsPanel extends JPanel implements ChangeListener, ActionListener, IsChangedListener {
82		85
83	private Map<Tool, PredefinedPanel> predefinedPanels = new WeakHashMap<Tool, PredefinedPanel>();	86	private Map<Tool, PredefinedPanel> predefinedPanels = new WeakHashMap<Tool, PredefinedPanel>();

Lines 59-66 Link Here

(-)a/cnd/src/org/netbeans/modules/cnd/ui/options/CndOtherOptionsPanel.java (+3 lines)
59	import javax.swing.JPanel;	59	import javax.swing.JPanel;
60	import javax.swing.LayoutStyle;	60	import javax.swing.LayoutStyle;
61	import org.netbeans.modules.cnd.utils.MIMEExtensions;	61	import org.netbeans.modules.cnd.utils.MIMEExtensions;
		62	import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
62	import org.netbeans.modules.cnd.utils.ui.NamedOption;	63	import org.netbeans.modules.cnd.utils.ui.NamedOption;
63	import org.netbeans.modules.cnd.utils.ui.StringArrayCustomEditor;	64	import org.netbeans.modules.cnd.utils.ui.StringArrayCustomEditor;
		65	import org.netbeans.spi.options.OptionsPanelController;
64	import org.openide.DialogDescriptor;	66	import org.openide.DialogDescriptor;
65	import org.openide.DialogDisplayer;	67	import org.openide.DialogDisplayer;
66	import org.openide.NotifyDescriptor;	68	import org.openide.NotifyDescriptor;
Lines 72-77 Link Here
72	*	74	*
73	* @author sg155630	75	* @author sg155630
74	*/	76	*/
		77	@OptionsPanelController.Keywords(keywords={"c/c++ other options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=4)
75	/package-local/ final class CndOtherOptionsPanel extends javax.swing.JPanel implements ActionListener {	78	/package-local/ final class CndOtherOptionsPanel extends javax.swing.JPanel implements ActionListener {
76		79
77	public CndOtherOptionsPanel() {	80	public CndOtherOptionsPanel() {

Lines 65-70 Link Here

(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java (+2 lines)
65	import org.netbeans.modules.php.api.util.FileUtils;	65	import org.netbeans.modules.php.api.util.FileUtils;
66	import org.netbeans.modules.php.api.util.UiUtils;	66	import org.netbeans.modules.php.api.util.UiUtils;
67	import org.netbeans.modules.php.phpdoc.PhpDocScript;	67	import org.netbeans.modules.php.phpdoc.PhpDocScript;
		68	import org.netbeans.spi.options.OptionsPanelController;
68	import org.openide.awt.HtmlBrowser;	69	import org.openide.awt.HtmlBrowser;
69	import org.openide.awt.Mnemonics;	70	import org.openide.awt.Mnemonics;
70	import org.openide.filesystems.FileChooserBuilder;	71	import org.openide.filesystems.FileChooserBuilder;
Lines 73-78 Link Here
73	import org.openide.util.Exceptions;	74	import org.openide.util.Exceptions;
74	import org.openide.util.NbBundle;	75	import org.openide.util.NbBundle;
75		76
		77	@OptionsPanelController.Keywords(keywords={"php doc"}, location=UiUtils.OPTIONS_PATH, index=6)
76	public final class PhpDocOptionsPanel extends JPanel {	78	public final class PhpDocOptionsPanel extends JPanel {
77	private static final long serialVersionUID = 18784654654113L;	79	private static final long serialVersionUID = 18784654654113L;
78	private static final String PHPDOC_LAST_FOLDER_SUFFIX = ".phpdoc"; // NOI18N	80	private static final String PHPDOC_LAST_FOLDER_SUFFIX = ".phpdoc"; // NOI18N

Lines 65-75 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpAnnotationsPanel.java (+3 lines)
65	import javax.swing.event.ListSelectionListener;	65	import javax.swing.event.ListSelectionListener;
66	import javax.swing.table.AbstractTableModel;	66	import javax.swing.table.AbstractTableModel;
67	import org.netbeans.modules.php.api.util.StringUtils;	67	import org.netbeans.modules.php.api.util.StringUtils;
		68	import org.netbeans.modules.php.api.util.UiUtils;
68	import org.netbeans.modules.php.project.annotations.UserAnnotationPanel;	69	import org.netbeans.modules.php.project.annotations.UserAnnotationPanel;
69	import org.netbeans.modules.php.project.annotations.UserAnnotationTag;	70	import org.netbeans.modules.php.project.annotations.UserAnnotationTag;
		71	import org.netbeans.spi.options.OptionsPanelController;
70	import org.openide.awt.Mnemonics;	72	import org.openide.awt.Mnemonics;
71	import org.openide.util.NbBundle;	73	import org.openide.util.NbBundle;
72		74
		75	@OptionsPanelController.Keywords(keywords={"php anotations"}, location=UiUtils.OPTIONS_PATH, index=3)
73	public class PhpAnnotationsPanel extends JPanel {	76	public class PhpAnnotationsPanel extends JPanel {
74		77
75	private static final long serialVersionUID = 89732416546545L;	78	private static final long serialVersionUID = 89732416546545L;

Lines 68-75 Link Here

(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java (+3 lines)
68	import javax.swing.event.ChangeListener;	68	import javax.swing.event.ChangeListener;
69	import javax.swing.event.DocumentEvent;	69	import javax.swing.event.DocumentEvent;
70	import javax.swing.event.DocumentListener;	70	import javax.swing.event.DocumentListener;
		71	import org.netbeans.modules.php.api.util.UiUtils;
71	import org.netbeans.modules.php.smarty.SmartyFramework;	72	import org.netbeans.modules.php.smarty.SmartyFramework;
72	import org.netbeans.modules.php.smarty.SmartyFramework.ToggleCommentOption;	73	import org.netbeans.modules.php.smarty.SmartyFramework.ToggleCommentOption;
		74	import org.netbeans.spi.options.OptionsPanelController;
73	import org.openide.awt.HtmlBrowser;	75	import org.openide.awt.HtmlBrowser;
74	import org.openide.awt.Mnemonics;	76	import org.openide.awt.Mnemonics;
75	import org.openide.util.ChangeSupport;	77	import org.openide.util.ChangeSupport;
Lines 79-84 Link Here
79	/**	81	/**
80	* @author Martin Fousek	82	* @author Martin Fousek
81	*/	83	*/
		84	@OptionsPanelController.Keywords(keywords={"php smarty"}, location=UiUtils.OPTIONS_PATH, index=11)
82	public class SmartyOptionsPanel extends JPanel {	85	public class SmartyOptionsPanel extends JPanel {
83	private static final long serialVersionUID = -1384644114740L;	86	private static final long serialVersionUID = -1384644114740L;
84		87

Lines 68-73 Link Here

(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java (-1 / +3 lines)
68	import org.netbeans.modules.php.api.util.FileUtils;	68	import org.netbeans.modules.php.api.util.FileUtils;
69	import org.netbeans.modules.php.api.util.UiUtils;	69	import org.netbeans.modules.php.api.util.UiUtils;
70	import org.netbeans.modules.php.symfony.SymfonyScript;	70	import org.netbeans.modules.php.symfony.SymfonyScript;
		71	import org.netbeans.spi.options.OptionsPanelController;
71	import org.openide.awt.HtmlBrowser;	72	import org.openide.awt.HtmlBrowser;
72	import org.openide.awt.Mnemonics;	73	import org.openide.awt.Mnemonics;
73	import org.openide.filesystems.FileChooserBuilder;	74	import org.openide.filesystems.FileChooserBuilder;
Lines 79-84 Link Here
79	/**	80	/**
80	* @author Tomas Mysik	81	* @author Tomas Mysik
81	*/	82	*/
		83	@OptionsPanelController.Keywords(keywords={"php sympfony"}, location=UiUtils.OPTIONS_PATH, index=9)
82	public class SymfonyOptionsPanel extends JPanel {	84	public class SymfonyOptionsPanel extends JPanel {
83	private static final long serialVersionUID = -1384645646121L;	85	private static final long serialVersionUID = -1384645646121L;
84	private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";	86	private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";
Lines 302-308 Link Here
302		304
303	symfonyLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleName")); symfonyLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleDescription")); symfonyTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleName")); symfonyTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleDescription")); browseButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleName")); browseButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleDescription")); searchButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleName")); searchButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleDescription")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleName")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleDescription")); runningInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleName")); runningInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleDescription")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleName")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleDescription")); defaultParametersLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleName")); defaultParametersLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleName")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleName")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleDescription")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleName")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleDescription")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleName")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleDescription")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleName")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleDescription")); noteLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleName")); noteLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleDescription")); includePathInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleName")); includePathInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleDescription")); installationInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleName")); installationInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleDescription")); learnMoreLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleName")); learnMoreLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleDescription")); errorLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleName")); errorLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleDescription"));	305	symfonyLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleName")); symfonyLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleDescription")); symfonyTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleName")); symfonyTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleDescription")); browseButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleName")); browseButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleDescription")); searchButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleName")); searchButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleDescription")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleName")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleDescription")); runningInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleName")); runningInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleDescription")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleName")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleDescription")); defaultParametersLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleName")); defaultParametersLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleName")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleName")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleDescription")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleName")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleDescription")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleName")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleDescription")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleName")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleDescription")); noteLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleName")); noteLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleDescription")); includePathInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleName")); includePathInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleDescription")); installationInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleName")); installationInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleDescription")); learnMoreLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleName")); learnMoreLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleDescription")); errorLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleName")); errorLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleDescription"));
304	getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.AccessibleContext.accessibleDescription")); // NOI18N	306	getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.AccessibleContext.accessibleDescription")); // NOI18N
305	}// </editor-fold> //GEN-END:initComponents	307	}// </editor-fold>//GEN-END:initComponents
306		308
307	private void browseButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed	309	private void browseButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
308	File symfonyScript = new FileChooserBuilder(SymfonyOptionsPanel.class.getName() + SYMFONY_LAST_FOLDER_SUFFIX)	310	File symfonyScript = new FileChooserBuilder(SymfonyOptionsPanel.class.getName() + SYMFONY_LAST_FOLDER_SUFFIX)

Lines 64-73 Link Here

(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java (+3 lines)
64	import javax.swing.event.ChangeListener;	64	import javax.swing.event.ChangeListener;
65	import javax.swing.event.DocumentEvent;	65	import javax.swing.event.DocumentEvent;
66	import javax.swing.event.DocumentListener;	66	import javax.swing.event.DocumentListener;
		67	import org.netbeans.api.options.OptionsDisplayer;
67	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;	68	import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
68	import org.netbeans.modules.php.api.util.FileUtils;	69	import org.netbeans.modules.php.api.util.FileUtils;
69	import org.netbeans.modules.php.api.util.UiUtils;	70	import org.netbeans.modules.php.api.util.UiUtils;
70	import org.netbeans.modules.php.zend.ZendScript;	71	import org.netbeans.modules.php.zend.ZendScript;
		72	import org.netbeans.spi.options.OptionsPanelController;
71	import org.openide.DialogDisplayer;	73	import org.openide.DialogDisplayer;
72	import org.openide.NotifyDescriptor;	74	import org.openide.NotifyDescriptor;
73	import org.openide.awt.HtmlBrowser;	75	import org.openide.awt.HtmlBrowser;
Lines 82-87 Link Here
82	/**	84	/**
83	* @author Tomas Mysik	85	* @author Tomas Mysik
84	*/	86	*/
		87	@OptionsPanelController.Keywords(keywords={"php zend"}, location=UiUtils.OPTIONS_PATH, index=10)
85	public final class ZendOptionsPanel extends JPanel {	88	public final class ZendOptionsPanel extends JPanel {
86	private static final long serialVersionUID = -13564875423210L;	89	private static final long serialVersionUID = -13564875423210L;
87	private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";	90	private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";