diff --git a/cnd.debugger.common2/nbproject/project.properties b/cnd.debugger.common2/nbproject/project.properties
--- a/cnd.debugger.common2/nbproject/project.properties
+++ b/cnd.debugger.common2/nbproject/project.properties
@@ -4,7 +4,7 @@
build.compiler.deprecation=false
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=3.7.0
+spec.version.base=3.8.0
extra.module.files=bin/GdbKillProc.exe
# added by hand:
diff --git a/cnd.debugger.common2/nbproject/project.xml b/cnd.debugger.common2/nbproject/project.xml
--- a/cnd.debugger.common2/nbproject/project.xml
+++ b/cnd.debugger.common2/nbproject/project.xml
@@ -159,7 +159,7 @@
1
- 1.10.2
+ 1.28
diff --git a/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/options/GlobalOptionsPanel.java b/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/options/GlobalOptionsPanel.java
--- a/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/options/GlobalOptionsPanel.java
+++ b/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/debugger/options/GlobalOptionsPanel.java
@@ -54,6 +54,8 @@
import javax.swing.border.*;
import javax.swing.tree.TreeSelectionModel;
import java.beans.*;
+import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbCollections;
import org.openide.explorer.ExplorerManager;
@@ -67,6 +69,7 @@
// roughly modelled on
// org.netbeans.modules.cnd.execution.profiles.ui.ProfileCustomizer
+@OptionsPanelController.Keywords(keywords={"c/c++ debugging"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=3)
public class GlobalOptionsPanel extends JPanel {
private OptionSet options;
diff --git a/cnd.makeproject/nbproject/project.properties b/cnd.makeproject/nbproject/project.properties
--- a/cnd.makeproject/nbproject/project.properties
+++ b/cnd.makeproject/nbproject/project.properties
@@ -3,7 +3,7 @@
sigtest.mail=cvs@cnd.netbeans.org
-spec.version.base=2.13.0
+spec.version.base=2.14.0
test.config.stableBTD.includes=**/*Test.class
test.config.stableBTD.excludes=\
diff --git a/cnd.makeproject/nbproject/project.xml b/cnd.makeproject/nbproject/project.xml
--- a/cnd.makeproject/nbproject/project.xml
+++ b/cnd.makeproject/nbproject/project.xml
@@ -147,7 +147,7 @@
1
- 1.5
+ 1.28
diff --git a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/options/ProjectOptionsPanel.java b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/options/ProjectOptionsPanel.java
--- a/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/options/ProjectOptionsPanel.java
+++ b/cnd.makeproject/src/org/netbeans/modules/cnd/makeproject/ui/options/ProjectOptionsPanel.java
@@ -53,7 +53,9 @@
import javax.swing.JSeparator;
import org.netbeans.modules.cnd.makeproject.MakeOptions;
import org.netbeans.modules.cnd.makeproject.api.MakeProjectOptions;
+import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.cnd.utils.ui.NamedOption;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;
@@ -61,6 +63,7 @@
/**
* Replaces the old project system options panel.
*/
+@OptionsPanelController.Keywords(keywords={"c/c++ project options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=1)
public class ProjectOptionsPanel extends JPanel {
private boolean changed;
diff --git a/cnd.toolchain/nbproject/project.properties b/cnd.toolchain/nbproject/project.properties
--- a/cnd.toolchain/nbproject/project.properties
+++ b/cnd.toolchain/nbproject/project.properties
@@ -1,6 +1,6 @@
is.autoload=true
javac.source=1.6
javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.14.0
+spec.version.base=1.15.0
test.config.stableBTD.includes=**/*Test.class
diff --git a/cnd.toolchain/nbproject/project.xml b/cnd.toolchain/nbproject/project.xml
--- a/cnd.toolchain/nbproject/project.xml
+++ b/cnd.toolchain/nbproject/project.xml
@@ -87,7 +87,7 @@
1
- 1.17
+ 1.28
diff --git a/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/compiler/ParserSettingsPanel.java b/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/compiler/ParserSettingsPanel.java
--- a/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/compiler/ParserSettingsPanel.java
+++ b/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/compiler/ParserSettingsPanel.java
@@ -73,11 +73,14 @@
import org.netbeans.modules.cnd.api.toolchain.ui.ToolsCacheManager;
import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;
import org.netbeans.modules.cnd.utils.NamedRunnable;
+import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
+@OptionsPanelController.Keywords(keywords={"c/c++ code assistance"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=2)
public class ParserSettingsPanel extends JPanel implements ChangeListener, ActionListener, IsChangedListener {
private Map predefinedPanels = new WeakHashMap();
diff --git a/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/options/ToolsPanel.java b/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/options/ToolsPanel.java
--- a/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/options/ToolsPanel.java
+++ b/cnd.toolchain/src/org/netbeans/modules/cnd/toolchain/ui/options/ToolsPanel.java
@@ -77,11 +77,13 @@
import org.netbeans.modules.cnd.api.toolchain.ui.ToolsPanelSupport;
import org.netbeans.modules.cnd.toolchain.compilerset.CompilerSetImpl;
import org.netbeans.modules.cnd.toolchain.compilerset.CompilerSetManagerImpl;
+import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironment;
import org.netbeans.modules.nativeexecution.api.ExecutionEnvironmentFactory;
import org.netbeans.modules.nativeexecution.api.util.ConnectionManager;
import org.netbeans.modules.nativeexecution.api.util.ConnectionManager.CancellationException;
import org.netbeans.modules.nativeexecution.api.util.HostInfoUtils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
@@ -94,6 +96,7 @@
import org.openide.util.RequestProcessor;
/** Display the "Tools Default" panel */
+@OptionsPanelController.Keywords(keywords={"c/c++ build tools"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=0)
public final class ToolsPanel extends JPanel implements ActionListener,
ListSelectionListener, ItemListener {
diff --git a/cnd/nbproject/project.properties b/cnd/nbproject/project.properties
--- a/cnd/nbproject/project.properties
+++ b/cnd/nbproject/project.properties
@@ -3,7 +3,7 @@
javahelp.hs=cnd.hs
sigtest.mail=cvs@cnd.netbeans.org
-spec.version.base=1.19.0
+spec.version.base=1.20.0
nbm.executable.files=bin/dorun.sh
diff --git a/cnd/nbproject/project.xml b/cnd/nbproject/project.xml
--- a/cnd/nbproject/project.xml
+++ b/cnd/nbproject/project.xml
@@ -96,7 +96,7 @@
1
- 1.5
+ 1.28
diff --git a/cnd/src/org/netbeans/modules/cnd/ui/options/CndOtherOptionsPanel.java b/cnd/src/org/netbeans/modules/cnd/ui/options/CndOtherOptionsPanel.java
--- a/cnd/src/org/netbeans/modules/cnd/ui/options/CndOtherOptionsPanel.java
+++ b/cnd/src/org/netbeans/modules/cnd/ui/options/CndOtherOptionsPanel.java
@@ -59,8 +59,10 @@
import javax.swing.JPanel;
import javax.swing.LayoutStyle;
import org.netbeans.modules.cnd.utils.MIMEExtensions;
+import org.netbeans.modules.cnd.utils.ui.CndUIConstants;
import org.netbeans.modules.cnd.utils.ui.NamedOption;
import org.netbeans.modules.cnd.utils.ui.StringArrayCustomEditor;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
@@ -72,6 +74,7 @@
*
* @author sg155630
*/
+@OptionsPanelController.Keywords(keywords={"c/c++ other options"}, location=CndUIConstants.TOOLS_OPTIONS_CND_CATEGORY_ID, index=4)
/*package-local*/ final class CndOtherOptionsPanel extends javax.swing.JPanel implements ActionListener {
public CndOtherOptionsPanel() {
diff --git a/hudson.php/manifest.mf b/hudson.php/manifest.mf
--- a/hudson.php/manifest.mf
+++ b/hudson.php/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.hudson.php
OpenIDE-Module-Layer: org/netbeans/modules/hudson/php/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/hudson/php/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.5
+OpenIDE-Module-Specification-Version: 1.6
diff --git a/hudson.php/nbproject/project.xml b/hudson.php/nbproject/project.xml
--- a/hudson.php/nbproject/project.xml
+++ b/hudson.php/nbproject/project.xml
@@ -28,7 +28,7 @@
1
- 1.25
+ 1.28
diff --git a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
--- a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
+++ b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java
@@ -69,6 +69,7 @@
import org.netbeans.modules.hudson.php.options.HudsonOptionsValidator;
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -80,6 +81,7 @@
/**
*
*/
+@OptionsPanelController.Keywords(keywords={"php hudson"}, location=UiUtils.OPTIONS_PATH, index=4)
public class HudsonOptionsPanel extends JPanel {
private static final long serialVersionUID = -464132465732132L;
diff --git a/php.apigen/manifest.mf b/php.apigen/manifest.mf
--- a/php.apigen/manifest.mf
+++ b/php.apigen/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.apigen
OpenIDE-Module-Layer: org/netbeans/modules/php/apigen/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/apigen/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.6
+OpenIDE-Module-Specification-Version: 1.7
OpenIDE-Module-Recommends: cnb.org.netbeans.modules.languages.neon
diff --git a/php.apigen/nbproject/project.xml b/php.apigen/nbproject/project.xml
--- a/php.apigen/nbproject/project.xml
+++ b/php.apigen/nbproject/project.xml
@@ -29,7 +29,7 @@
1
- 1.25
+ 1.28
diff --git a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java
--- a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java
+++ b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java
@@ -66,6 +66,7 @@
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.apigen.commands.ApiGenScript;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -74,6 +75,7 @@
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"php apigen"}, location=UiUtils.OPTIONS_PATH, index=5)
public class ApiGenOptionsPanel extends JPanel {
private static final long serialVersionUID = 458797646546L;
diff --git a/php.composer/manifest.mf b/php.composer/manifest.mf
--- a/php.composer/manifest.mf
+++ b/php.composer/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.composer
OpenIDE-Module-Layer: org/netbeans/modules/php/composer/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/composer/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.4
+OpenIDE-Module-Specification-Version: 0.5
diff --git a/php.composer/nbproject/project.xml b/php.composer/nbproject/project.xml
--- a/php.composer/nbproject/project.xml
+++ b/php.composer/nbproject/project.xml
@@ -20,7 +20,7 @@
1
- 1.27
+ 1.28
diff --git a/php.composer/src/org/netbeans/modules/php/composer/ui/options/ComposerOptionsPanel.java b/php.composer/src/org/netbeans/modules/php/composer/ui/options/ComposerOptionsPanel.java
--- a/php.composer/src/org/netbeans/modules/php/composer/ui/options/ComposerOptionsPanel.java
+++ b/php.composer/src/org/netbeans/modules/php/composer/ui/options/ComposerOptionsPanel.java
@@ -64,6 +64,7 @@
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.composer.commands.Composer;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -72,6 +73,7 @@
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"php composer"}, location=UiUtils.OPTIONS_PATH, index=7)
public class ComposerOptionsPanel extends JPanel {
private static final long serialVersionUID = 871513576876878676L;
diff --git a/php.doctrine2/manifest.mf b/php.doctrine2/manifest.mf
--- a/php.doctrine2/manifest.mf
+++ b/php.doctrine2/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.doctrine2
OpenIDE-Module-Layer: org/netbeans/modules/php/doctrine2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/doctrine2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.11
+OpenIDE-Module-Specification-Version: 1.12
diff --git a/php.doctrine2/nbproject/project.xml b/php.doctrine2/nbproject/project.xml
--- a/php.doctrine2/nbproject/project.xml
+++ b/php.doctrine2/nbproject/project.xml
@@ -29,7 +29,7 @@
1
- 1.25
+ 1.28
diff --git a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java
--- a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java
+++ b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java
@@ -64,6 +64,7 @@
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.doctrine2.commands.Doctrine2Script;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -75,6 +76,7 @@
/**
* Panel for Doctrine2 options.
*/
+@OptionsPanelController.Keywords(keywords={"php doctrine2"}, location=UiUtils.OPTIONS_PATH, index=12)
public class Doctrine2OptionsPanel extends JPanel {
private static final long serialVersionUID = 67643468774654L;
diff --git a/php.phpdoc/manifest.mf b/php.phpdoc/manifest.mf
--- a/php.phpdoc/manifest.mf
+++ b/php.phpdoc/manifest.mf
@@ -3,5 +3,5 @@
OpenIDE-Module: org.netbeans.modules.php.phpdoc
OpenIDE-Module-Layer: org/netbeans/modules/php/phpdoc/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/phpdoc/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.10
+OpenIDE-Module-Specification-Version: 1.11
diff --git a/php.phpdoc/nbproject/project.xml b/php.phpdoc/nbproject/project.xml
--- a/php.phpdoc/nbproject/project.xml
+++ b/php.phpdoc/nbproject/project.xml
@@ -20,7 +20,7 @@
1
- 1.19
+ 1.28
diff --git a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java
--- a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java
+++ b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java
@@ -65,6 +65,7 @@
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.phpdoc.PhpDocScript;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -73,6 +74,7 @@
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"php doc"}, location=UiUtils.OPTIONS_PATH, index=6)
public final class PhpDocOptionsPanel extends JPanel {
private static final long serialVersionUID = 18784654654113L;
private static final String PHPDOC_LAST_FOLDER_SUFFIX = ".phpdoc"; // NOI18N
diff --git a/php.project/manifest.mf b/php.project/manifest.mf
--- a/php.project/manifest.mf
+++ b/php.project/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: false
-OpenIDE-Module-Specification-Version: 2.57
+OpenIDE-Module-Specification-Version: 2.58
OpenIDE-Module: org.netbeans.modules.php.project
OpenIDE-Module-Layer: org/netbeans/modules/php/project/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/project/resources/Bundle.properties
diff --git a/php.project/nbproject/project.xml b/php.project/nbproject/project.xml
--- a/php.project/nbproject/project.xml
+++ b/php.project/nbproject/project.xml
@@ -222,7 +222,7 @@
1
- 1.5
+ 1.28
diff --git a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java
--- a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java
+++ b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java
@@ -71,6 +71,7 @@
import org.netbeans.modules.php.project.phpunit.PhpUnitSkelGen;
import org.netbeans.modules.php.project.ui.LastUsedFolders;
import org.netbeans.modules.php.project.ui.Utils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -82,6 +83,7 @@
/**
* @author Tomas Mysik
*/
+@OptionsPanelController.Keywords(keywords={"php unit testing"}, location=UiUtils.OPTIONS_PATH, index=2)
public class PhpUnitOptionsPanel extends JPanel {
private static final long serialVersionUID = -6453232134654321L;
diff --git a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpAnnotationsPanel.java b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpAnnotationsPanel.java
--- a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpAnnotationsPanel.java
+++ b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpAnnotationsPanel.java
@@ -65,11 +65,14 @@
import javax.swing.event.ListSelectionListener;
import javax.swing.table.AbstractTableModel;
import org.netbeans.modules.php.api.util.StringUtils;
+import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.project.annotations.UserAnnotationPanel;
import org.netbeans.modules.php.project.annotations.UserAnnotationTag;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.NbBundle;
+@OptionsPanelController.Keywords(keywords={"php anotations"}, location=UiUtils.OPTIONS_PATH, index=3)
public class PhpAnnotationsPanel extends JPanel {
private static final long serialVersionUID = 89732416546545L;
diff --git a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpDebuggerPanel.java b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpDebuggerPanel.java
--- a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpDebuggerPanel.java
+++ b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpDebuggerPanel.java
@@ -58,6 +58,8 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.modules.php.api.util.UiUtils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.awt.Mnemonics;
@@ -67,6 +69,7 @@
/**
* UI for PHP debugging options.
*/
+@OptionsPanelController.Keywords(keywords={"php debugger"}, location=UiUtils.OPTIONS_PATH, index=1)
public class PhpDebuggerPanel extends JPanel {
private static final long serialVersionUID = 9465641111345L;
diff --git a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
--- a/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
+++ b/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
@@ -70,6 +70,7 @@
import org.netbeans.modules.php.project.ui.LastUsedFolders;
import org.netbeans.modules.php.project.ui.PathUiSupport;
import org.netbeans.modules.php.project.ui.Utils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.Mnemonics;
import org.openide.util.ChangeSupport;
import org.openide.util.NbBundle;
@@ -77,6 +78,7 @@
/**
* @author Tomas Mysik
*/
+@OptionsPanelController.Keywords(keywords={"php"}, location=UiUtils.OPTIONS_PATH, index=0)
public final class PhpOptionsPanel extends JPanel {
private static final long serialVersionUID = 10985641247986428L;
diff --git a/php.smarty/manifest.mf b/php.smarty/manifest.mf
--- a/php.smarty/manifest.mf
+++ b/php.smarty/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.smarty
OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.70
+OpenIDE-Module-Specification-Version: 1.71
diff --git a/php.smarty/nbproject/project.xml b/php.smarty/nbproject/project.xml
--- a/php.smarty/nbproject/project.xml
+++ b/php.smarty/nbproject/project.xml
@@ -137,7 +137,7 @@
1
- 1.17
+ 1.28
diff --git a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java
--- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java
+++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java
@@ -68,8 +68,10 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.smarty.SmartyFramework;
import org.netbeans.modules.php.smarty.SmartyFramework.ToggleCommentOption;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.util.ChangeSupport;
@@ -79,6 +81,7 @@
/**
* @author Martin Fousek
*/
+@OptionsPanelController.Keywords(keywords={"php smarty"}, location=UiUtils.OPTIONS_PATH, index=11)
public class SmartyOptionsPanel extends JPanel {
private static final long serialVersionUID = -1384644114740L;
diff --git a/php.symfony/manifest.mf b/php.symfony/manifest.mf
--- a/php.symfony/manifest.mf
+++ b/php.symfony/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.symfony
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
diff --git a/php.symfony/nbproject/project.xml b/php.symfony/nbproject/project.xml
--- a/php.symfony/nbproject/project.xml
+++ b/php.symfony/nbproject/project.xml
@@ -47,7 +47,7 @@
1
- 1.13
+ 1.28
diff --git a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java
--- a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java
+++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java
@@ -68,6 +68,7 @@
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.symfony.SymfonyScript;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -79,6 +80,7 @@
/**
* @author Tomas Mysik
*/
+@OptionsPanelController.Keywords(keywords={"php sympfony"}, location=UiUtils.OPTIONS_PATH, index=9)
public class SymfonyOptionsPanel extends JPanel {
private static final long serialVersionUID = -1384645646121L;
private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";
@@ -302,7 +304,7 @@
symfonyLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleName")); symfonyLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyLabel.AccessibleContext.accessibleDescription")); symfonyTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleName")); symfonyTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyTextField.AccessibleContext.accessibleDescription")); browseButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleName")); browseButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.browseButton.AccessibleContext.accessibleDescription")); searchButton.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleName")); searchButton.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.searchButton.AccessibleContext.accessibleDescription")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleName")); symfonyScriptUsageLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.symfonyScriptUsageLabel.AccessibleContext.accessibleDescription")); runningInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleName")); runningInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.runningInfoLabel.AccessibleContext.accessibleDescription")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleName")); ignoreCacheCheckBox.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.ignoreCacheCheckBox.AccessibleContext.accessibleDescription")); defaultParametersLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleName")); defaultParametersLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleName")); defaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectLabel.AccessibleContext.accessibleDescription")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleName")); defaultParametersForProjectTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForProjectTextField.AccessibleContext.accessibleDescription")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleName")); infoDefaultParametersForProjectLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.jLabel1.AccessibleContext.accessibleDescription")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleName")); defaultParametersForAppsLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsLabel.AccessibleContext.accessibleDescription")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleName")); defaultParametersForAppsTextField.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.defaultParametersForAppsTextField.AccessibleContext.accessibleDescription")); noteLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleName")); noteLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.noteLabel.AccessibleContext.accessibleDescription")); includePathInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleName")); includePathInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.includePathInfoLabel.AccessibleContext.accessibleDescription")); installationInfoLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleName")); installationInfoLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.installationInfoLabel.AccessibleContext.accessibleDescription")); learnMoreLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleName")); learnMoreLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.learnMoreLabel.AccessibleContext.accessibleDescription")); errorLabel.getAccessibleContext().setAccessibleName(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleName")); errorLabel.getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.errorLabel.AccessibleContext.accessibleDescription"));
getAccessibleContext().setAccessibleDescription(NbBundle.getMessage(SymfonyOptionsPanel.class, "SymfonyOptionsPanel.AccessibleContext.accessibleDescription")); // NOI18N
- }// //GEN-END:initComponents
+ }// //GEN-END:initComponents
private void browseButtonActionPerformed(ActionEvent evt) {//GEN-FIRST:event_browseButtonActionPerformed
File symfonyScript = new FileChooserBuilder(SymfonyOptionsPanel.class.getName() + SYMFONY_LAST_FOLDER_SUFFIX)
diff --git a/php.symfony2/manifest.mf b/php.symfony2/manifest.mf
--- a/php.symfony2/manifest.mf
+++ b/php.symfony2/manifest.mf
@@ -2,4 +2,4 @@
OpenIDE-Module: org.netbeans.modules.php.symfony2/1
OpenIDE-Module-Layer: org/netbeans/modules/php/symfony2/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/symfony2/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.9
+OpenIDE-Module-Specification-Version: 1.10
diff --git a/php.symfony2/nbproject/project.xml b/php.symfony2/nbproject/project.xml
--- a/php.symfony2/nbproject/project.xml
+++ b/php.symfony2/nbproject/project.xml
@@ -38,7 +38,7 @@
1
- 1.24
+ 1.28
diff --git a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java
--- a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java
+++ b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java
@@ -64,6 +64,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.filechooser.FileFilter;
+import org.netbeans.modules.php.api.util.UiUtils;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.awt.HtmlBrowser;
import org.openide.awt.Mnemonics;
import org.openide.filesystems.FileChooserBuilder;
@@ -75,6 +77,7 @@
/**
* Panel for SYmfony2 options.
*/
+@OptionsPanelController.Keywords(keywords={"php sympfony2"}, location=UiUtils.OPTIONS_PATH, index=8)
@NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)")
public class Symfony2OptionsPanel extends JPanel {
diff --git a/php.zend/manifest.mf b/php.zend/manifest.mf
--- a/php.zend/manifest.mf
+++ b/php.zend/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.php.zend
OpenIDE-Module-Layer: org/netbeans/modules/php/zend/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/zend/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.14
+OpenIDE-Module-Specification-Version: 1.15
diff --git a/php.zend/nbproject/project.xml b/php.zend/nbproject/project.xml
--- a/php.zend/nbproject/project.xml
+++ b/php.zend/nbproject/project.xml
@@ -38,7 +38,7 @@
1
- 1.17
+ 1.28
diff --git a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java b/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java
--- a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java
+++ b/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java
@@ -64,10 +64,12 @@
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
+import org.netbeans.api.options.OptionsDisplayer;
import org.netbeans.modules.php.api.executable.InvalidPhpExecutableException;
import org.netbeans.modules.php.api.util.FileUtils;
import org.netbeans.modules.php.api.util.UiUtils;
import org.netbeans.modules.php.zend.ZendScript;
+import org.netbeans.spi.options.OptionsPanelController;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.awt.HtmlBrowser;
@@ -82,6 +84,7 @@
/**
* @author Tomas Mysik
*/
+@OptionsPanelController.Keywords(keywords={"php zend"}, location=UiUtils.OPTIONS_PATH, index=10)
public final class ZendOptionsPanel extends JPanel {
private static final long serialVersionUID = -13564875423210L;
private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";