Attachment #124326 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 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.KeywordPanel(keywords = {"annotation stuff", "xaxaxa333"}, location = "FontsAndColors", index = 2, id = "")
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=xaxaxa
		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 1-4 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>

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.KeywordPanel(keywords={"highlighting stuff", "#KW_3"}, location="FontsAndColors", index=1, id="")
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.KeywordPanel(keywords={"#KW_1", "xaxaxa"}, location="FontsAndColors", index=0, id="")
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-72 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java (+8 lines)
63	*	63	*
64	* @author Dusan Balek	64	* @author Dusan Balek
65	*/	65	*/
		66	@OptionsPanelController.KeywordPanels({
		67	@OptionsPanelController.KeywordPanel(keywords = {"asas", "xaxaxa444"}, location = "Editor", index = 4, id = "Hints"),
		68	@OptionsPanelController.KeywordPanel(keywords = {"MarkOccurrences stuff", "xaxaxa555"}, location = "Editor", index = 5, id = "MarkOccurrences")
		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;
69		73
		74	private FolderBasedOptionPanel() {
		75	controller = null;
		76	}
		77
70	/** Creates new form FolderBasedOptionPanel */	78	/** Creates new form FolderBasedOptionPanel */
71	FolderBasedOptionPanel(FolderBasedController controller, Document filterDocument, boolean allowFiltering) {	79	FolderBasedOptionPanel(FolderBasedController controller, Document filterDocument, boolean allowFiltering) {
72	this.controller = controller;	80	this.controller = controller;

Lines 248-256 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form (-3 lines)
248	</Component>	248	</Component>
249	<Component class="javax.swing.JLabel" name="lEditorSearchType">	249	<Component class="javax.swing.JLabel" name="lEditorSearchType">
250	<Properties>	250	<Properties>
251	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
252	<ComponentRef name="default"/>
253	</Property>
254	<Property name="text" type="java.lang.String" value="Editor Search Type:"/>	251	<Property name="text" type="java.lang.String" value="Editor Search Type:"/>
255	</Properties>	252	</Properties>
256	</Component>	253	</Component>

Lines 53-58 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java (+2 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.KeywordPanel(keywords={"general editor stuff", "kai"}, location="Editor", index=0, id="General")
64	public class GeneralEditorPanel extends JPanel implements ActionListener {	66	public class GeneralEditorPanel extends JPanel implements ActionListener {
65		67
66	private boolean changed = false;	68	private boolean changed = false;

Lines 1-4 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.form (-3 / +3 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>	4	<AuxValues>
Lines 36-42 Link Here
36	<Group type="103" groupAlignment="0" attributes="0">	36	<Group type="103" groupAlignment="0" attributes="0">
37	<Group type="102" alignment="0" attributes="0">	37	<Group type="102" alignment="0" attributes="0">
38	<Group type="103" groupAlignment="1" attributes="0">	38	<Group type="103" groupAlignment="1" attributes="0">
39	<Component id="categoryPanel" alignment="0" pref="160" max="32767" attributes="1"/>	39	<Component id="categoryPanel" alignment="0" max="32767" attributes="1"/>
40	<Group type="102" alignment="0" attributes="0">	40	<Group type="102" alignment="0" attributes="0">
41	<Group type="103" groupAlignment="0" attributes="0">	41	<Group type="103" groupAlignment="0" attributes="0">
42	<Component id="categoryLabel" alignment="0" min="-2" max="-2" attributes="0"/>	42	<Component id="categoryLabel" alignment="0" min="-2" max="-2" attributes="0"/>
Lines 66-72 Link Here
66	<Component id="categoryCombo" alignment="3" min="-2" max="-2" attributes="0"/>	66	<Component id="categoryCombo" alignment="3" min="-2" max="-2" attributes="0"/>
67	</Group>	67	</Group>
68	<EmptySpace type="separate" max="-2" attributes="0"/>	68	<EmptySpace type="separate" max="-2" attributes="0"/>
69	<Component id="categoryPanel" pref="266" max="32767" attributes="0"/>	69	<Component id="categoryPanel" pref="258" max="32767" attributes="0"/>
70	</Group>	70	</Group>
71	</Group>	71	</Group>
72	</DimensionLayout>	72	</DimensionLayout>

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.KeywordPanel(keywords={"formatting", "general", "stuff"}, location="Editor", index=1, id="Formating")
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 1-4 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.3" maxVersion="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>	4	<Properties>




import org.netbeans.modules.editor.indent.api.IndentUtils;
import org.netbeans.modules.editor.indent.api.Reformat;
import org.netbeans.modules.options.editor.spi.PreviewProvider;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileObject;
import org.openide.text.CloneableEditorSupport;

 *
 * @author Jan Jancura
 */
@OptionsPanelController.KeywordPanel(keywords={"indentation", "extra", "stuff"}, location="Editor", index=1, id="Formating")
public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {

    private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());

    private final PreviewProvider preview;
    private final boolean showOverrideGlobalOptions;
    
    private IndentationPanel() {
        this.mimePath = null;
        this.prefsFactory = null;
        this.prefs = null;
        this.allLangPrefs = null;
        this.preview = null;
        this.showOverrideGlobalOptions = false;
    }
    
    /** 
     * Creates new form IndentationPanel.
     */

Return to bug 218312

Lines 83-88 Link Here

(-)a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java (+11 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.KeywordPanel(keywords={"indentation", "extra", "stuff"}, location="Editor", index=1, id="Formating")
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());
Lines 107-112 Link Here
107	private final PreviewProvider preview;	109	private final PreviewProvider preview;
108	private final boolean showOverrideGlobalOptions;	110	private final boolean showOverrideGlobalOptions;
109		111
		112	private IndentationPanel() {
		113	this.mimePath = null;
		114	this.prefsFactory = null;
		115	this.prefs = null;
		116	this.allLangPrefs = null;
		117	this.preview = null;
		118	this.showOverrideGlobalOptions = false;
		119	}
		120
110	/**	121	/**
111	* Creates new form IndentationPanel.	122	* Creates new form IndentationPanel.
112	*/	123	*/