diff --git a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties --- a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties +++ b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties @@ -38,7 +38,7 @@ # # Portions Copyrighted 2011 Sun Microsystems, Inc. -LBL_OptionsName=Hudson +LBL_HudsonPHPOptionsName=Hudson HudsonOptionsPanel.ppwLabel.text=&PPW Script: HudsonOptionsPanel.note1Label.text=Note: HudsonOptionsPanel.ppwBrowseButton.text=&Browse... 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 @@ -86,7 +86,7 @@ "HudsonOptionsPanel.keywords.build=Build" }) @OptionsPanelController.Keywords( - location = UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName", + location = UiUtils.OPTIONS_PATH, tabTitle= "#LBL_HudsonPHPOptionsName", keywords = {"php", "hudson", "jenkins", "ppw", "job", "build", "#HudsonOptionsPanel.keywords.job", "#HudsonOptionsPanel.keywords.build"}) public class HudsonOptionsPanel extends JPanel { diff --git a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java --- a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java +++ b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java @@ -60,7 +60,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=HudsonOptionsPanelController.OPTIONS_SUBPATH, - displayName="#LBL_OptionsName", + displayName="#LBL_HudsonPHPOptionsName", // toolTip="#LBL_OptionsTooltip" position=160 ) diff --git a/ide.ergonomics/nbproject/project.xml b/ide.ergonomics/nbproject/project.xml --- a/ide.ergonomics/nbproject/project.xml +++ b/ide.ergonomics/nbproject/project.xml @@ -50,6 +50,15 @@ + org.netbeans.modules.options.api + + + + 1 + 1.27 + + + org.netbeans.modules.project.ant diff --git a/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl b/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl --- a/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl +++ b/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl @@ -55,6 +55,13 @@ + + + OptionsDialog + + + + org-netbeans-api-project-libraries @@ -276,6 +283,44 @@ + + + + + + + + + + + + + + + + + controller + org.netbeans.modules.ide.ergonomics.fod.OptionCntrl.basic + + + + + + + + + + + + + + controller + org.netbeans.modules.ide.ergonomics.fod.OptionCntrl.advanced + + + + + diff --git a/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java b/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java new file mode 100644 --- /dev/null +++ b/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java @@ -0,0 +1,136 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 2012 Oracle and/or its affiliates. All rights reserved. + * + * Oracle and Java are registered trademarks of Oracle and/or its affiliates. + * Other names may be trademarks of their respective owners. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common + * Development and Distribution License("CDDL") (collectively, the + * "License"). You may not use this file except in compliance with the + * License. You can obtain a copy of the License at + * http://www.netbeans.org/cddl-gplv2.html + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the + * specific language governing permissions and limitations under the + * License. When distributing the software, include this License Header + * Notice in each file and include the License file at + * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the + * License Header, with the fields enclosed by brackets [] replaced by + * your own identifying information: + * "Portions Copyrighted [year] [name of copyright owner]" + * + * If you wish your version of this file to be governed by only the CDDL + * or only the GPL Version 2, indicate your decision by adding + * "[Contributor] elects to include this software in this distribution + * under the [CDDL or GPL Version 2] license." If you do not indicate a + * single choice of license, a recipient has the option to distribute + * your version of this file under either the CDDL, the GPL Version 2 or + * to extend the choice of license to its licensees as provided above. + * However, if you add GPL Version 2 code and therefore, elected the GPL + * Version 2 license, then the option applies only if the new code is + * made subject to such option by the copyright holder. + * + * Contributor(s): + * + * Portions Copyrighted 2012 Sun Microsystems, Inc. + */ +package org.netbeans.modules.ide.ergonomics.fod; + +import java.awt.EventQueue; +import java.beans.PropertyChangeListener; +import java.util.concurrent.Callable; +import javax.swing.JButton; +import javax.swing.JComponent; +import org.netbeans.api.options.OptionsDisplayer; +import org.netbeans.spi.options.OptionsPanelController; +import org.openide.filesystems.FileObject; +import org.openide.util.HelpCtx; +import org.openide.util.Lookup; + +/** + * + * @author Jaroslav Tulach + */ +public final class OptionCntrl extends OptionsPanelController +implements Callable, Runnable { + private final FileObject fo; + private ConfigurationPanel panel; + private Lookup master; + + public OptionCntrl(FileObject fo) { + this.fo = fo; + } + + static OptionsPanelController advanced(FileObject fo) { + return new OptionCntrl(fo); + } + + static OptionsPanelController basic(FileObject fo) { + return new OptionCntrl(fo); + } + + @Override + public void update() { + } + + @Override + public void applyChanges() { + } + + @Override + public void cancel() { + } + + @Override + public boolean isValid() { + return true; + } + + @Override + public boolean isChanged() { + return false; + } + + @Override + public JComponent getComponent(Lookup masterLookup) { + if (panel == null) { + FeatureInfo info = FoDLayersProvider.getInstance().whichProvides(fo); + assert info != null; + master = masterLookup; + panel = new ConfigurationPanel(info.clusterName, this, info, false); + } + return panel; + } + + @Override + public JComponent call() throws Exception { + assert EventQueue.isDispatchThread(); + // it would be better not to close the dialog... + EventQueue.invokeLater(this); + return new JButton(); + } + + @Override + public void run() { + OptionsDisplayer.getDefault().open(); + } + + @Override + public HelpCtx getHelpCtx() { + return HelpCtx.DEFAULT_HELP; + } + + @Override + public void addPropertyChangeListener(PropertyChangeListener l) { + } + + @Override + public void removePropertyChangeListener(PropertyChangeListener l) { + } + +} diff --git a/options.api/test/qa-functional/src/org/netbeans/modules/options/SearchInOptionsTest.java b/options.api/test/qa-functional/src/org/netbeans/modules/options/FoDSearchInOptionsTest.java copy from options.api/test/qa-functional/src/org/netbeans/modules/options/SearchInOptionsTest.java copy to options.api/test/qa-functional/src/org/netbeans/modules/options/FoDSearchInOptionsTest.java --- a/options.api/test/qa-functional/src/org/netbeans/modules/options/SearchInOptionsTest.java +++ b/options.api/test/qa-functional/src/org/netbeans/modules/options/FoDSearchInOptionsTest.java @@ -62,7 +62,7 @@ * * @author theofanis */ -public class SearchInOptionsTest extends JellyTestCase { +public class FoDSearchInOptionsTest extends JellyTestCase { private StringComparator stringComparator; private OptionsOperator optionsOperator; @@ -72,7 +72,7 @@ /** * Constructor required by JUnit */ - public SearchInOptionsTest(String testName) { + public FoDSearchInOptionsTest(String testName) { super(testName); } @@ -80,8 +80,8 @@ * Creates suite from particular test cases. */ public static Test suite() { - return NbModuleSuite.createConfiguration(SearchInOptionsTest.class).addTest( - "testSearchInOptionsWindow").clusters(".*").enableModules(".*").gui(true).suite(); + return NbModuleSuite.createConfiguration(FoDSearchInOptionsTest.class).addTest( + "testSearchInOptionsWindow").clusters(".*").gui(true).suite(); } public void testSearchInOptionsWindow() { @@ -99,87 +99,56 @@ String[] selectedCategories = {"Editor"}; ArrayList enabledCategories = new ArrayList(); enabledCategories.add("Editor"); - searchFor("general editor", tabIndexes, selectedCategories, enabledCategories); + searchFor("general editor", tabIndexes, selectedCategories, enabledCategories, null); tabIndexes[0] = 6; - searchFor("macros", tabIndexes, selectedCategories, enabledCategories); + searchFor("macros", tabIndexes, selectedCategories, enabledCategories, null); tabIndexes[0] = 2; - searchFor("completion", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 3; - searchFor("templates", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 8; - searchFor("dictionary", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 7; - searchFor("on save", tabIndexes, selectedCategories, enabledCategories); + searchFor("completion", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.clear(); enabledCategories.add("General"); tabIndexes[0] = -1; selectedCategories[0] = "General"; - searchFor("proxy", tabIndexes, selectedCategories, enabledCategories); + searchFor("proxy", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.clear(); enabledCategories.add("Fonts & Colors"); tabIndexes[0] = 0; selectedCategories[0] = "FontsAndColors"; - searchFor("syntax", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 1; - searchFor("highlighting", tabIndexes, selectedCategories, enabledCategories); + searchFor("syntax", tabIndexes, selectedCategories, enabledCategories, null); tabIndexes[0] = 4; - searchFor("versioning", tabIndexes, selectedCategories, enabledCategories); - - enabledCategories.clear(); - enabledCategories.add("Keymap"); - tabIndexes[0] = -1; - selectedCategories[0] = "Keymaps"; - searchFor("keymap", tabIndexes, selectedCategories, enabledCategories); + searchFor("versioning", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.clear(); enabledCategories.add("Java"); - tabIndexes[0] = 5; + tabIndexes[0] = 4; selectedCategories[0] = "Java"; - searchFor("maven", tabIndexes, selectedCategories, enabledCategories); + searchFor("maven", tabIndexes, selectedCategories, enabledCategories, "java"); tabIndexes[0] = 0; selectedCategories[0] = "Java"; - searchFor("ant", tabIndexes, selectedCategories, enabledCategories); + searchFor("ant", tabIndexes, selectedCategories, enabledCategories, null); - enabledCategories.add("Miscellaneous"); - tabIndexes[0] = 4; + tabIndexes[0] = 6; selectedCategories[0] = "Java"; - searchFor("me", tabIndexes, selectedCategories, enabledCategories); + searchFor("fx", tabIndexes, selectedCategories, enabledCategories, "javafx"); - enabledCategories.clear(); - enabledCategories.add("Java"); - tabIndexes = new int[1]; - selectedCategories = new String[1]; - tabIndexes[0] = 7; + tabIndexes[0] = 2; selectedCategories[0] = "Java"; - searchFor("fx", tabIndexes, selectedCategories, enabledCategories); + searchFor("java card", tabIndexes, selectedCategories, enabledCategories, "javacard"); enabledCategories.clear(); enabledCategories.add("Miscellaneous"); tabIndexes[0] = 3; selectedCategories[0] = "Miscellaneous"; - searchFor("groovy", tabIndexes, selectedCategories, enabledCategories); + searchFor("groovy", tabIndexes, selectedCategories, enabledCategories, "groovy"); - tabIndexes[0] = 5; + tabIndexes[0] = 6; selectedCategories[0] = "Miscellaneous"; - searchFor("javascript", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 7; - selectedCategories[0] = "Miscellaneous"; - searchFor("svg", tabIndexes, selectedCategories, enabledCategories); - - tabIndexes[0] = 8; - selectedCategories[0] = "Miscellaneous"; - searchFor("terminal", tabIndexes, selectedCategories, enabledCategories); + searchFor("terminal", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.add("Fonts & Colors"); tabIndexes = new int[2]; @@ -188,7 +157,7 @@ tabIndexes[1] = 1; selectedCategories[0] = "FontsAndColors"; selectedCategories[1] = "Miscellaneous"; - searchFor("diff", tabIndexes, selectedCategories, enabledCategories); + searchFor("diff", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.clear(); enabledCategories.add("PHP"); @@ -196,29 +165,29 @@ selectedCategories = new String[1]; tabIndexes[0] = 5; selectedCategories[0] = "PHP"; - searchFor("apigen", tabIndexes, selectedCategories, enabledCategories); + searchFor("apigen", tabIndexes, selectedCategories, enabledCategories, null); tabIndexes[0] = 8; - searchFor("symfony2", tabIndexes, selectedCategories, enabledCategories); + searchFor("symfony2", tabIndexes, selectedCategories, enabledCategories, "php"); tabIndexes[0] = 11; - searchFor("smarty", tabIndexes, selectedCategories, enabledCategories); + searchFor("smarty", tabIndexes, selectedCategories, enabledCategories, "php"); enabledCategories.clear(); enabledCategories.add("C/C++"); tabIndexes[0] = 0; selectedCategories[0] = "C/C++"; - searchFor("build tools", tabIndexes, selectedCategories, enabledCategories); + searchFor("build tools", tabIndexes, selectedCategories, enabledCategories, null); tabIndexes[0] = 2; - searchFor("code assistance", tabIndexes, selectedCategories, enabledCategories); + searchFor("code assistance", tabIndexes, selectedCategories, enabledCategories, null); enabledCategories.clear(); enabledCategories.addAll(Arrays.asList("General", "Editor", "Fonts & Colors", "Keymap", "Java", "PHP", "C/C++", "Miscellaneous")); - searchFor("", tabIndexes, selectedCategories, enabledCategories); + searchFor("", tabIndexes, selectedCategories, enabledCategories, null); } - private void searchFor(String searchTxt, int[] selectedTabIndexes, String[] selectedCategories, ArrayList enabledCategories) { + private void searchFor(String searchTxt, int[] selectedTabIndexes, String[] selectedCategories, ArrayList enabledCategories, String clusterName) { jTextFieldOperator.setText(searchTxt); new EventTool().waitNoEvent(500); jTextFieldOperator.pushKey(KeyEvent.VK_ENTER); @@ -245,6 +214,10 @@ if (selectedTabIndex != -1) { jTabbedPaneOperator = new JTabbedPaneOperator(optionsOperator); assertEquals(selectedTabIndex, jTabbedPaneOperator.getSelectedIndex()); + if(clusterName != null) { + JLabelOperator jLabelOperator = new JLabelOperator(jTabbedPaneOperator); + assertEquals("In order to use this functionality, support for "+clusterName+" must be activated.", jLabelOperator.getText()); + } } } for (String category : enabledCategories) { 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 @@ -77,7 +77,7 @@ @NbBundle.Messages("ApiGenOptionsPanel.keywords.documentation=documentation") @OptionsPanelController.Keywords(keywords={"php", "apigen", "phpdoc", "phpdocumentor", "#ApiGenOptionsPanel.keywords.documentation"}, - location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") + location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPGenOptionsName") public class ApiGenOptionsPanel extends JPanel { private static final long serialVersionUID = 458797646546L; diff --git a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java --- a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java +++ b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java @@ -59,7 +59,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=ApiGenOptionsPanelController.OPTIONS_SUBPATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPGenOptionsName", // toolTip="#LBL_OptionsTooltip" position=165 ) diff --git a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties --- a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties +++ b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2011 Sun Microsystems, Inc. # controller -LBL_OptionsName=ApiGen +LBL_PHPGenOptionsName=ApiGen # panel ApiGenOptionsPanel.apiGenLabel.text=&ApiGen Script: diff --git a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties --- a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties +++ b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2011 Sun Microsystems, Inc. # options controller -LBL_OptionsName=Doctrine2 +LBL_PHPDoctrineOptionsName=Doctrine2 Doctrine2OptionsPanel.noteLabel.text=Note: # options panel 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 @@ -76,7 +76,7 @@ /** * Panel for Doctrine2 options. */ -@OptionsPanelController.Keywords(keywords={"php", "doctrine", "doctrine2", "orm", "odm"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") +@OptionsPanelController.Keywords(keywords={"php", "doctrine", "doctrine2", "orm", "odm"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPDoctrineOptionsName") public class Doctrine2OptionsPanel extends JPanel { private static final long serialVersionUID = 67643468774654L; diff --git a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java --- a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java +++ b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java @@ -60,7 +60,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=Doctrine2OptionsPanelController.OPTIONS_SUBPATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPDoctrineOptionsName", // toolTip="#LBL_OptionsTooltip" position=700 ) diff --git a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties --- a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties +++ b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2009 Sun Microsystems, Inc. # ide options -LBL_OptionsName=PhpDoc +LBL_PHPDocOptionsName=PhpDoc LBL_OptionsTooltip=PhpDoc LBL_SelectPhpDoc=Select PhpDoc script LBL_PhpDocsTitle=PhpDoc scripts 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 @@ -76,7 +76,7 @@ @NbBundle.Messages("PhpDocOptionsPanel.keywords.documentation=documentation") @OptionsPanelController.Keywords(keywords={"php", "phpdoc", "phpdocumentor", "#PhpDocOptionsPanel.keywords.documentation"}, - location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") + location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPDocOptionsName") 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.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java --- a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java +++ b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java @@ -59,7 +59,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=PhpDocScript.OPTIONS_SUB_PATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPDocOptionsName", // toolTip="#LBL_OptionsTooltip" position=170 ) diff --git a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties --- a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties +++ b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2011 Sun Microsystems, Inc. # options -LBL_OptionsName=Unit Testing +LBL_PHPUnitOptionsName=Unit Testing LBL_OptionsTooltip=PHP Unit Testing LBL_PhpUnitsTitle=PHPUnit Scripts LBL_PhpUnits=&PHPUnit Scripts: 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 @@ -85,7 +85,7 @@ */ @NbBundle.Messages("PhpUnitOptionsPanel.keywords.coverage=coverage") @OptionsPanelController.Keywords(keywords={"php", "phpunit", "unit testing", "framework", "coverage", "#PhpUnitOptionsPanel.keywords.coverage"}, - location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") + location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPUnitOptionsName") public class PhpUnitOptionsPanel extends JPanel { private static final long serialVersionUID = -6453232134654321L; diff --git a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java --- a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java +++ b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java @@ -62,7 +62,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=PhpUnit.OPTIONS_SUB_PATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPUnitOptionsName", // toolTip="#LBL_OptionsTooltip" position=150 ) diff --git a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties @@ -36,7 +36,7 @@ # Portions Copyrighted 2009 Sun Microsystems, Inc. # ide options -LBL_OptionsName=Smarty +LBL_PHPSmartyOptionsName=Smarty LBL_OptionsTooltip=PHP Smarty Framework WRN_EmptyDelimiterFields=Delimiter text fields can't be blank. 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 @@ -89,7 +89,7 @@ keywords = {"php", "smarty", "framework", "template", "tpl", "#SmartyOptionsPanel.keywords.template", "#SmartyOptionsPanel.keywords.framework"}, location = UiUtils.OPTIONS_PATH, - tabTitle = "#LBL_OptionsName") + tabTitle = "#LBL_PHPSmartyOptionsName") public class SmartyOptionsPanel extends JPanel { private static final long serialVersionUID = -1384644114740L; diff --git a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java @@ -57,7 +57,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=SmartyFramework.OPTIONS_SUB_PATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPSmartyOptionsName", position=400 ) public class SmartyOptionsPanelController extends OptionsPanelController implements ChangeListener { diff --git a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties --- a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties +++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2009 Sun Microsystems, Inc. # ide options -LBL_OptionsName=Symfony +LBL_PHPSymfonyOptionsName=Symfony LBL_OptionsTooltip=PHP Symfony Framework SymfonyOptionsPanel.symfonyLabel.text=&Symfony Script: SymfonyOptionsPanel.searchButton.text=S&earch... 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 @@ -80,7 +80,7 @@ /** * @author Tomas Mysik */ -@OptionsPanelController.Keywords(keywords={"php", "symfony", "framework", "sf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") +@OptionsPanelController.Keywords(keywords={"php", "symfony", "framework", "sf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPSymfonyOptionsName") public class SymfonyOptionsPanel extends JPanel { private static final long serialVersionUID = -1384645646121L; private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony"; diff --git a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java --- a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java +++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java @@ -59,7 +59,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=SymfonyScript.OPTIONS_SUB_PATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPSymfonyOptionsName", // toolTip="#LBL_OptionsTooltip" position=200 ) diff --git a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties --- a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties +++ b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2011 Sun Microsystems, Inc. # options controller -LBL_OptionsName=Symfony2 +LBL_Symfony2OptionsName=Symfony2 # options panel Symfony2OptionsPanel.sandboxLabel.text=&Symfony: 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 @@ -77,7 +77,7 @@ /** * Panel for SYmfony2 options. */ -@OptionsPanelController.Keywords(keywords={"php", "symfony", "symfony2", "framework", "sf", "sf2"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") +@OptionsPanelController.Keywords(keywords={"php", "symfony", "symfony2", "framework", "sf", "sf2"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_Symfony2OptionsName") @NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)") public class Symfony2OptionsPanel extends JPanel { diff --git a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java --- a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java +++ b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java @@ -61,7 +61,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=Symfony2OptionsPanelController.OPTIONS_SUBPATH, - displayName="#LBL_OptionsName", + displayName="#LBL_Symfony2OptionsName", // toolTip="#LBL_OptionsTooltip" position=190 ) diff --git a/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties b/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties --- a/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties +++ b/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties @@ -39,7 +39,7 @@ # Portions Copyrighted 2009 Sun Microsystems, Inc. # ide options -LBL_OptionsName=Zend +LBL_PHPZendOptionsName=Zend LBL_OptionsTooltip=PHP Zend Framework ZendOptionsPanel.zendLabel.text=&Zend Script: ZendOptionsPanel.searchButton.text=S&earch... 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 @@ -84,7 +84,7 @@ /** * @author Tomas Mysik */ -@OptionsPanelController.Keywords(keywords={"php", "zend", "framework", "zf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName") +@OptionsPanelController.Keywords(keywords={"php", "zend", "framework", "zf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPZendOptionsName") public final class ZendOptionsPanel extends JPanel { private static final long serialVersionUID = -13564875423210L; private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend"; diff --git a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java b/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java --- a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java +++ b/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java @@ -59,7 +59,7 @@ @OptionsPanelController.SubRegistration( location=UiUtils.OPTIONS_PATH, id=ZendScript.OPTIONS_SUB_PATH, - displayName="#LBL_OptionsName", + displayName="#LBL_PHPZendOptionsName", // toolTip="#LBL_OptionsTooltip" position=300 )