diff --git a/bugtracking/manifest.mf b/bugtracking/manifest.mf
--- a/bugtracking/manifest.mf
+++ b/bugtracking/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.bugtracking
OpenIDE-Module-Layer: org/netbeans/modules/bugtracking/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugtracking/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
diff --git a/bugtracking/nbproject/project.xml b/bugtracking/nbproject/project.xml
--- a/bugtracking/nbproject/project.xml
+++ b/bugtracking/nbproject/project.xml
@@ -72,7 +72,7 @@
1
- 1.11
+ 1.28
diff --git a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
--- a/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
+++ b/bugtracking/src/org/netbeans/modules/bugtracking/util/BugtrackingOptionsPanel.java
@@ -47,11 +47,14 @@
import java.awt.CardLayout;
import javax.swing.DefaultListModel;
import javax.swing.JComponent;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
/**
*
* @author Tomas Stupka
*/
+@OptionsPanelController.Keywords(keywords={"issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_IssueTracking")
class BugtrackingOptionsPanel extends javax.swing.JPanel {
/** Creates new form VcsAdvancedOptionsPanel */
diff --git a/bugzilla/manifest.mf b/bugzilla/manifest.mf
--- a/bugzilla/manifest.mf
+++ b/bugzilla/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.bugzilla
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/bugzilla/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/bugzilla/layer.xml
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.29
diff --git a/bugzilla/nbproject/project.xml b/bugzilla/nbproject/project.xml
--- a/bugzilla/nbproject/project.xml
+++ b/bugzilla/nbproject/project.xml
@@ -117,7 +117,7 @@
1
- 1.11
+ 1.28
diff --git a/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java b/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java
--- a/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java
+++ b/bugzilla/src/org/netbeans/modules/bugzilla/options/BugzillaOptionsPanel.java
@@ -46,12 +46,15 @@
import java.awt.Color;
import java.awt.Image;
import javax.swing.ImageIcon;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.ImageUtilities;
/**
*
* @author Tomas Stupka
*/
+@OptionsPanelController.Keywords(keywords={"bugzilla", "issue tracking"}, location=OptionsDisplayer.ADVANCED, tabTitle="Issue Tracking")
public class BugzillaOptionsPanel extends javax.swing.JPanel {
/** Creates new form SvnOptionsPanel */
diff --git a/core.output2/manifest.mf b/core.output2/manifest.mf
--- a/core.output2/manifest.mf
+++ b/core.output2/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/core/output2/Bundle.properties
OpenIDE-Module-Provides: org.openide.windows.IOProvider
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
diff --git a/core.output2/nbproject/project.xml b/core.output2/nbproject/project.xml
--- a/core.output2/nbproject/project.xml
+++ b/core.output2/nbproject/project.xml
@@ -55,7 +55,7 @@
1
- 1.27
+ 1.28
diff --git a/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java b/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java
--- a/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java
+++ b/core.output2/src/org/netbeans/core/output2/options/OutputSettingsPanel.java
@@ -50,8 +50,10 @@
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;
@@ -68,6 +70,7 @@
@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;
diff --git a/core.ui/manifest.mf b/core.ui/manifest.mf
--- a/core.ui/manifest.mf
+++ b/core.ui/manifest.mf
@@ -4,5 +4,5 @@
OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.32
+OpenIDE-Module-Specification-Version: 1.33
diff --git a/core.ui/nbproject/project.xml b/core.ui/nbproject/project.xml
--- a/core.ui/nbproject/project.xml
+++ b/core.ui/nbproject/project.xml
@@ -73,7 +73,7 @@
1
- 1.5
+ 1.28
diff --git a/core.ui/src/org/netbeans/core/ui/options/filetypes/FileAssociationsPanel.java b/core.ui/src/org/netbeans/core/ui/options/filetypes/FileAssociationsPanel.java
--- a/core.ui/src/org/netbeans/core/ui/options/filetypes/FileAssociationsPanel.java
+++ b/core.ui/src/org/netbeans/core/ui/options/filetypes/FileAssociationsPanel.java
@@ -48,7 +48,9 @@
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;
@@ -58,6 +60,7 @@
*
* @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;
diff --git a/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java b/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
--- a/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
+++ b/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
@@ -45,6 +45,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.NotificationLineSupport;
@@ -52,6 +54,7 @@
*
* @author Jiri Rechtacek
*/
+@OptionsPanelController.Keywords(keywords={"advanced proxy"}, location=OptionsDisplayer.GENERAL)
public class AdvancedProxyPanel extends javax.swing.JPanel {
private GeneralOptionsModel options;
private String oldHttpsHost;
diff --git a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java b/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
--- a/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
+++ b/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
@@ -60,6 +60,7 @@
import javax.swing.UIManager;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.beaninfo.editors.HtmlBrowser;
import org.netbeans.core.ProxySettings;
import org.netbeans.spi.options.OptionsPanelController;
@@ -75,6 +76,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"#KW_General"}, location=OptionsDisplayer.GENERAL)
public class GeneralOptionsPanel extends JPanel implements ActionListener {
private boolean changed = false;
diff --git a/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsPanel.java b/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsPanel.java
--- a/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsPanel.java
+++ b/core.ui/src/org/netbeans/core/ui/options/general/WebBrowsersOptionsPanel.java
@@ -39,13 +39,16 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.text.Document;
+import org.netbeans.api.options.OptionsDisplayer;
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=OptionsDisplayer.GENERAL)
public class WebBrowsersOptionsPanel extends JPanel implements ListSelectionListener {
private WebBrowsersOptionsModel browsersModel;
diff --git a/core.windows/manifest.mf b/core.windows/manifest.mf
--- a/core.windows/manifest.mf
+++ b/core.windows/manifest.mf
@@ -6,5 +6,5 @@
OpenIDE-Module-Recommends: org.netbeans.core.windows.nativeaccess.NativeWindowSystem
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 2.54
+OpenIDE-Module-Specification-Version: 2.55
diff --git a/core.windows/nbproject/project.xml b/core.windows/nbproject/project.xml
--- a/core.windows/nbproject/project.xml
+++ b/core.windows/nbproject/project.xml
@@ -64,7 +64,7 @@
1
- 1.6
+ 1.28
diff --git a/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java b/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java
--- a/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java
+++ b/core.windows/src/org/netbeans/core/windows/options/WinSysPanel.java
@@ -49,12 +49,15 @@
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;
diff --git a/debugger.jpda.ui/manifest.mf b/debugger.jpda.ui/manifest.mf
--- a/debugger.jpda.ui/manifest.mf
+++ b/debugger.jpda.ui/manifest.mf
@@ -3,7 +3,7 @@
OpenIDE-Module: org.netbeans.modules.debugger.jpda.ui/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/debugger/jpda/ui/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/debugger/jpda/resources/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.27
+OpenIDE-Module-Specification-Version: 1.28
OpenIDE-Module-Requires: org.netbeans.api.debugger.jpda.JPDADebuggerEngineImpl,
org.netbeans.spi.debugger.ui
OpenIDE-Module-Provides: org.netbeans.modules.debugger.jpda.ui
diff --git a/debugger.jpda.ui/nbproject/project.xml b/debugger.jpda.ui/nbproject/project.xml
--- a/debugger.jpda.ui/nbproject/project.xml
+++ b/debugger.jpda.ui/nbproject/project.xml
@@ -174,7 +174,7 @@
1
- 1.11
+ 1.28
diff --git a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java b/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java
--- a/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java
+++ b/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/options/JavaDebuggerPanel.java
@@ -43,9 +43,12 @@
package org.netbeans.modules.debugger.jpda.ui.options;
import java.util.Collection;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;
+@OptionsPanelController.Keywords(keywords={"java debugger"}, location=JavaOptions.JAVA, index=3)
final class JavaDebuggerPanel extends StorablePanel {
private static final String SHOW_FORMATTERS_PROP_NAME = "org.netbeans.modules.debugger.jpda.ui.options.SHOW_FORMATTERS";
diff --git a/diff/nbproject/project.properties b/diff/nbproject/project.properties
--- a/diff/nbproject/project.properties
+++ b/diff/nbproject/project.properties
@@ -43,7 +43,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.38.0
+spec.version.base=1.39.0
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
diff --git a/diff/nbproject/project.xml b/diff/nbproject/project.xml
--- a/diff/nbproject/project.xml
+++ b/diff/nbproject/project.xml
@@ -124,7 +124,7 @@
1
- 1.8
+ 1.28
diff --git a/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java b/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java
--- a/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java
+++ b/diff/src/org/netbeans/modules/diff/options/DiffColorsPanel.java
@@ -62,6 +62,8 @@
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.util.*;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
/**
* Copied from org.netbeans.modules.options.colors.HighlightingPanel
@@ -69,6 +71,7 @@
* copied from editor/options.
* @author Maros Sandor
*/
+@OptionsPanelController.Keywords(keywords={"diff colors"}, location=OptionsDisplayer.FONTSANDCOLORS, index=3)
public class DiffColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
private static final String ATTR_NAME_ADDED = "added";
diff --git a/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java b/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java
--- a/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java
+++ b/diff/src/org/netbeans/modules/diff/options/DiffOptionsPanel.java
@@ -53,12 +53,15 @@
import javax.swing.event.DocumentEvent;
import javax.swing.*;
import java.io.File;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
/**
* Diff Options panel.
*
* @author Maros Sandor
*/
+@OptionsPanelController.Keywords(keywords={"diff"}, location=OptionsDisplayer.ADVANCED, tabTitle="Diff")
class DiffOptionsPanel extends javax.swing.JPanel implements ChangeListener, DocumentListener {
private boolean isChanged;
diff --git a/editor.codetemplates/nbproject/project.properties b/editor.codetemplates/nbproject/project.properties
--- a/editor.codetemplates/nbproject/project.properties
+++ b/editor.codetemplates/nbproject/project.properties
@@ -45,6 +45,6 @@
#javadoc.name=EditorCodeTemplates
javadoc.apichanges=${basedir}/apichanges.xml
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.27.0
+spec.version.base=1.28.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/editor.codetemplates/nbproject/project.xml b/editor.codetemplates/nbproject/project.xml
--- a/editor.codetemplates/nbproject/project.xml
+++ b/editor.codetemplates/nbproject/project.xml
@@ -144,7 +144,7 @@
1
- 1.6
+ 1.28
diff --git a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
--- a/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
+++ b/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/ui/CodeTemplatesPanel.java
@@ -74,6 +74,7 @@
import org.netbeans.api.editor.EditorRegistry;
import org.netbeans.api.editor.mimelookup.MimeLookup;
import org.netbeans.api.editor.mimelookup.MimePath;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.editor.Acceptor;
import org.netbeans.lib.editor.codetemplates.AbbrevDetection;
import org.netbeans.lib.editor.codetemplates.storage.CodeTemplateSettingsImpl.OnExpandAction;
@@ -93,6 +94,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords = {"code", "templates"}, location = OptionsDisplayer.EDITOR, index = 3)
public class CodeTemplatesPanel extends JPanel implements ActionListener, ListSelectionListener, KeyListener, DocumentListener {
private static final Logger LOG = Logger.getLogger(CodeTemplatesPanel.class.getName());
diff --git a/editor.macros/nbproject/project.properties b/editor.macros/nbproject/project.properties
--- a/editor.macros/nbproject/project.properties
+++ b/editor.macros/nbproject/project.properties
@@ -1,5 +1,5 @@
javac.compilerargs=-Xlint -Xlint:-serial
javac.source=1.6
-spec.version.base=1.18.0
+spec.version.base=1.19.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/editor.macros/nbproject/project.xml b/editor.macros/nbproject/project.xml
--- a/editor.macros/nbproject/project.xml
+++ b/editor.macros/nbproject/project.xml
@@ -65,7 +65,7 @@
1
- 1.6
+ 1.28
diff --git a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
--- a/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
+++ b/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/MacrosPanel.java
@@ -67,10 +67,12 @@
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import org.netbeans.api.editor.mimelookup.MimePath;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.core.options.keymap.api.KeyStrokeUtils;
import org.netbeans.core.options.keymap.api.ShortcutAction;
import org.netbeans.core.options.keymap.api.ShortcutsFinder;
import org.netbeans.modules.editor.macros.storage.ui.MacrosModel.Macro;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.awt.Mnemonics;
@@ -82,6 +84,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords = {"macros"}, location = OptionsDisplayer.EDITOR, index = 6)
public class MacrosPanel extends JPanel {
private final MacrosModel model = MacrosModel.get();
diff --git a/form/nbproject/project.properties b/form/nbproject/project.properties
--- a/form/nbproject/project.properties
+++ b/form/nbproject/project.properties
@@ -43,7 +43,7 @@
extra.module.files=modules/ext/AbsoluteLayout.jar
javac.source=1.6
javadoc.arch=${basedir}/arch.xml
-spec.version.base=1.42.0
+spec.version.base=1.43.0
test-unit-sys-prop.org.netbeans.modules.form.layoutdesign.test=0
jnlp.verify.excludes=sources/org/netbeans/lib/awtextra/AbsoluteLayout.java,sources/org/netbeans/lib/awtextra/AbsoluteConstraints.java,sources/readme.txt
diff --git a/form/nbproject/project.xml b/form/nbproject/project.xml
--- a/form/nbproject/project.xml
+++ b/form/nbproject/project.xml
@@ -90,7 +90,7 @@
1
- 1.3
+ 1.28
diff --git a/form/src/org/netbeans/modules/form/FormEditorCustomizer.java b/form/src/org/netbeans/modules/form/FormEditorCustomizer.java
--- a/form/src/org/netbeans/modules/form/FormEditorCustomizer.java
+++ b/form/src/org/netbeans/modules/form/FormEditorCustomizer.java
@@ -59,6 +59,7 @@
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.explorer.propertysheet.PropertyPanel;
import org.openide.nodes.PropertySupport;
@@ -70,6 +71,7 @@
*
* @author Jan Stola, Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"gui builder"}, location="Java", index=1)
public final class FormEditorCustomizer extends JPanel implements ActionListener, ChangeListener {
private JCheckBox cbFold = new JCheckBox ();
private JCheckBox cbAssistant = new JCheckBox();
diff --git a/groovy.support/manifest.mf b/groovy.support/manifest.mf
--- a/groovy.support/manifest.mf
+++ b/groovy.support/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.groovy.support
OpenIDE-Module-Layer: org/netbeans/modules/groovy/support/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/groovy/support/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.22
+OpenIDE-Module-Specification-Version: 1.23
OpenIDE-Module-Needs: javax.script.ScriptEngine.freemarker
diff --git a/groovy.support/nbproject/project.xml b/groovy.support/nbproject/project.xml
--- a/groovy.support/nbproject/project.xml
+++ b/groovy.support/nbproject/project.xml
@@ -127,7 +127,7 @@
1
- 1.5
+ 1.28
diff --git a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java b/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
--- a/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
+++ b/groovy.support/src/org/netbeans/modules/groovy/support/options/SupportPanel.java
@@ -56,8 +56,10 @@
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;
@@ -69,6 +71,7 @@
*
* @author Martin Adamek
*/
+@OptionsPanelController.Keywords(keywords={"groovy", "grails"}, location=OptionsDisplayer.ADVANCED, tabTitle="Groovy")
final class SupportPanel extends javax.swing.JPanel {
private final Collection subpanels;
diff --git a/javacard.project/manifest.mf b/javacard.project/manifest.mf
--- a/javacard.project/manifest.mf
+++ b/javacard.project/manifest.mf
@@ -4,6 +4,6 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javacard/Bundle.properties
OpenIDE-Module-Requires: org.openide.windows.IOProvider
OpenIDE-Module-Provides: org.netbeans.modules.javacard.JavacardPlatform
-OpenIDE-Module-Specification-Version: 1.42
+OpenIDE-Module-Specification-Version: 1.43
AutoUpdate-Show-In-Client: false
diff --git a/javacard.project/nbproject/project.xml b/javacard.project/nbproject/project.xml
--- a/javacard.project/nbproject/project.xml
+++ b/javacard.project/nbproject/project.xml
@@ -133,7 +133,7 @@
1
- 1.11
+ 1.28
diff --git a/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java b/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java
--- a/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java
+++ b/javacard.project/src/org/netbeans/modules/javacard/options/JavacardOptions.java
@@ -49,6 +49,8 @@
import javax.swing.text.Document;
import org.netbeans.modules.javacard.common.GuiUtils;
import org.netbeans.modules.javacard.common.Utils;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.netbeans.validation.api.Problem;
import org.netbeans.validation.api.Validator;
import org.netbeans.validation.api.builtin.stringvalidation.StringValidators;
@@ -57,6 +59,7 @@
import org.netbeans.validation.api.ui.swing.SwingValidationGroup;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"java card"}, location=JavaOptions.JAVA, index=2)
final class JavacardOptions extends javax.swing.JPanel implements ValidationUI, DocumentListener {
private final JavacardOptionsPanelController controller;
diff --git a/javafx2.scenebuilder/manifest.mf b/javafx2.scenebuilder/manifest.mf
--- a/javafx2.scenebuilder/manifest.mf
+++ b/javafx2.scenebuilder/manifest.mf
@@ -2,4 +2,4 @@
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.javafx2.scenebuilder
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javafx2/scenebuilder/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.4
+OpenIDE-Module-Specification-Version: 1.5
diff --git a/javafx2.scenebuilder/nbproject/project.xml b/javafx2.scenebuilder/nbproject/project.xml
--- a/javafx2.scenebuilder/nbproject/project.xml
+++ b/javafx2.scenebuilder/nbproject/project.xml
@@ -19,7 +19,7 @@
1
- 1.25
+ 1.28
diff --git a/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java b/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
--- a/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
+++ b/javafx2.scenebuilder/src/org/netbeans/modules/javafx2/scenebuilder/options/SBOptionsPanel.java
@@ -49,10 +49,13 @@
import javax.swing.JFileChooser;
import org.netbeans.modules.javafx2.scenebuilder.Home;
import org.netbeans.modules.javafx2.scenebuilder.impl.SBHomeFactory;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"javafx"}, location=JavaOptions.JAVA, index=7)
final class SBOptionsPanel extends javax.swing.JPanel {
private final SBOptionsPanelController controller;
diff --git a/javascript.editing/manifest.mf b/javascript.editing/manifest.mf
--- a/javascript.editing/manifest.mf
+++ b/javascript.editing/manifest.mf
@@ -3,6 +3,6 @@
OpenIDE-Module-Install: org/netbeans/modules/javascript/editing/Installer.class
OpenIDE-Module-Layer: org/netbeans/modules/javascript/editing/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/javascript/editing/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.108
+OpenIDE-Module-Specification-Version: 0.109
AutoUpdate-Show-In-Client: false
diff --git a/javascript.editing/nbproject/project.xml b/javascript.editing/nbproject/project.xml
--- a/javascript.editing/nbproject/project.xml
+++ b/javascript.editing/nbproject/project.xml
@@ -164,7 +164,7 @@
1
- 1.5
+ 1.28
diff --git a/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java b/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java
--- a/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java
+++ b/javascript.editing/src/org/netbeans/modules/javascript/editing/options/BrowserPanel.java
@@ -46,15 +46,18 @@
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 {
diff --git a/maven/manifest.mf b/maven/manifest.mf
--- a/maven/manifest.mf
+++ b/maven/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.maven/2
-OpenIDE-Module-Specification-Version: 2.57
+OpenIDE-Module-Specification-Version: 2.58
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/maven/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/maven/layer.xml
AutoUpdate-Show-In-Client: false
diff --git a/maven/nbproject/project.xml b/maven/nbproject/project.xml
--- a/maven/nbproject/project.xml
+++ b/maven/nbproject/project.xml
@@ -197,7 +197,7 @@
1
- 1.8
+ 1.28
diff --git a/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java b/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java
--- a/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java
+++ b/maven/src/org/netbeans/modules/maven/options/GlobalOptionsPanel.java
@@ -46,11 +46,14 @@
import javax.swing.DefaultListModel;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
/**
*
* @author mkleint
*/
+@OptionsPanelController.Keywords(keywords={"maven global"}, location=JavaOptions.JAVA, index=5)
public class GlobalOptionsPanel extends javax.swing.JPanel {
private HashMap descMap;
diff --git a/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java b/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
--- a/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
+++ b/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
@@ -78,6 +78,8 @@
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import static org.netbeans.modules.maven.options.Bundle.*;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle.Messages;
/**
@@ -85,6 +87,7 @@
* are written to the settings file, some into the Netbeans settings..
* @author mkleint
*/
+@OptionsPanelController.Keywords(keywords={"maven"}, location=JavaOptions.JAVA, index=5)
public class SettingsPanel extends javax.swing.JPanel {
private static final String SEPARATOR = "SEPARATOR";
private static final String BUNDLED_RUNTIME_VERSION =
diff --git a/mobility.svgcore/manifest.mf b/mobility.svgcore/manifest.mf
--- a/mobility.svgcore/manifest.mf
+++ b/mobility.svgcore/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.mobility.svgcore
OpenIDE-Module-Layer: org/netbeans/modules/mobility/svgcore/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/mobility/svgcore/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.18
+OpenIDE-Module-Specification-Version: 1.19
AutoUpdate-Show-In-Client: false
diff --git a/mobility.svgcore/nbproject/project.xml b/mobility.svgcore/nbproject/project.xml
--- a/mobility.svgcore/nbproject/project.xml
+++ b/mobility.svgcore/nbproject/project.xml
@@ -99,7 +99,7 @@
1
- 1.4
+ 1.28
diff --git a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java
--- a/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java
+++ b/mobility.svgcore/src/org/netbeans/modules/mobility/svgcore/options/SvgcorePanel.java
@@ -49,12 +49,15 @@
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;
diff --git a/o.apache.tools.ant.module/nbproject/project.properties b/o.apache.tools.ant.module/nbproject/project.properties
--- a/o.apache.tools.ant.module/nbproject/project.properties
+++ b/o.apache.tools.ant.module/nbproject/project.properties
@@ -42,7 +42,7 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=3.58.0
+spec.version.base=3.59.0
compile.ant.jar=${ant.core.lib}
src-bridge.cp.extra=build/classes:${compile.ant.jar}
extra.module.files=\
diff --git a/o.apache.tools.ant.module/nbproject/project.xml b/o.apache.tools.ant.module/nbproject/project.xml
--- a/o.apache.tools.ant.module/nbproject/project.xml
+++ b/o.apache.tools.ant.module/nbproject/project.xml
@@ -82,7 +82,7 @@
1
- 1.8
+ 1.28
diff --git a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java
--- a/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java
+++ b/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntCustomizer.java
@@ -59,6 +59,8 @@
import javax.swing.JFileChooser;
import javax.swing.JPanel;
import javax.swing.SwingUtilities;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.execution.NbClassPath;
@@ -73,6 +75,7 @@
* Implementation of one panel in Options Dialog.
* @author Jan Jancura, Jesse Glick
*/
+@OptionsPanelController.Keywords(keywords={"ant"}, location=JavaOptions.JAVA, index=0)
public class AntCustomizer extends JPanel implements ActionListener {
private List classpath = Collections.emptyList();
diff --git a/options.editor/manifest.mf b/options.editor/manifest.mf
--- a/options.editor/manifest.mf
+++ b/options.editor/manifest.mf
@@ -2,6 +2,6 @@
OpenIDE-Module: org.netbeans.modules.options.editor/1
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/editor/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/editor/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.34
+OpenIDE-Module-Specification-Version: 1.35
AutoUpdate-Show-In-Client: false
diff --git a/options.editor/nbproject/project.xml b/options.editor/nbproject/project.xml
--- a/options.editor/nbproject/project.xml
+++ b/options.editor/nbproject/project.xml
@@ -136,7 +136,7 @@
1
- 1.3
+ 1.28
diff --git a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/AnnotationsPanel.java
@@ -71,7 +71,9 @@
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
import org.netbeans.api.editor.settings.EditorStyleConstants;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.ColorComboBox;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
@@ -80,6 +82,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords = {"annotations"}, location = OptionsDisplayer.FONTSANDCOLORS, index = 2)
public class AnnotationsPanel extends JPanel implements ActionListener,
ItemListener, FontsColorsController {
diff --git a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/FontAndColorsPanel.java
@@ -57,6 +57,8 @@
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.NotifyDescriptor.InputLine;
@@ -68,6 +70,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords = {"Fonts & Colors"}, location = OptionsDisplayer.FONTSANDCOLORS, index = 0)
public class FontAndColorsPanel extends JPanel implements ActionListener {
private final Collection extends FontsColorsController> panels;
diff --git a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/HighlightingPanel.java
@@ -70,7 +70,9 @@
import javax.swing.text.AttributeSet;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.ColorComboBox;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
@@ -79,6 +81,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"highlighting"}, location=OptionsDisplayer.FONTSANDCOLORS, index=1)
public class HighlightingPanel extends JPanel implements ActionListener, ItemListener, FontsColorsController {
private ColorModel colorModel = null;
diff --git a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
--- a/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/colors/SyntaxColoringPanel.java
@@ -83,8 +83,10 @@
import org.netbeans.api.editor.settings.EditorStyleConstants;
import org.netbeans.api.editor.settings.FontColorNames;
import org.netbeans.api.editor.settings.FontColorSettings;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.options.colors.ColorModel.Preview;
import org.netbeans.modules.options.colors.spi.FontsColorsController;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.awt.ColorComboBox;
@@ -97,6 +99,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"syntax coloring"}, location=OptionsDisplayer.FONTSANDCOLORS, index=0)
public class SyntaxColoringPanel extends JPanel implements ActionListener,
PropertyChangeListener, FontsColorsController, ItemListener {
diff --git a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java b/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/FolderBasedOptionPanel.java
@@ -56,6 +56,7 @@
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorRegistry;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
import org.netbeans.spi.options.OptionsPanelController;
@@ -63,6 +64,10 @@
*
* @author Dusan Balek
*/
+@OptionsPanelController.KeywordsRegistration({
+ @OptionsPanelController.Keywords(keywords = {"hints"}, location = OptionsDisplayer.EDITOR, index = 4),
+ @OptionsPanelController.Keywords(keywords = {"highlighting"}, location = OptionsDisplayer.EDITOR, index = 5)
+})
public final class FolderBasedOptionPanel extends JPanel implements ActionListener {
private final FolderBasedController controller;
diff --git a/options.editor/src/org/netbeans/modules/options/editor/completion/CodeCompletionOptionsPanel.java b/options.editor/src/org/netbeans/modules/options/editor/completion/CodeCompletionOptionsPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/completion/CodeCompletionOptionsPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/completion/CodeCompletionOptionsPanel.java
@@ -55,13 +55,16 @@
import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
import javax.swing.JPanel;
+import org.netbeans.api.options.OptionsDisplayer;
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 = OptionsDisplayer.EDITOR, index = 2)
public class CodeCompletionOptionsPanel extends JPanel implements PropertyChangeListener {
private CodeCompletionOptionsSelector selector;
diff --git a/options.editor/src/org/netbeans/modules/options/editor/completion/GeneralCompletionOptionsPanel.java b/options.editor/src/org/netbeans/modules/options/editor/completion/GeneralCompletionOptionsPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/completion/GeneralCompletionOptionsPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/completion/GeneralCompletionOptionsPanel.java
@@ -47,11 +47,14 @@
import java.util.prefs.Preferences;
import javax.swing.JPanel;
import org.netbeans.api.editor.settings.SimpleValueNames;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
/**
*
* @author Dusan Balek
*/
+@OptionsPanelController.Keywords(keywords = {"all languages"}, location = OptionsDisplayer.EDITOR, index = 2)
public class GeneralCompletionOptionsPanel extends JPanel {
private Preferences preferences;
diff --git a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java b/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveCommonPanel.java
@@ -49,6 +49,8 @@
import javax.swing.JList;
import javax.swing.ListCellRenderer;
import org.netbeans.api.editor.settings.SimpleValueNames;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
@@ -57,6 +59,7 @@
*
* @author Miloslav Metelka
*/
+@OptionsPanelController.Keywords(keywords = {"all languages"}, location = OptionsDisplayer.EDITOR, index = 7)
public class OnSaveCommonPanel extends javax.swing.JPanel {
private static final String[] LINE_OPTIONS = new String[] { "never", "always", "modified-lines" }; // NOI18N
diff --git a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java b/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java
--- a/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/editor/onsave/OnSaveTabPanel.java
@@ -50,7 +50,9 @@
import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
import javax.swing.JPanel;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.WeakListeners;
/**
@@ -58,6 +60,7 @@
*
* @author Miloslav Metelka
*/
+@OptionsPanelController.Keywords(keywords = {"on save"}, location = OptionsDisplayer.EDITOR, index = 7)
public class OnSaveTabPanel extends JPanel implements PropertyChangeListener {
private OnSaveCommonPanel commonPanel;
diff --git a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
--- a/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java
@@ -53,6 +53,8 @@
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.ListCellRenderer;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
@@ -61,6 +63,8 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"#KW_General_Editor"}, location=OptionsDisplayer.EDITOR, index=0)
+@NbBundle.Messages({"KW_General_Editor=general editor"})
public class GeneralEditorPanel extends JPanel implements ActionListener {
private boolean changed = false;
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
--- a/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/indentation/FormattingPanel.java
@@ -65,9 +65,11 @@
import javax.swing.text.Document;
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorRegistry;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
import org.netbeans.modules.options.editor.spi.PreviewProvider;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
import org.openide.util.WeakListeners;
@@ -75,6 +77,7 @@
*
* @author Dusan Balek
*/
+@OptionsPanelController.Keywords(keywords={"formatting"}, location=OptionsDisplayer.EDITOR, index=1)
public final class FormattingPanel extends JPanel implements PropertyChangeListener {
/** Creates new form FormattingPanel */
diff --git a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
--- a/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
+++ b/options.editor/src/org/netbeans/modules/options/indentation/IndentationPanel.java
@@ -79,10 +79,12 @@
import javax.swing.text.Document;
import org.netbeans.api.editor.mimelookup.MimePath;
import org.netbeans.api.editor.settings.SimpleValueNames;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.editor.BaseDocument;
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;
@@ -96,6 +98,7 @@
*
* @author Jan Jancura
*/
+@OptionsPanelController.Keywords(keywords={"indentation"}, location=OptionsDisplayer.EDITOR, index=1)
public class IndentationPanel extends JPanel implements ChangeListener, ActionListener, PreferenceChangeListener {
private static final Logger LOG = Logger.getLogger(IndentationPanel.class.getName());
diff --git a/options.keymap/manifest.mf b/options.keymap/manifest.mf
--- a/options.keymap/manifest.mf
+++ b/options.keymap/manifest.mf
@@ -2,7 +2,7 @@
OpenIDE-Module: org.netbeans.modules.options.keymap
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/options/keymap/Bundle.properties
OpenIDE-Module-Layer: org/netbeans/modules/options/keymap/mf-layer.xml
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
diff --git a/options.keymap/nbproject/project.xml b/options.keymap/nbproject/project.xml
--- a/options.keymap/nbproject/project.xml
+++ b/options.keymap/nbproject/project.xml
@@ -64,7 +64,7 @@
1
- 1.4
+ 1.28
diff --git a/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java b/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java
--- a/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java
+++ b/options.keymap/src/org/netbeans/modules/options/keymap/KeymapPanel.java
@@ -73,7 +73,9 @@
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;
@@ -83,6 +85,7 @@
*
* @author Max Sauer
*/
+@OptionsPanelController.Keywords(keywords={"keymaps"}, location=OptionsDisplayer.KEYMAPS)
public class KeymapPanel extends javax.swing.JPanel implements ActionListener, Popupable {
// Delay times for incremental search [ms]
diff --git a/profiler.options/manifest.mf b/profiler.options/manifest.mf
--- a/profiler.options/manifest.mf
+++ b/profiler.options/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.profiler.options
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/profiler/options/Bundle.properties
OpenIDE-Module-Recommends: org.netbeans.modules.options.java
-OpenIDE-Module-Specification-Version: 1.4
+OpenIDE-Module-Specification-Version: 1.5
diff --git a/profiler.options/nbproject/project.xml b/profiler.options/nbproject/project.xml
--- a/profiler.options/nbproject/project.xml
+++ b/profiler.options/nbproject/project.xml
@@ -20,7 +20,7 @@
1
- 1.22
+ 1.28
diff --git a/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java b/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
--- a/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
+++ b/profiler.options/src/org/netbeans/modules/profiler/options/ui/ProfilerOptionsPanel.java
@@ -54,7 +54,9 @@
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;
/**
@@ -107,6 +109,7 @@
"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 ------------------------------------------------------------------------------------------------------------
diff --git a/spellchecker/nbproject/project.properties b/spellchecker/nbproject/project.properties
--- a/spellchecker/nbproject/project.properties
+++ b/spellchecker/nbproject/project.properties
@@ -46,7 +46,7 @@
license.file=../standard-nbm-license.txt
nbm.homepage=http://spellchecker.netbeans.org
nbm.module.author=Jan Lahoda
-spec.version.base=1.22.0
+spec.version.base=1.23.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/spellchecker/nbproject/project.xml b/spellchecker/nbproject/project.xml
--- a/spellchecker/nbproject/project.xml
+++ b/spellchecker/nbproject/project.xml
@@ -83,7 +83,7 @@
1
- 1.14
+ 1.28
diff --git a/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java b/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java
--- a/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java
+++ b/spellchecker/src/org/netbeans/modules/spellchecker/options/DictionaryInstallerPanel.java
@@ -62,7 +62,9 @@
import javax.swing.JFileChooser;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.spellchecker.Utilities;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotificationLineSupport;
import org.openide.NotifyDescriptor;
@@ -74,6 +76,7 @@
/**
* @author David Kaspar
*/
+@OptionsPanelController.Keywords(keywords = {"install", "dictionary"}, location = OptionsDisplayer.EDITOR, index = 8)
public class DictionaryInstallerPanel extends javax.swing.JPanel {
private final JButton okButton;
diff --git a/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java b/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java
--- a/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java
+++ b/spellchecker/src/org/netbeans/modules/spellchecker/options/SpellcheckerOptionsPanel.java
@@ -82,11 +82,13 @@
import javax.swing.text.JTextComponent;
import org.netbeans.api.editor.EditorRegistry;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.spellchecker.ComponentPeer;
import org.netbeans.modules.spellchecker.DefaultLocaleQueryImplementation;
import org.netbeans.modules.spellchecker.DictionaryProviderImpl;
import org.netbeans.modules.spellchecker.options.DictionaryInstallerPanel.DictionaryDescription;
import org.netbeans.modules.spellchecker.spi.dictionary.DictionaryProvider;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.filesystems.FileObject;
@@ -102,6 +104,7 @@
*
* @author Jan Lahoda
*/
+@OptionsPanelController.Keywords(keywords = {"spellchecker"}, location = OptionsDisplayer.EDITOR, index = 8)
public class SpellcheckerOptionsPanel extends javax.swing.JPanel {
private List removedDictionaries = new ArrayList();
diff --git a/tasklist.todo/nbproject/project.properties b/tasklist.todo/nbproject/project.properties
--- a/tasklist.todo/nbproject/project.properties
+++ b/tasklist.todo/nbproject/project.properties
@@ -1,6 +1,6 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.18.0
+spec.version.base=1.19.0
#hook for apisupport TestBase
test-unit-sys-prop.test.nbcvsroot=${nb_all}
test-unit-sys-prop.xtest.netbeans.dest.dir=${netbeans.dest.dir}
diff --git a/tasklist.todo/nbproject/project.xml b/tasklist.todo/nbproject/project.xml
--- a/tasklist.todo/nbproject/project.xml
+++ b/tasklist.todo/nbproject/project.xml
@@ -11,7 +11,7 @@
1
- 1.5
+ 1.28
diff --git a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java b/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
--- a/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
+++ b/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
@@ -57,6 +57,7 @@
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableCellEditor;
import javax.swing.text.JTextComponent;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
@@ -64,6 +65,7 @@
*
* @author S. Aubrecht
*/
+@OptionsPanelController.Keywords(keywords={"#KW_ToDo", "action", "items"}, location=OptionsDisplayer.ADVANCED, tabTitle="#LBL_Options")
class ToDoCustomizer extends javax.swing.JPanel {
private boolean changed = false;
diff --git a/terminal/manifest.mf b/terminal/manifest.mf
--- a/terminal/manifest.mf
+++ b/terminal/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/terminal/Bundle.properties
OpenIDE-Module-Provides: org.openide.windows.IOProvider
OpenIDE-Module-Layer: org/netbeans/modules/terminal/layer.xml
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/terminal/nbproject/project.xml b/terminal/nbproject/project.xml
--- a/terminal/nbproject/project.xml
+++ b/terminal/nbproject/project.xml
@@ -37,7 +37,7 @@
1
- 1.11
+ 1.28
diff --git a/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java b/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java
--- a/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java
+++ b/terminal/src/org/netbeans/modules/terminal/TermAdvancedOption.java
@@ -46,6 +46,7 @@
import java.util.prefs.Preferences;
import java.beans.PropertyChangeListener;
import javax.swing.JComponent;
+import org.netbeans.api.options.OptionsDisplayer;
import org.openide.util.HelpCtx;
import org.openide.util.Lookup;
@@ -67,6 +68,7 @@
keywordsCategory="Advanced/TermAdvancedOption"// NOI18N
//tooltip="#CTL_Term_options" // NOI18N
)
+@OptionsPanelController.Keywords(keywords={"terminal"}, location=OptionsDisplayer.ADVANCED, tabTitle="#CTL_Term_options")
public final class TermAdvancedOption extends OptionsPanelController {
private TermOptions termOptions;
private TermOptions clonedTermOptions;
diff --git a/versioning.ui/nbproject/project.properties b/versioning.ui/nbproject/project.properties
--- a/versioning.ui/nbproject/project.properties
+++ b/versioning.ui/nbproject/project.properties
@@ -44,4 +44,4 @@
javac.compilerargs=-Xlint:unchecked
javac.source=1.6
-spec.version.base=1.6.0
+spec.version.base=1.7.0
diff --git a/versioning.ui/nbproject/project.xml b/versioning.ui/nbproject/project.xml
--- a/versioning.ui/nbproject/project.xml
+++ b/versioning.ui/nbproject/project.xml
@@ -117,7 +117,7 @@
1
- 1.23
+ 1.28
diff --git a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java b/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java
--- a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java
+++ b/versioning.ui/src/org/netbeans/modules/versioning/ui/options/GeneralOptionsPanel.java
@@ -54,14 +54,17 @@
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;
diff --git a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java b/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java
--- a/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java
+++ b/versioning.ui/src/org/netbeans/modules/versioning/ui/options/HistoryOptionsPanel.java
@@ -43,10 +43,14 @@
*/
package org.netbeans.modules.versioning.ui.options;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
+
/**
*
* @author Tomas Stupka
*/
+@OptionsPanelController.Keywords(keywords={"history", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
public class HistoryOptionsPanel extends javax.swing.JPanel {
/** Creates new form SvnOptionsPanel */
diff --git a/versioning.util/nbproject/project.properties b/versioning.util/nbproject/project.properties
--- a/versioning.util/nbproject/project.properties
+++ b/versioning.util/nbproject/project.properties
@@ -44,7 +44,7 @@
javac.source=1.6
javadoc.name=Versioning Support Utilities
-spec.version.base=1.28.0
+spec.version.base=1.29.0
is.autoload=true
# Fatal error: Fatal error: class javax.net.SocketFactory not found
diff --git a/versioning.util/nbproject/project.xml b/versioning.util/nbproject/project.xml
--- a/versioning.util/nbproject/project.xml
+++ b/versioning.util/nbproject/project.xml
@@ -108,7 +108,7 @@
1
- 1.4
+ 1.28
diff --git a/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java b/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java
--- a/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java
+++ b/versioning.util/src/org/netbeans/modules/versioning/util/VcsAdvancedOptionsPanel.java
@@ -46,11 +46,14 @@
import java.util.HashMap;
import javax.swing.DefaultListModel;
import javax.swing.JComponent;
+import org.netbeans.api.options.OptionsDisplayer;
+import org.netbeans.spi.options.OptionsPanelController;
/**
*
* @author pbuzek
*/
+@OptionsPanelController.Keywords(keywords={"systems", "versioning"}, location=OptionsDisplayer.ADVANCED, tabTitle="Versioning")
public class VcsAdvancedOptionsPanel extends javax.swing.JPanel {
HashMap versioningPanels = new HashMap();
diff --git a/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java b/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java
--- a/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java
+++ b/versioning.util/src/org/netbeans/modules/versioning/util/options/AnnotationColorsPanel.java
@@ -64,7 +64,9 @@
import java.beans.PropertyChangeEvent;
import java.util.*;
import org.netbeans.api.editor.settings.EditorStyleConstants;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.versioning.util.OptionsPanelColorProvider;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.Lookup;
import org.openide.util.LookupListener;
import org.openide.util.WeakListeners;
@@ -73,6 +75,7 @@
*
* @author Maros Sandor, Ondra Vrabec
*/
+@OptionsPanelController.Keywords(keywords={"versioning", "colors"}, location=OptionsDisplayer.FONTSANDCOLORS, index=4)
public class AnnotationColorsPanel extends javax.swing.JPanel implements ActionListener, FontsColorsController, PropertyChangeListener {
private boolean listen;
diff --git a/vmd.componentssupport/manifest.mf b/vmd.componentssupport/manifest.mf
--- a/vmd.componentssupport/manifest.mf
+++ b/vmd.componentssupport/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.vmd.componentssupport
OpenIDE-Module-Layer: org/netbeans/modules/vmd/componentssupport/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/vmd/componentssupport/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
diff --git a/vmd.componentssupport/nbproject/project.xml b/vmd.componentssupport/nbproject/project.xml
--- a/vmd.componentssupport/nbproject/project.xml
+++ b/vmd.componentssupport/nbproject/project.xml
@@ -27,7 +27,7 @@
1
- 1.8
+ 1.28
diff --git a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java
--- a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java
+++ b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/options/ComponentssupportPanel.java
@@ -44,12 +44,15 @@
package org.netbeans.modules.vmd.componentssupport.options;
import org.netbeans.api.visual.router.RouterFactory;
+import org.netbeans.modules.options.java.api.JavaOptions;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbPreferences;
/**
*
* @author Karol Harezlak
*/
+@OptionsPanelController.Keywords(keywords={"java me"}, location=JavaOptions.JAVA, index=4)
final class ComponentssupportPanel extends javax.swing.JPanel {
private static final String VMD_STRUCTURE_SHOW = "vmd.structure.show"; // NOI18N