Attachment #124884 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 47-57 Link Here

(-)a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java (+3 lines)
47	import java.awt.CardLayout;	47	import java.awt.CardLayout;
48	import javax.swing.DefaultListModel;	48	import javax.swing.DefaultListModel;
49	import javax.swing.JComponent;	49	import javax.swing.JComponent;
		50	import org.netbeans.api.options.OptionsDisplayer;
		51	import org.netbeans.spi.options.OptionsPanelController;
50		52
51	/**	53	/**
52	*	54	*
53	* @author Tomas Stupka	55	* @author Tomas Stupka
54	*/	56	*/
		57	@OptionsPanelController.Keywords(keywords={"issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_IssueTracking")
55	class BugtrackingOptionsPanel extends javax.swing.JPanel {	58	class BugtrackingOptionsPanel extends javax.swing.JPanel {
56		59
57	/** Creates new form VcsAdvancedOptionsPanel */	60	/** Creates new form VcsAdvancedOptionsPanel */

Lines 46-57 Link Here

(-)a/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java (+3 lines)
46	import java.awt.Color;	46	import java.awt.Color;
47	import java.awt.Image;	47	import java.awt.Image;
48	import javax.swing.ImageIcon;	48	import javax.swing.ImageIcon;
		49	import org.netbeans.api.options.OptionsDisplayer;
		50	import org.netbeans.spi.options.OptionsPanelController;
49	import org.openide.util.ImageUtilities;	51	import org.openide.util.ImageUtilities;
50		52
51	/**	53	/**
52	*	54	*
53	* @author Tomas Stupka	55	* @author Tomas Stupka
54	*/	56	*/
		57	@OptionsPanelController.Keywords(keywords={"bugzilla", "issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="Issue Tracking")
55	public class BugzillaOptionsPanel extends javax.swing.JPanel {	58	public class BugzillaOptionsPanel extends javax.swing.JPanel {
56		59
57	/** Creates new form SvnOptionsPanel */	60	/** Creates new form SvnOptionsPanel */




import java.io.IOException;
import javax.swing.Action;
import javax.swing.JComboBox;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.core.output2.Controller;
import org.netbeans.core.output2.NbIOProvider;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.awt.ColorComboBox;

@NbBundle.Messages({
    "LBL_Description=Output Window Settings"
})
@OptionsPanelController.Keywords(keywords={"Output Window Font Color"}, location=OptionsDisplayer.ADVANCED, tabTitle="Output")
public final class OutputSettingsPanel extends javax.swing.JPanel {

    private OutputOptions outputOptions;




import java.util.prefs.Preferences;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.core.ui.options.filetypes.FileAssociationsModel.MimeItem;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.util.NbBundle;

 *
 * @author Jiri Skrivanek
 */
@OptionsPanelController.Keywords(keywords={"#KW_FilesOptions"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption.displayName")
final class FileAssociationsPanel extends javax.swing.JPanel {

    private final FileAssociationsOptionsPanelController controller;

Lines 45-50 Link Here

(-)a/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java (+2 lines)
45		45
46	import javax.swing.event.DocumentEvent;	46	import javax.swing.event.DocumentEvent;
47	import javax.swing.event.DocumentListener;	47	import javax.swing.event.DocumentListener;
		48	import org.netbeans.spi.options.OptionsPanelController;
48	import org.openide.DialogDescriptor;	49	import org.openide.DialogDescriptor;
49	import org.openide.NotificationLineSupport;	50	import org.openide.NotificationLineSupport;
50		51
Lines 52-57 Link Here
52	*	53	*
53	* @author Jiri Rechtacek	54	* @author Jiri Rechtacek
54	*/	55	*/
		56	@OptionsPanelController.Keywords(keywords={"advanced proxy"}, location="#CTL_General_Options_Category")
55	public class AdvancedProxyPanel extends javax.swing.JPanel {	57	public class AdvancedProxyPanel extends javax.swing.JPanel {
56	private GeneralOptionsModel options;	58	private GeneralOptionsModel options;
57	private String oldHttpsHost;	59	private String oldHttpsHost;

Lines 75-80 Link Here

(-)a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java (+1 lines)
75	*	75	*
76	* @author Jan Jancura	76	* @author Jan Jancura
77	*/	77	*/
		78	@OptionsPanelController.Keywords(keywords={"#KW_General"}, location="#CTL_General_Options_Category")
78	public class GeneralOptionsPanel extends JPanel implements ActionListener {	79	public class GeneralOptionsPanel extends JPanel implements ActionListener {
79		80
80	private boolean changed = false;	81	private boolean changed = false;




import javax.swing.event.ListSelectionListener;
import javax.swing.text.Document;
import org.netbeans.core.ui.options.general.WebBrowsersOptionsModel.PropertyPanelDesc;
import org.netbeans.spi.options.OptionsPanelController;

/**
 * Panel for customization of web browser preffered property
 * 
 * @author Milan Kubec
 */
@OptionsPanelController.Keywords(keywords={"web browser"}, location="#CTL_General_Options_Category")
public class WebBrowsersOptionsPanel extends JPanel implements ListSelectionListener {
    
    private WebBrowsersOptionsModel browsersModel;




import java.util.prefs.Preferences;
import javax.swing.JTabbedPane;
import javax.swing.UIManager;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.core.windows.FloatingWindowTransparencyManager;
import org.netbeans.core.windows.nativeaccess.NativeWindowSystem;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
import org.openide.util.NbPreferences;
import org.openide.util.Utilities;

@OptionsPanelController.Keywords(keywords={"#AdvancedOption_DisplayName_WinSys"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName_WinSys")
final class WinSysPanel extends javax.swing.JPanel {

    private final WinSysOptionsPanelController controller;

Lines 43-51 Link Here

(-)a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java (+3 lines)
43	package org.netbeans.modules.debugger.jpda.ui.options;	43	package org.netbeans.modules.debugger.jpda.ui.options;
44		44
45	import java.util.Collection;	45	import java.util.Collection;
		46	import org.netbeans.modules.options.java.api.JavaOptions;
		47	import org.netbeans.spi.options.OptionsPanelController;
46	import org.openide.util.NbBundle;	48	import org.openide.util.NbBundle;
47	import org.openide.util.lookup.Lookups;	49	import org.openide.util.lookup.Lookups;
48		50
		51	@OptionsPanelController.Keywords(keywords={"java debugger"}, location=JavaOptions.JAVA, index=3)
49	final class JavaDebuggerPanel extends StorablePanel {	52	final class JavaDebuggerPanel extends StorablePanel {
50		53
51	private static final String SHOW_FORMATTERS_PROP_NAME = "org.netbeans.modules.debugger.jpda.ui.options.SHOW_FORMATTERS";	54	private static final String SHOW_FORMATTERS_PROP_NAME = "org.netbeans.modules.debugger.jpda.ui.options.SHOW_FORMATTERS";

Lines 62-67 Link Here

(-)a/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java (+3 lines)
62	import java.beans.PropertyChangeListener;	62	import java.beans.PropertyChangeListener;
63	import java.beans.PropertyChangeEvent;	63	import java.beans.PropertyChangeEvent;
64	import java.util.*;	64	import java.util.*;
		65	import org.netbeans.api.options.OptionsDisplayer;
		66	import org.netbeans.spi.options.OptionsPanelController;
65		67
66	/**	68	/**
67	* Copied from org.netbeans.modules.options.colors.HighlightingPanel	69	* Copied from org.netbeans.modules.options.colors.HighlightingPanel
Lines 69-74 Link Here
69	* copied from editor/options.	71	* copied from editor/options.
70	* @author Maros Sandor	72	* @author Maros Sandor
71	*/	73	*/
		74	@OptionsPanelController.Keywords(keywords={"diff", "colors"}, location="FontsAndColors", index=3)
72	public class DiffColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {	75	public class DiffColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
73		76
74	private static final String ATTR_NAME_ADDED = "added";	77	private static final String ATTR_NAME_ADDED = "added";

Lines 53-64 Link Here

(-)a/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java (+3 lines)
53	import javax.swing.event.DocumentEvent;	53	import javax.swing.event.DocumentEvent;
54	import javax.swing.*;	54	import javax.swing.*;
55	import java.io.File;	55	import java.io.File;
		56	import org.netbeans.api.options.OptionsDisplayer;
		57	import org.netbeans.spi.options.OptionsPanelController;
56		58
57	/**	59	/**
58	* Diff Options panel.	60	* Diff Options panel.
59	*	61	*
60	* @author Maros Sandor	62	* @author Maros Sandor
61	*/	63	*/
		64	@OptionsPanelController.Keywords(keywords={"diff"}, location=OptionsDisplayer.ADVANCED, tabTitle="Diff")
62	class DiffOptionsPanel extends javax.swing.JPanel implements ChangeListener, DocumentListener {	65	class DiffOptionsPanel extends javax.swing.JPanel implements ChangeListener, DocumentListener {
63		66
64	private boolean isChanged;	67	private boolean isChanged;

Lines 93-98 Link Here

(-)a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java (+1 lines)
93	*	93	*
94	* @author Jan Jancura	94	* @author Jan Jancura
95	*/	95	*/
		96	@OptionsPanelController.Keywords(keywords = {"code", "templates"}, location = "Editor", index = 3)
96	public class CodeTemplatesPanel extends JPanel implements ActionListener, ListSelectionListener, KeyListener, DocumentListener {	97	public class CodeTemplatesPanel extends JPanel implements ActionListener, ListSelectionListener, KeyListener, DocumentListener {
97		98
98	private static final Logger LOG = Logger.getLogger(CodeTemplatesPanel.class.getName());	99	private static final Logger LOG = Logger.getLogger(CodeTemplatesPanel.class.getName());

Lines 71-76 Link Here

(-)a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java (+2 lines)
71	import org.netbeans.core.options.keymap.api.ShortcutAction;	71	import org.netbeans.core.options.keymap.api.ShortcutAction;
72	import org.netbeans.core.options.keymap.api.ShortcutsFinder;	72	import org.netbeans.core.options.keymap.api.ShortcutsFinder;
73	import org.netbeans.modules.editor.macros.storage.ui.MacrosModel.Macro;	73	import org.netbeans.modules.editor.macros.storage.ui.MacrosModel.Macro;
		74	import org.netbeans.spi.options.OptionsPanelController;
74	import org.openide.DialogDescriptor;	75	import org.openide.DialogDescriptor;
75	import org.openide.DialogDisplayer;	76	import org.openide.DialogDisplayer;
76	import org.openide.awt.Mnemonics;	77	import org.openide.awt.Mnemonics;
Lines 82-87 Link Here
82	*	83	*
83	* @author Jan Jancura	84	* @author Jan Jancura
84	*/	85	*/
		86	@OptionsPanelController.Keywords(keywords = {"macros"}, location = "Editor", index = 6)
85	public class MacrosPanel extends JPanel {	87	public class MacrosPanel extends JPanel {
86		88
87	private final MacrosModel model = MacrosModel.get();	89	private final MacrosModel model = MacrosModel.get();

Lines 59-64 Link Here

(-)a/form/src/org/netbeans/modules/form/FormEditorCustomizer.java (+2 lines)
59	import javax.swing.*;	59	import javax.swing.*;
60	import javax.swing.event.ChangeEvent;	60	import javax.swing.event.ChangeEvent;
61	import javax.swing.event.ChangeListener;	61	import javax.swing.event.ChangeListener;
		62	import org.netbeans.spi.options.OptionsPanelController;
62	import org.openide.awt.Mnemonics;	63	import org.openide.awt.Mnemonics;
63	import org.openide.explorer.propertysheet.PropertyPanel;	64	import org.openide.explorer.propertysheet.PropertyPanel;
64	import org.openide.nodes.PropertySupport;	65	import org.openide.nodes.PropertySupport;
Lines 70-75 Link Here
70	*	71	*
71	* @author Jan Stola, Jan Jancura	72	* @author Jan Stola, Jan Jancura
72	*/	73	*/
		74	@OptionsPanelController.Keywords(keywords={"gui builder"}, location="Java", index=1)
73	public final class FormEditorCustomizer extends JPanel implements ActionListener, ChangeListener {	75	public final class FormEditorCustomizer extends JPanel implements ActionListener, ChangeListener {
74	private JCheckBox cbFold = new JCheckBox ();	76	private JCheckBox cbFold = new JCheckBox ();
75	private JCheckBox cbAssistant = new JCheckBox();	77	private JCheckBox cbAssistant = new JCheckBox();




import javax.swing.JLabel;
import javax.swing.SwingUtilities;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.groovy.support.api.GroovySettings;
import org.netbeans.modules.groovy.support.spi.GroovyOptionsSubpanel;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.awt.HtmlBrowser;

 *
 * @author Martin Adamek
 */
@OptionsPanelController.Keywords(keywords={"groovy", "grails"}, location=OptionsDisplayer.ADVANCED, tabTitle="Groovy")
final class SupportPanel extends javax.swing.JPanel {

    private final Collection<GroovyOptionsSubpanel> subpanels;

Lines 49-58 Link Here

(-)a/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java (+3 lines)
49	import javax.swing.JFileChooser;	49	import javax.swing.JFileChooser;
50	import org.netbeans.modules.javafx2.scenebuilder.Home;	50	import org.netbeans.modules.javafx2.scenebuilder.Home;
51	import org.netbeans.modules.javafx2.scenebuilder.impl.SBHomeFactory;	51	import org.netbeans.modules.javafx2.scenebuilder.impl.SBHomeFactory;
		52	import org.netbeans.modules.options.java.api.JavaOptions;
		53	import org.netbeans.spi.options.OptionsPanelController;
52	import org.openide.DialogDisplayer;	54	import org.openide.DialogDisplayer;
53	import org.openide.NotifyDescriptor;	55	import org.openide.NotifyDescriptor;
54	import org.openide.util.NbBundle;	56	import org.openide.util.NbBundle;
55		57
		58	@OptionsPanelController.Keywords(keywords={"javafx"}, location=JavaOptions.JAVA, index=7)
56	final class SBOptionsPanel extends javax.swing.JPanel {	59	final class SBOptionsPanel extends javax.swing.JPanel {
57	private final SBOptionsPanelController controller;	60	private final SBOptionsPanelController controller;
58		61




import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import org.mozilla.nb.javascript.Context;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.javascript.editing.BrowserVersion;
import org.netbeans.modules.javascript.editing.SupportedBrowsers;
import org.netbeans.modules.javascript.editing.spi.JSPreferencesPanel;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;

/**
 *
 * @author  Tor Norbye
 */
@OptionsPanelController.Keywords(keywords={"javascript"}, location=OptionsDisplayer.ADVANCED, tabTitle="#JsOptions.displayName")
public class BrowserPanel extends JSPreferencesPanel {



Lines 46-56 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java (+3 lines)
46	import javax.swing.DefaultListModel;	46	import javax.swing.DefaultListModel;
47	import javax.swing.event.ListSelectionEvent;	47	import javax.swing.event.ListSelectionEvent;
48	import javax.swing.event.ListSelectionListener;	48	import javax.swing.event.ListSelectionListener;
		49	import org.netbeans.modules.options.java.api.JavaOptions;
		50	import org.netbeans.spi.options.OptionsPanelController;
49		51
50	/**	52	/**
51	*	53	*
52	* @author mkleint	54	* @author mkleint
53	*/	55	*/
		56	@OptionsPanelController.Keywords(keywords={"maven global"}, location=JavaOptions.JAVA, index=5)
54	public class GlobalOptionsPanel extends javax.swing.JPanel {	57	public class GlobalOptionsPanel extends javax.swing.JPanel {
55	private HashMap<String, String> descMap;	58	private HashMap<String, String> descMap;
56		59

Lines 78-83 Link Here

(-)a/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java (+3 lines)
78	import org.openide.util.NbBundle;	78	import org.openide.util.NbBundle;
79	import org.openide.util.RequestProcessor;	79	import org.openide.util.RequestProcessor;
80	import static org.netbeans.modules.maven.options.Bundle.*;	80	import static org.netbeans.modules.maven.options.Bundle.*;
		81	import org.netbeans.modules.options.java.api.JavaOptions;
		82	import org.netbeans.spi.options.OptionsPanelController;
81	import org.openide.util.NbBundle.Messages;	83	import org.openide.util.NbBundle.Messages;
82		84
83	/**	85	/**
Lines 85-90 Link Here
85	* are written to the settings file, some into the Netbeans settings..	87	* are written to the settings file, some into the Netbeans settings..
86	* @author mkleint	88	* @author mkleint
87	*/	89	*/
		90	@OptionsPanelController.Keywords(keywords={"maven"}, location=JavaOptions.JAVA, index=5)
88	public class SettingsPanel extends javax.swing.JPanel {	91	public class SettingsPanel extends javax.swing.JPanel {
89	private static final String SEPARATOR = "SEPARATOR";	92	private static final String SEPARATOR = "SEPARATOR";
90	private static final String BUNDLED_RUNTIME_VERSION =	93	private static final String BUNDLED_RUNTIME_VERSION =




import javax.swing.DefaultComboBoxModel;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.mobility.svgcore.api.snippets.SVGSnippetsProvider;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

@OptionsPanelController.Keywords(keywords={"#AdvancedOption_Tooltip", "svg"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName")
final class SvgcorePanel extends javax.swing.JPanel {

    private final SvgcoreOptionsPanelController controller;

Lines 72-77 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java (+2 lines)
72	import javax.swing.text.StyleConstants;	72	import javax.swing.text.StyleConstants;
73	import org.netbeans.api.editor.settings.EditorStyleConstants;	73	import org.netbeans.api.editor.settings.EditorStyleConstants;
74	import org.netbeans.modules.options.colors.spi.FontsColorsController;	74	import org.netbeans.modules.options.colors.spi.FontsColorsController;
		75	import org.netbeans.spi.options.OptionsPanelController;
75	import org.openide.awt.ColorComboBox;	76	import org.openide.awt.ColorComboBox;
76	import org.openide.awt.Mnemonics;	77	import org.openide.awt.Mnemonics;
77	import org.openide.util.NbBundle;	78	import org.openide.util.NbBundle;
Lines 80-85 Link Here
80	*	81	*
81	* @author Jan Jancura	82	* @author Jan Jancura
82	*/	83	*/
		84	@OptionsPanelController.Keywords(keywords = {"annotation stuff", "xaxaxa333"}, location = "FontsAndColors", index = 2)
83	public class AnnotationsPanel extends JPanel implements ActionListener,	85	public class AnnotationsPanel extends JPanel implements ActionListener,
84	ItemListener, FontsColorsController {	86	ItemListener, FontsColorsController {
85		87

Lines 54-59 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/Bundle.properties (+4 lines)
54	Syntax_coloring_tab=&Syntax	54	Syntax_coloring_tab=&Syntax
55	Annotations_tab=A&nnotations	55	Annotations_tab=A&nnotations
56		56
		57	KW_1=syntax stuff
		58	KW_2=xaxaxa000
		59	KW_3=xaxaxa222
		60
57	CTL_Create_New_Profile_Message=Profile &Name:	61	CTL_Create_New_Profile_Message=Profile &Name:
58	CTL_Create_New_Profile_Title=Create New Profile Dialog	62	CTL_Create_New_Profile_Title=Create New Profile Dialog
59	CTL_Duplicate_Profile_Name=Profile with such name already exists.\n Choose different name, please.	63	CTL_Duplicate_Profile_Name=Profile with such name already exists.\n Choose different name, please.

Lines 57-62 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java (+2 lines)
57	import javax.swing.JLabel;	57	import javax.swing.JLabel;
58	import javax.swing.JPanel;	58	import javax.swing.JPanel;
59	import javax.swing.border.EmptyBorder;	59	import javax.swing.border.EmptyBorder;
		60	import org.netbeans.spi.options.OptionsPanelController;
60	import org.openide.DialogDisplayer;	61	import org.openide.DialogDisplayer;
61	import org.openide.NotifyDescriptor;	62	import org.openide.NotifyDescriptor;
62	import org.openide.NotifyDescriptor.InputLine;	63	import org.openide.NotifyDescriptor.InputLine;
Lines 68-73 Link Here
68	*	69	*
69	* @author Jan Jancura	70	* @author Jan Jancura
70	*/	71	*/
		72	@OptionsPanelController.Keywords(keywords = {"F&C", "#KW_2"}, location = "FontsAndColors", index = 0)
71	public class FontAndColorsPanel extends JPanel implements ActionListener {	73	public class FontAndColorsPanel extends JPanel implements ActionListener {
72		74
73	private final Collection<? extends FontsColorsController> panels;	75	private final Collection<? extends FontsColorsController> panels;

Lines 71-76 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java (+2 lines)
71	import javax.swing.text.SimpleAttributeSet;	71	import javax.swing.text.SimpleAttributeSet;
72	import javax.swing.text.StyleConstants;	72	import javax.swing.text.StyleConstants;
73	import org.netbeans.modules.options.colors.spi.FontsColorsController;	73	import org.netbeans.modules.options.colors.spi.FontsColorsController;
		74	import org.netbeans.spi.options.OptionsPanelController;
74	import org.openide.awt.ColorComboBox;	75	import org.openide.awt.ColorComboBox;
75	import org.openide.awt.Mnemonics;	76	import org.openide.awt.Mnemonics;
76	import org.openide.util.NbBundle;	77	import org.openide.util.NbBundle;
Lines 79-84 Link Here
79	*	80	*
80	* @author Jan Jancura	81	* @author Jan Jancura
81	*/	82	*/
		83	@OptionsPanelController.Keywords(keywords={"highlighting stuff", "#KW_3"}, location="FontsAndColors", index=1)
82	public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {	84	public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
83		85
84	private ColorModel colorModel = null;	86	private ColorModel colorModel = null;

Lines 85-90 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java (+2 lines)
85	import org.netbeans.api.editor.settings.FontColorSettings;	85	import org.netbeans.api.editor.settings.FontColorSettings;
86	import org.netbeans.modules.options.colors.ColorModel.Preview;	86	import org.netbeans.modules.options.colors.ColorModel.Preview;
87	import org.netbeans.modules.options.colors.spi.FontsColorsController;	87	import org.netbeans.modules.options.colors.spi.FontsColorsController;
		88	import org.netbeans.spi.options.OptionsPanelController;
88	import org.openide.DialogDescriptor;	89	import org.openide.DialogDescriptor;
89	import org.openide.DialogDisplayer;	90	import org.openide.DialogDisplayer;
90	import org.openide.awt.ColorComboBox;	91	import org.openide.awt.ColorComboBox;
Lines 97-102 Link Here
97	*	98	*
98	* @author Jan Jancura	99	* @author Jan Jancura
99	*/	100	*/
		101	@OptionsPanelController.Keywords(keywords={"#KW_1", "xaxaxa"}, location="FontsAndColors", index=0)
100	public class SyntaxColoringPanel extends JPanel implements ActionListener,	102	public class SyntaxColoringPanel extends JPanel implements ActionListener,
101	PropertyChangeListener, FontsColorsController, ItemListener {	103	PropertyChangeListener, FontsColorsController, ItemListener {
102		104

Lines 63-68 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java (+4 lines)
63	*	63	*
64	* @author Dusan Balek	64	* @author Dusan Balek
65	*/	65	*/
		66	@OptionsPanelController.KeywordsRegistration({
		67	@OptionsPanelController.Keywords(keywords = {"asas", "xaxaxa444"}, location = "#CTL_Editor_Title", index = 4),
		68	@OptionsPanelController.Keywords(keywords = {"MarkOccurrences stuff", "xaxaxa555"}, location = "#CTL_Editor_Title", index = 5)
		69	})
66	public final class FolderBasedOptionPanel extends JPanel implements ActionListener {	70	public final class FolderBasedOptionPanel extends JPanel implements ActionListener {
67		71
68	private final FolderBasedController controller;	72	private final FolderBasedController controller;




import javax.swing.JPanel;
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.WeakListeners;

/**
 * @author Dusan Balek
 */
@OptionsPanelController.Keywords(keywords = {"code", "completion"}, location = "Editor", index = 2)
public class CodeCompletionOptionsPanel extends JPanel implements PropertyChangeListener {
    
    private CodeCompletionOptionsSelector selector;




import java.util.prefs.Preferences;
import javax.swing.JPanel;
import org.netbeans.api.editor.settings.SimpleValueNames;
import org.netbeans.spi.options.OptionsPanelController;

/**
 *
 * @author Dusan Balek
 */
@OptionsPanelController.Keywords(keywords = {"all languages"}, location = "Editor", index = 2)
public class GeneralCompletionOptionsPanel extends JPanel {

    private Preferences preferences;

Lines 49-54 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java (+2 lines)
49	import javax.swing.JList;	49	import javax.swing.JList;
50	import javax.swing.ListCellRenderer;	50	import javax.swing.ListCellRenderer;
51	import org.netbeans.api.editor.settings.SimpleValueNames;	51	import org.netbeans.api.editor.settings.SimpleValueNames;
		52	import org.netbeans.spi.options.OptionsPanelController;
52	import org.openide.awt.Mnemonics;	53	import org.openide.awt.Mnemonics;
53	import org.openide.util.NbBundle;	54	import org.openide.util.NbBundle;
54		55
Lines 57-62 Link Here
57	*	58	*
58	* @author Miloslav Metelka	59	* @author Miloslav Metelka
59	*/	60	*/
		61	@OptionsPanelController.Keywords(keywords = {"all languages"}, location = "Editor", index = 7)
60	public class OnSaveCommonPanel extends javax.swing.JPanel {	62	public class OnSaveCommonPanel extends javax.swing.JPanel {
61		63
62	private static final String[] LINE_OPTIONS = new String[] { "never", "always", "modified-lines" }; // NOI18N	64	private static final String[] LINE_OPTIONS = new String[] { "never", "always", "modified-lines" }; // NOI18N

Lines 51-56 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java (+2 lines)
51	import javax.swing.JList;	51	import javax.swing.JList;
52	import javax.swing.JPanel;	52	import javax.swing.JPanel;
53	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	53	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
		54	import org.netbeans.spi.options.OptionsPanelController;
54	import org.openide.util.WeakListeners;	55	import org.openide.util.WeakListeners;
55		56
56	/**	57	/**
Lines 58-63 Link Here
58	*	59	*
59	* @author Miloslav Metelka	60	* @author Miloslav Metelka
60	*/	61	*/
		62	@OptionsPanelController.Keywords(keywords = {"onsave", "on save"}, location = "Editor", index = 7)
61	public class OnSaveTabPanel extends JPanel implements PropertyChangeListener {	63	public class OnSaveTabPanel extends JPanel implements PropertyChangeListener {
62		64
63	private OnSaveCommonPanel commonPanel;	65	private OnSaveCommonPanel commonPanel;

Lines 53-58 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java (+8 lines)
53	import javax.swing.JList;	53	import javax.swing.JList;
54	import javax.swing.JPanel;	54	import javax.swing.JPanel;
55	import javax.swing.ListCellRenderer;	55	import javax.swing.ListCellRenderer;
		56	import org.netbeans.spi.options.OptionsPanelController;
56	import org.openide.awt.Mnemonics;	57	import org.openide.awt.Mnemonics;
57	import org.openide.util.NbBundle;	58	import org.openide.util.NbBundle;
58		59
Lines 61-66 Link Here
61	*	62	*
62	* @author Jan Jancura	63	* @author Jan Jancura
63	*/	64	*/
		65	@OptionsPanelController.Keywords(keywords={"general editor stuff", "kai", "#key2", "#key4"}, location="Editor", index=0)
		66	@NbBundle.Messages({"key=value",
		67	"key1=value1",
		68	"# {0} - test stuff",
		69	"key2=value2 {0}",
		70	"key3=value3",
		71	"key4=value4"})
64	public class GeneralEditorPanel extends JPanel implements ActionListener {	72	public class GeneralEditorPanel extends JPanel implements ActionListener {
65		73
66	private boolean changed = false;	74	private boolean changed = false;

Lines 68-73 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java (+2 lines)
68	import org.netbeans.modules.editor.settings.storage.api.EditorSettings;	68	import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
69	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	69	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
70	import org.netbeans.modules.options.editor.spi.PreviewProvider;	70	import org.netbeans.modules.options.editor.spi.PreviewProvider;
		71	import org.netbeans.spi.options.OptionsPanelController;
71	import org.openide.util.NbBundle;	72	import org.openide.util.NbBundle;
72	import org.openide.util.WeakListeners;	73	import org.openide.util.WeakListeners;
73		74
Lines 75-80 Link Here
75	*	76	*
76	* @author Dusan Balek	77	* @author Dusan Balek
77	*/	78	*/
		79	@OptionsPanelController.Keywords(keywords={"formatting", "general", "stuff"}, location="Editor", index=1)
78	public final class FormattingPanel extends JPanel implements PropertyChangeListener {	80	public final class FormattingPanel extends JPanel implements PropertyChangeListener {
79		81
80	/** Creates new form FormattingPanel */	82	/** Creates new form FormattingPanel */

Lines 83-88 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java (+2 lines)
83	import org.netbeans.modules.editor.indent.api.IndentUtils;	83	import org.netbeans.modules.editor.indent.api.IndentUtils;
84	import org.netbeans.modules.editor.indent.api.Reformat;	84	import org.netbeans.modules.editor.indent.api.Reformat;
85	import org.netbeans.modules.options.editor.spi.PreviewProvider;	85	import org.netbeans.modules.options.editor.spi.PreviewProvider;
		86	import org.netbeans.spi.options.OptionsPanelController;
86	import org.openide.awt.Mnemonics;	87	import org.openide.awt.Mnemonics;
87	import org.openide.filesystems.FileObject;	88	import org.openide.filesystems.FileObject;
88	import org.openide.text.CloneableEditorSupport;	89	import org.openide.text.CloneableEditorSupport;
Lines 96-101 Link Here
96	*	97	*
97	* @author Jan Jancura	98	* @author Jan Jancura
98	*/	99	*/
		100	@OptionsPanelController.Keywords(keywords={"indentation", "extra", "stuff"}, location="Editor", index=1)
99	public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {	101	public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {
100		102
101	private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());	103	private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());




import javax.swing.event.TableModelEvent;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.core.options.keymap.api.ShortcutAction;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.util.NbBundle;

 *
 * @author Max Sauer
 */
@OptionsPanelController.Keywords(keywords={"keymaps"}, location="#Keymaps.Options.Export.Category.displayName")
public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {

    // Delay times for incremental search [ms]




import java.util.ArrayList;
import java.util.Iterator;
import javax.swing.*;
import org.netbeans.modules.options.java.api.JavaOptions;
import org.netbeans.modules.profiler.api.JavaPlatform;
import org.netbeans.spi.options.OptionsPanelController;


/**

    "ProfilerOptionsPanel_JavaPlatformComboAccessDescr=Java platform used for running the profiled application",
    "ProfilerOptionsPanel_IfThreadsMonitoringEnabledHint=if threads monitoring is enabled"
})
@OptionsPanelController.Keywords(keywords={"profiler"}, location=JavaOptions.JAVA, index=6)
public final class ProfilerOptionsPanel extends JPanel implements ActionListener {
    //~ Inner Classes ------------------------------------------------------------------------------------------------------------


Lines 63-68 Link Here

(-)a/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java (+2 lines)
63	import javax.swing.event.DocumentEvent;	63	import javax.swing.event.DocumentEvent;
64	import javax.swing.event.DocumentListener;	64	import javax.swing.event.DocumentListener;
65	import org.netbeans.modules.spellchecker.Utilities;	65	import org.netbeans.modules.spellchecker.Utilities;
		66	import org.netbeans.spi.options.OptionsPanelController;
66	import org.openide.DialogDisplayer;	67	import org.openide.DialogDisplayer;
67	import org.openide.NotificationLineSupport;	68	import org.openide.NotificationLineSupport;
68	import org.openide.NotifyDescriptor;	69	import org.openide.NotifyDescriptor;
Lines 74-79 Link Here
74	/**	75	/**
75	* @author David Kaspar	76	* @author David Kaspar
76	*/	77	*/
		78	@OptionsPanelController.Keywords(keywords = {"install", "dictionary"}, location = "Editor", index = 8)
77	public class DictionaryInstallerPanel extends javax.swing.JPanel {	79	public class DictionaryInstallerPanel extends javax.swing.JPanel {
78	private final JButton okButton;	80	private final JButton okButton;
79		81

Lines 87-92 Link Here

(-)a/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java (+2 lines)
87	import org.netbeans.modules.spellchecker.DictionaryProviderImpl;	87	import org.netbeans.modules.spellchecker.DictionaryProviderImpl;
88	import org.netbeans.modules.spellchecker.options.DictionaryInstallerPanel.DictionaryDescription;	88	import org.netbeans.modules.spellchecker.options.DictionaryInstallerPanel.DictionaryDescription;
89	import org.netbeans.modules.spellchecker.spi.dictionary.DictionaryProvider;	89	import org.netbeans.modules.spellchecker.spi.dictionary.DictionaryProvider;
		90	import org.netbeans.spi.options.OptionsPanelController;
90	import org.openide.DialogDescriptor;	91	import org.openide.DialogDescriptor;
91	import org.openide.DialogDisplayer;	92	import org.openide.DialogDisplayer;
92	import org.openide.filesystems.FileObject;	93	import org.openide.filesystems.FileObject;
Lines 102-107 Link Here
102	*	103	*
103	* @author Jan Lahoda	104	* @author Jan Lahoda
104	*/	105	*/
		106	@OptionsPanelController.Keywords(keywords = {"spellchecker"}, location = "Editor", index = 8)
105	public class SpellcheckerOptionsPanel extends javax.swing.JPanel {	107	public class SpellcheckerOptionsPanel extends javax.swing.JPanel {
106		108
107	private List<Locale> removedDictionaries = new ArrayList<Locale>();	109	private List<Locale> removedDictionaries = new ArrayList<Locale>();

Lines 57-62 Link Here

(-)a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java (+2 lines)
57	import javax.swing.table.DefaultTableModel;	57	import javax.swing.table.DefaultTableModel;
58	import javax.swing.table.TableCellEditor;	58	import javax.swing.table.TableCellEditor;
59	import javax.swing.text.JTextComponent;	59	import javax.swing.text.JTextComponent;
		60	import org.netbeans.api.options.OptionsDisplayer;
60	import org.netbeans.spi.options.OptionsPanelController;	61	import org.netbeans.spi.options.OptionsPanelController;
61	import org.openide.util.NbBundle;	62	import org.openide.util.NbBundle;
62		63
Lines 64-69 Link Here
64	*	65	*
65	* @author S. Aubrecht	66	* @author S. Aubrecht
66	*/	67	*/
		68	@OptionsPanelController.Keywords(keywords={"#KW_ToDo", "action", "items"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_Options")
67	class ToDoCustomizer extends javax.swing.JPanel {	69	class ToDoCustomizer extends javax.swing.JPanel {
68		70
69	private boolean changed = false;	71	private boolean changed = false;

Lines 46-51 Link Here

(-)a/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java (+2 lines)
46	import java.util.prefs.Preferences;	46	import java.util.prefs.Preferences;
47	import java.beans.PropertyChangeListener;	47	import java.beans.PropertyChangeListener;
48	import javax.swing.JComponent;	48	import javax.swing.JComponent;
		49	import org.netbeans.api.options.OptionsDisplayer;
49		50
50	import org.openide.util.HelpCtx;	51	import org.openide.util.HelpCtx;
51	import org.openide.util.Lookup;	52	import org.openide.util.Lookup;
Lines 67-72 Link Here
67	keywordsCategory="Advanced/TermAdvancedOption"// NOI18N	68	keywordsCategory="Advanced/TermAdvancedOption"// NOI18N
68	//tooltip="#CTL_Term_options" // NOI18N	69	//tooltip="#CTL_Term_options" // NOI18N
69	)	70	)
		71	@OptionsPanelController.Keywords(keywords={"terminal"}, location=OptionsDisplayer.ADVANCED, tabTitle="#CTL_Term_options")
70	public final class TermAdvancedOption extends OptionsPanelController {	72	public final class TermAdvancedOption extends OptionsPanelController {
71	private TermOptions termOptions;	73	private TermOptions termOptions;
72	private TermOptions clonedTermOptions;	74	private TermOptions clonedTermOptions;




import javax.swing.DefaultListCellRenderer;
import javax.swing.DefaultListModel;
import javax.swing.JList;
import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;
import org.netbeans.modules.versioning.core.api.VCSFileProxy;
import org.netbeans.modules.versioning.core.util.Utils;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.filesystems.FileChooserBuilder;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;

@OptionsPanelController.Keywords(keywords={"general", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
final class GeneralOptionsPanel extends javax.swing.JPanel implements ActionListener {
    
    private final GeneralOptionsPanelController controller;

Lines 43-52 Link Here

(-)a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java (+4 lines)
43	*/	43	*/
44	package org.netbeans.modules.versioning.ui.options;	44	package org.netbeans.modules.versioning.ui.options;
45		45
		46	import org.netbeans.api.options.OptionsDisplayer;
		47	import org.netbeans.spi.options.OptionsPanelController;
		48
46	/**	49	/**
47	*	50	*
48	* @author Tomas Stupka	51	* @author Tomas Stupka
49	*/	52	*/
		53	@OptionsPanelController.Keywords(keywords={"history", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
50	public class HistoryOptionsPanel extends javax.swing.JPanel {	54	public class HistoryOptionsPanel extends javax.swing.JPanel {
51		55
52	/** Creates new form SvnOptionsPanel */	56	/** Creates new form SvnOptionsPanel */

Lines 46-56 Link Here

(-)a/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java (+3 lines)
46	import java.util.HashMap;	46	import java.util.HashMap;
47	import javax.swing.DefaultListModel;	47	import javax.swing.DefaultListModel;
48	import javax.swing.JComponent;	48	import javax.swing.JComponent;
		49	import org.netbeans.api.options.OptionsDisplayer;
		50	import org.netbeans.spi.options.OptionsPanelController;
49		51
50	/**	52	/**
51	*	53	*
52	* @author pbuzek	54	* @author pbuzek
53	*/	55	*/
		56	@OptionsPanelController.Keywords(keywords={"systems", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
54	public class VcsAdvancedOptionsPanel extends javax.swing.JPanel {	57	public class VcsAdvancedOptionsPanel extends javax.swing.JPanel {
55		58
56	HashMap<String, JComponent> versioningPanels = new HashMap<String, JComponent>();	59	HashMap<String, JComponent> versioningPanels = new HashMap<String, JComponent>();

Lines 65-70 Link Here

(-)a/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java (+2 lines)
65	import java.util.*;	65	import java.util.*;
66	import org.netbeans.api.editor.settings.EditorStyleConstants;	66	import org.netbeans.api.editor.settings.EditorStyleConstants;
67	import org.netbeans.modules.versioning.util.OptionsPanelColorProvider;	67	import org.netbeans.modules.versioning.util.OptionsPanelColorProvider;
		68	import org.netbeans.spi.options.OptionsPanelController;
68	import org.openide.util.Lookup;	69	import org.openide.util.Lookup;
69	import org.openide.util.LookupListener;	70	import org.openide.util.LookupListener;
70	import org.openide.util.WeakListeners;	71	import org.openide.util.WeakListeners;
Lines 73-78 Link Here
73	*	74	*
74	* @author Maros Sandor, Ondra Vrabec	75	* @author Maros Sandor, Ondra Vrabec
75	*/	76	*/
		77	@OptionsPanelController.Keywords(keywords={"versioning", "colors"}, location="FontsAndColors", index=4)
76	public class AnnotationColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {	78	public class AnnotationColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
77		79
78	private boolean listen;	80	private boolean listen;

Lines 44-55 Link Here

(-)a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java (+3 lines)
44	package org.netbeans.modules.vmd.componentssupport.options;	44	package org.netbeans.modules.vmd.componentssupport.options;
45		45
46	import org.netbeans.api.visual.router.RouterFactory;	46	import org.netbeans.api.visual.router.RouterFactory;
		47	import org.netbeans.modules.options.java.api.JavaOptions;
		48	import org.netbeans.spi.options.OptionsPanelController;
47	import org.openide.util.NbPreferences;	49	import org.openide.util.NbPreferences;
48		50
49	/**	51	/**
50	*	52	*
51	* @author Karol Harezlak	53	* @author Karol Harezlak
52	*/	54	*/
		55	@OptionsPanelController.Keywords(keywords={"java me"}, location=JavaOptions.JAVA, index=4)
53	final class ComponentssupportPanel extends javax.swing.JPanel {	56	final class ComponentssupportPanel extends javax.swing.JPanel {
54		57
55	private static final String VMD_STRUCTURE_SHOW = "vmd.structure.show"; // NOI18N	58	private static final String VMD_STRUCTURE_SHOW = "vmd.structure.show"; // NOI18N

Return to bug 218312

Lines 50-57 Link Here

(-)a/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java (+3 lines)
50	import java.io.IOException;	50	import java.io.IOException;
51	import javax.swing.Action;	51	import javax.swing.Action;
52	import javax.swing.JComboBox;	52	import javax.swing.JComboBox;
		53	import org.netbeans.api.options.OptionsDisplayer;
53	import org.netbeans.core.output2.Controller;	54	import org.netbeans.core.output2.Controller;
54	import org.netbeans.core.output2.NbIOProvider;	55	import org.netbeans.core.output2.NbIOProvider;
		56	import org.netbeans.spi.options.OptionsPanelController;
55	import org.openide.DialogDescriptor;	57	import org.openide.DialogDescriptor;
56	import org.openide.DialogDisplayer;	58	import org.openide.DialogDisplayer;
57	import org.openide.awt.ColorComboBox;	59	import org.openide.awt.ColorComboBox;
Lines 68-73 Link Here
68	@NbBundle.Messages({	70	@NbBundle.Messages({
69	"LBL_Description=Output Window Settings"	71	"LBL_Description=Output Window Settings"
70	})	72	})
		73	@OptionsPanelController.Keywords(keywords={"Output Window Font Color"}, location=OptionsDisplayer.ADVANCED, tabTitle="Output")
71	public final class OutputSettingsPanel extends javax.swing.JPanel {	74	public final class OutputSettingsPanel extends javax.swing.JPanel {
72		75
73	private OutputOptions outputOptions;	76	private OutputOptions outputOptions;

Lines 49-60 Link Here

(-)a/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java (+3 lines)
49	import java.util.prefs.Preferences;	49	import java.util.prefs.Preferences;
50	import javax.swing.JTabbedPane;	50	import javax.swing.JTabbedPane;
51	import javax.swing.UIManager;	51	import javax.swing.UIManager;
		52	import org.netbeans.api.options.OptionsDisplayer;
52	import org.netbeans.core.windows.FloatingWindowTransparencyManager;	53	import org.netbeans.core.windows.FloatingWindowTransparencyManager;
53	import org.netbeans.core.windows.nativeaccess.NativeWindowSystem;	54	import org.netbeans.core.windows.nativeaccess.NativeWindowSystem;
		55	import org.netbeans.spi.options.OptionsPanelController;
54	import org.openide.util.NbBundle;	56	import org.openide.util.NbBundle;
55	import org.openide.util.NbPreferences;	57	import org.openide.util.NbPreferences;
56	import org.openide.util.Utilities;	58	import org.openide.util.Utilities;
57		59
		60	@OptionsPanelController.Keywords(keywords={"#AdvancedOption_DisplayName_WinSys"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName_WinSys")
58	final class WinSysPanel extends javax.swing.JPanel {	61	final class WinSysPanel extends javax.swing.JPanel {
59		62
60	private final WinSysOptionsPanelController controller;	63	private final WinSysOptionsPanelController controller;

Lines 56-63 Link Here

(-)a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java (+3 lines)
56	import javax.swing.JLabel;	56	import javax.swing.JLabel;
57	import javax.swing.SwingUtilities;	57	import javax.swing.SwingUtilities;
58	import org.netbeans.api.annotations.common.NonNull;	58	import org.netbeans.api.annotations.common.NonNull;
		59	import org.netbeans.api.options.OptionsDisplayer;
59	import org.netbeans.modules.groovy.support.api.GroovySettings;	60	import org.netbeans.modules.groovy.support.api.GroovySettings;
60	import org.netbeans.modules.groovy.support.spi.GroovyOptionsSubpanel;	61	import org.netbeans.modules.groovy.support.spi.GroovyOptionsSubpanel;
		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.HtmlBrowser;	65	import org.openide.awt.HtmlBrowser;
Lines 69-74 Link Here
69	*	71	*
70	* @author Martin Adamek	72	* @author Martin Adamek
71	*/	73	*/
		74	@OptionsPanelController.Keywords(keywords={"groovy", "grails"}, location=OptionsDisplayer.ADVANCED, tabTitle="Groovy")
72	final class SupportPanel extends javax.swing.JPanel {	75	final class SupportPanel extends javax.swing.JPanel {
73		76
74	private final Collection<GroovyOptionsSubpanel> subpanels;	77	private final Collection<GroovyOptionsSubpanel> subpanels;

Lines 49-54 Link Here

(-)a/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java (+3 lines)
49	import javax.swing.text.Document;	49	import javax.swing.text.Document;
50	import org.netbeans.modules.javacard.common.GuiUtils;	50	import org.netbeans.modules.javacard.common.GuiUtils;
51	import org.netbeans.modules.javacard.common.Utils;	51	import org.netbeans.modules.javacard.common.Utils;
		52	import org.netbeans.modules.options.java.api.JavaOptions;
		53	import org.netbeans.spi.options.OptionsPanelController;
52	import org.netbeans.validation.api.Problem;	54	import org.netbeans.validation.api.Problem;
53	import org.netbeans.validation.api.Validator;	55	import org.netbeans.validation.api.Validator;
54	import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;	56	import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;
Lines 57-62 Link Here
57	import org.netbeans.validation.api.ui.swing.SwingValidationGroup;	59	import org.netbeans.validation.api.ui.swing.SwingValidationGroup;
58	import org.openide.util.NbBundle;	60	import org.openide.util.NbBundle;
59		61
		62	@OptionsPanelController.Keywords(keywords={"java card"}, location=JavaOptions.JAVA, index=2)
60	final class JavacardOptions extends javax.swing.JPanel implements ValidationUI, DocumentListener {	63	final class JavacardOptions extends javax.swing.JPanel implements ValidationUI, DocumentListener {
61		64
62	private final JavacardOptionsPanelController controller;	65	private final JavacardOptionsPanelController controller;

Lines 46-60 Link Here

(-)a/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java (+3 lines)
46	import javax.swing.ComboBoxModel;	46	import javax.swing.ComboBoxModel;
47	import javax.swing.DefaultComboBoxModel;	47	import javax.swing.DefaultComboBoxModel;
48	import org.mozilla.nb.javascript.Context;	48	import org.mozilla.nb.javascript.Context;
		49	import org.netbeans.api.options.OptionsDisplayer;
49	import org.netbeans.modules.javascript.editing.BrowserVersion;	50	import org.netbeans.modules.javascript.editing.BrowserVersion;
50	import org.netbeans.modules.javascript.editing.SupportedBrowsers;	51	import org.netbeans.modules.javascript.editing.SupportedBrowsers;
51	import org.netbeans.modules.javascript.editing.spi.JSPreferencesPanel;	52	import org.netbeans.modules.javascript.editing.spi.JSPreferencesPanel;
		53	import org.netbeans.spi.options.OptionsPanelController;
52	import org.openide.util.NbBundle;	54	import org.openide.util.NbBundle;
53		55
54	/**	56	/**
55	*	57	*
56	* @author Tor Norbye	58	* @author Tor Norbye
57	*/	59	*/
		60	@OptionsPanelController.Keywords(keywords={"javascript"}, location=OptionsDisplayer.ADVANCED, tabTitle="#JsOptions.displayName")
58	public class BrowserPanel extends JSPreferencesPanel {	61	public class BrowserPanel extends JSPreferencesPanel {
59		62
60		63

Lines 49-60 Link Here

(-)a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java (+3 lines)
49	import javax.swing.DefaultComboBoxModel;	49	import javax.swing.DefaultComboBoxModel;
50	import javax.swing.JFileChooser;	50	import javax.swing.JFileChooser;
51	import javax.swing.SwingUtilities;	51	import javax.swing.SwingUtilities;
		52	import org.netbeans.api.options.OptionsDisplayer;
52	import org.netbeans.modules.mobility.svgcore.api.snippets.SVGSnippetsProvider;	53	import org.netbeans.modules.mobility.svgcore.api.snippets.SVGSnippetsProvider;
		54	import org.netbeans.spi.options.OptionsPanelController;
53	import org.openide.DialogDisplayer;	55	import org.openide.DialogDisplayer;
54	import org.openide.NotifyDescriptor;	56	import org.openide.NotifyDescriptor;
55	import org.openide.util.Lookup;	57	import org.openide.util.Lookup;
56	import org.openide.util.NbBundle;	58	import org.openide.util.NbBundle;
57		59
		60	@OptionsPanelController.Keywords(keywords={"#AdvancedOption_Tooltip", "svg"}, location=OptionsDisplayer.ADVANCED, tabTitle="#AdvancedOption_DisplayName")
58	final class SvgcorePanel extends javax.swing.JPanel {	61	final class SvgcorePanel extends javax.swing.JPanel {
59		62
60	private final SvgcoreOptionsPanelController controller;	63	private final SvgcoreOptionsPanelController controller;

Lines 59-64 Link Here

(-)a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java (+3 lines)
59	import javax.swing.JFileChooser;	59	import javax.swing.JFileChooser;
60	import javax.swing.JPanel;	60	import javax.swing.JPanel;
61	import javax.swing.SwingUtilities;	61	import javax.swing.SwingUtilities;
		62	import org.netbeans.modules.options.java.api.JavaOptions;
		63	import org.netbeans.spi.options.OptionsPanelController;
62	import org.openide.DialogDisplayer;	64	import org.openide.DialogDisplayer;
63	import org.openide.NotifyDescriptor;	65	import org.openide.NotifyDescriptor;
64	import org.openide.execution.NbClassPath;	66	import org.openide.execution.NbClassPath;
Lines 73-78 Link Here
73	* Implementation of one panel in Options Dialog.	75	* Implementation of one panel in Options Dialog.
74	* @author Jan Jancura, Jesse Glick	76	* @author Jan Jancura, Jesse Glick
75	*/	77	*/
		78	@OptionsPanelController.Keywords(keywords={"ant"}, location=JavaOptions.JAVA, index=0)
76	public class AntCustomizer extends JPanel implements ActionListener {	79	public class AntCustomizer extends JPanel implements ActionListener {
77		80
78	private List<File> classpath = Collections.emptyList();	81	private List<File> classpath = Collections.emptyList();

Lines 73-79 Link Here

(-)a/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java (+3 lines)
73	import javax.swing.event.TableModelEvent;	73	import javax.swing.event.TableModelEvent;
74	import javax.swing.table.TableColumn;	74	import javax.swing.table.TableColumn;
75	import javax.swing.table.TableModel;	75	import javax.swing.table.TableModel;
		76	import org.netbeans.api.options.OptionsDisplayer;
76	import org.netbeans.core.options.keymap.api.ShortcutAction;	77	import org.netbeans.core.options.keymap.api.ShortcutAction;
		78	import org.netbeans.spi.options.OptionsPanelController;
77	import org.openide.DialogDescriptor;	79	import org.openide.DialogDescriptor;
78	import org.openide.DialogDisplayer;	80	import org.openide.DialogDisplayer;
79	import org.openide.util.NbBundle;	81	import org.openide.util.NbBundle;
Lines 83-88 Link Here
83	*	85	*
84	* @author Max Sauer	86	* @author Max Sauer
85	*/	87	*/
		88	@OptionsPanelController.Keywords(keywords={"keymaps"}, location="#Keymaps.Options.Export.Category.displayName")
86	public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {	89	public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {
87		90
88	// Delay times for incremental search [ms]	91	// Delay times for incremental search [ms]

Lines 54-60 Link Here

(-)a/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java (+3 lines)
54	import java.util.ArrayList;	54	import java.util.ArrayList;
55	import java.util.Iterator;	55	import java.util.Iterator;
56	import javax.swing.*;	56	import javax.swing.*;
		57	import org.netbeans.modules.options.java.api.JavaOptions;
57	import org.netbeans.modules.profiler.api.JavaPlatform;	58	import org.netbeans.modules.profiler.api.JavaPlatform;
		59	import org.netbeans.spi.options.OptionsPanelController;
58		60
59		61
60	/**	62	/**
Lines 107-112 Link Here
107	"ProfilerOptionsPanel_JavaPlatformComboAccessDescr=Java platform used for running the profiled application",	109	"ProfilerOptionsPanel_JavaPlatformComboAccessDescr=Java platform used for running the profiled application",
108	"ProfilerOptionsPanel_IfThreadsMonitoringEnabledHint=if threads monitoring is enabled"	110	"ProfilerOptionsPanel_IfThreadsMonitoringEnabledHint=if threads monitoring is enabled"
109	})	111	})
		112	@OptionsPanelController.Keywords(keywords={"profiler"}, location=JavaOptions.JAVA, index=6)
110	public final class ProfilerOptionsPanel extends JPanel implements ActionListener {	113	public final class ProfilerOptionsPanel extends JPanel implements ActionListener {
111	//~ Inner Classes ------------------------------------------------------------------------------------------------------------	114	//~ Inner Classes ------------------------------------------------------------------------------------------------------------
112		115

Lines 54-67 Link Here

(-)a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java (+3 lines)
54	import javax.swing.DefaultListCellRenderer;	54	import javax.swing.DefaultListCellRenderer;
55	import javax.swing.DefaultListModel;	55	import javax.swing.DefaultListModel;
56	import javax.swing.JList;	56	import javax.swing.JList;
		57	import org.netbeans.api.options.OptionsDisplayer;
57	import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;	58	import org.netbeans.modules.versioning.core.util.VCSSystemProvider.VersioningSystem;
58	import org.netbeans.modules.versioning.core.api.VCSFileProxy;	59	import org.netbeans.modules.versioning.core.api.VCSFileProxy;
59	import org.netbeans.modules.versioning.core.util.Utils;	60	import org.netbeans.modules.versioning.core.util.Utils;
		61	import org.netbeans.spi.options.OptionsPanelController;
60	import org.openide.filesystems.FileChooserBuilder;	62	import org.openide.filesystems.FileChooserBuilder;
61	import org.openide.util.Lookup;	63	import org.openide.util.Lookup;
62	import org.openide.util.NbBundle;	64	import org.openide.util.NbBundle;
63	import org.openide.util.RequestProcessor;	65	import org.openide.util.RequestProcessor;
64		66
		67	@OptionsPanelController.Keywords(keywords={"general", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
65	final class GeneralOptionsPanel extends javax.swing.JPanel implements ActionListener {	68	final class GeneralOptionsPanel extends javax.swing.JPanel implements ActionListener {
66		69
67	private final GeneralOptionsPanelController controller;	70	private final GeneralOptionsPanelController controller;