Attachment #126002 for bug #217166

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 217166
Collapse All | Expand All

Lines 38-44 Link Here

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties (-1 / +1 lines)
38	#	38	#
39	# Portions Copyrighted 2011 Sun Microsystems, Inc.	39	# Portions Copyrighted 2011 Sun Microsystems, Inc.
40		40
41	LBL_OptionsName=Hudson	41	LBL_HudsonPHPOptionsName=Hudson
42	HudsonOptionsPanel.ppwLabel.text=&PPW Script:	42	HudsonOptionsPanel.ppwLabel.text=&PPW Script:
43	HudsonOptionsPanel.note1Label.text=<html><i>Note:</i></html>	43	HudsonOptionsPanel.note1Label.text=<html><i>Note:</i></html>
44	HudsonOptionsPanel.ppwBrowseButton.text=&Browse...	44	HudsonOptionsPanel.ppwBrowseButton.text=&Browse...

Lines 86-92 Link Here

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanel.java (-1 / +1 lines)
86	"HudsonOptionsPanel.keywords.build=Build"	86	"HudsonOptionsPanel.keywords.build=Build"
87	})	87	})
88	@OptionsPanelController.Keywords(	88	@OptionsPanelController.Keywords(
89	location = UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName",	89	location = UiUtils.OPTIONS_PATH, tabTitle= "#LBL_HudsonPHPOptionsName",
90	keywords = {"php", "hudson", "jenkins", "ppw", "job", "build", "#HudsonOptionsPanel.keywords.job", "#HudsonOptionsPanel.keywords.build"})	90	keywords = {"php", "hudson", "jenkins", "ppw", "job", "build", "#HudsonOptionsPanel.keywords.job", "#HudsonOptionsPanel.keywords.build"})
91	public class HudsonOptionsPanel extends JPanel {	91	public class HudsonOptionsPanel extends JPanel {
92		92

Lines 60-66 Link Here

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java (-1 / +1 lines)
60	@OptionsPanelController.SubRegistration(	60	@OptionsPanelController.SubRegistration(
61	location=UiUtils.OPTIONS_PATH,	61	location=UiUtils.OPTIONS_PATH,
62	id=HudsonOptionsPanelController.OPTIONS_SUBPATH,	62	id=HudsonOptionsPanelController.OPTIONS_SUBPATH,
63	displayName="#LBL_OptionsName",	63	displayName="#LBL_HudsonPHPOptionsName",
64	// toolTip="#LBL_OptionsTooltip"	64	// toolTip="#LBL_OptionsTooltip"
65	position=160	65	position=160
66	)	66	)

Lines 50-55 Link Here

(-)a/ide.ergonomics/nbproject/project.xml (+9 lines)
50	</run-dependency>	50	</run-dependency>
51	</dependency>	51	</dependency>
52	<dependency>	52	<dependency>
		53	<code-name-base>org.netbeans.modules.options.api</code-name-base>
		54	<build-prerequisite/>
		55	<compile-dependency/>
		56	<run-dependency>
		57	<release-version>1</release-version>
		58	<specification-version>1.27</specification-version>
		59	</run-dependency>
		60	</dependency>
		61	<dependency>
53	<code-name-base>org.netbeans.modules.project.ant</code-name-base>	62	<code-name-base>org.netbeans.modules.project.ant</code-name-base>
54	<build-prerequisite/>	63	<build-prerequisite/>
55	<compile-dependency/>	64	<compile-dependency/>

Lines 55-60 Link Here

(-)a/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl (+45 lines)
55	</xsl:element>	55	</xsl:element>
56	</xsl:template>	56	</xsl:template>
57		57
		58	<xsl:template match="filesystem/folder[@name='OptionsDialog']">
		59	<xsl:element name="folder">
		60	<xsl:attribute name="name">OptionsDialog</xsl:attribute>
		61	<xsl:apply-templates mode="options"/>
		62	</xsl:element>
		63	</xsl:template>
		64
58	<xsl:template match="filesystem/folder[@name='org-netbeans-api-project-libraries']/folder[@name='Libraries']">	65	<xsl:template match="filesystem/folder[@name='org-netbeans-api-project-libraries']/folder[@name='Libraries']">
59	<xsl:element name="folder">	66	<xsl:element name="folder">
60	<xsl:attribute name="name">org-netbeans-api-project-libraries</xsl:attribute>	67	<xsl:attribute name="name">org-netbeans-api-project-libraries</xsl:attribute>
Lines 276-281 Link Here
276	<xsl:template match="attr" mode="libraries">	283	<xsl:template match="attr" mode="libraries">
277	<xsl:copy-of select="."/>	284	<xsl:copy-of select="."/>
278	</xsl:template>	285	</xsl:template>
		286
		287	<!-- options -->
		288	<xsl:template match="file" mode="options">
		289	<xsl:element name="file">
		290	<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
		291	<xsl:apply-templates mode="options"/>
		292	</xsl:element>
		293	</xsl:template>
		294	<xsl:template match="folder" mode="options">
		295	<xsl:element name="folder">
		296	<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
		297	<xsl:apply-templates mode="options-adv"/>
		298	</xsl:element>
		299	</xsl:template>
		300	<xsl:template match="attr[@name='controller']" mode="options">
		301	<xsl:element name="attr">
		302	<xsl:attribute name="name">controller</xsl:attribute>
		303	<xsl:attribute name="methodvalue">org.netbeans.modules.ide.ergonomics.fod.OptionCntrl.basic</xsl:attribute>
		304	</xsl:element>
		305	</xsl:template>
		306	<xsl:template match="attr" mode="options">
		307	<xsl:copy-of select="."/>
		308	</xsl:template>
		309	<xsl:template match="file" mode="options-adv">
		310	<xsl:element name="file">
		311	<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
		312	<xsl:apply-templates mode="options-adv"/>
		313	</xsl:element>
		314	</xsl:template>
		315	<xsl:template match="attr[@name='controller']" mode="options-adv">
		316	<xsl:element name="attr">
		317	<xsl:attribute name="name">controller</xsl:attribute>
		318	<xsl:attribute name="methodvalue">org.netbeans.modules.ide.ergonomics.fod.OptionCntrl.advanced</xsl:attribute>
		319	</xsl:element>
		320	</xsl:template>
		321	<xsl:template match="attr" mode="options-adv">
		322	<xsl:copy-of select="."/>
		323	</xsl:template>
279		324
280	<!-- attach type -->	325	<!-- attach type -->
281	<xsl:template match="file" mode="attach-types">	326	<xsl:template match="file" mode="attach-types">




/*
 * 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 <jtulach@netbeans.org>
 */
public final class OptionCntrl extends OptionsPanelController 
implements Callable<JComponent>, 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) {
    }

}




 *
 * @author theofanis
 */
public class FoDSearchInOptionsTest extends JellyTestCase {

    private StringComparator stringComparator;
    private OptionsOperator optionsOperator;

    /**
     * Constructor required by JUnit
     */
    public FoDSearchInOptionsTest(String testName) {
        super(testName);
    }


     * Creates suite from particular test cases.
     */
    public static Test suite() {
        return NbModuleSuite.createConfiguration(FoDSearchInOptionsTest.class).addTest(
                "testSearchInOptionsWindow").clusters(".*").gui(true).suite();
    }

    public void testSearchInOptionsWindow() {

        String[] selectedCategories = {"Editor"};
        ArrayList<String> enabledCategories = new ArrayList<String>();
        enabledCategories.add("Editor");
        searchFor("general editor", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 6;
        searchFor("macros", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 2;
        searchFor("completion", tabIndexes, selectedCategories, enabledCategories, null);

        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);

        enabledCategories.clear();
        enabledCategories.add("General");
        tabIndexes[0] = -1;
        selectedCategories[0] = "General";
        searchFor("proxy", tabIndexes, selectedCategories, enabledCategories, null);

        enabledCategories.clear();
        enabledCategories.add("Fonts & Colors");
        tabIndexes[0] = 0;
        selectedCategories[0] = "FontsAndColors";
        searchFor("syntax", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 1;
        searchFor("highlighting", tabIndexes, selectedCategories, enabledCategories);

        tabIndexes[0] = 4;
        searchFor("versioning", tabIndexes, selectedCategories, enabledCategories, null);

        enabledCategories.clear();
        enabledCategories.add("Keymap");
        tabIndexes[0] = -1;
        selectedCategories[0] = "Keymaps";
        searchFor("keymap", tabIndexes, selectedCategories, enabledCategories);

        enabledCategories.clear();
        enabledCategories.add("Java");
        tabIndexes[0] = 4;
        selectedCategories[0] = "Java";
        searchFor("maven", tabIndexes, selectedCategories, enabledCategories, "java");

        tabIndexes[0] = 0;
        selectedCategories[0] = "Java";
        searchFor("ant", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 6;
        tabIndexes[0] = 4;
        selectedCategories[0] = "Java";
        searchFor("fx", tabIndexes, selectedCategories, enabledCategories, "javafx");

        tabIndexes[0] = 2;
        enabledCategories.add("Java");
        tabIndexes = new int[1];
        selectedCategories = new String[1];
        tabIndexes[0] = 7;
        selectedCategories[0] = "Java";
        searchFor("java card", tabIndexes, selectedCategories, enabledCategories, "javacard");

        enabledCategories.clear();
        enabledCategories.add("Miscellaneous");
        tabIndexes[0] = 3;
        selectedCategories[0] = "Miscellaneous";
        searchFor("groovy", tabIndexes, selectedCategories, enabledCategories, "groovy");

        tabIndexes[0] = 6;
        selectedCategories[0] = "Miscellaneous";
        searchFor("terminal", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 7;
        selectedCategories[0] = "Miscellaneous";
        searchFor("svg", tabIndexes, selectedCategories, enabledCategories);

        tabIndexes[0] = 8;
        selectedCategories[0] = "Miscellaneous";
        searchFor("terminal", tabIndexes, selectedCategories, enabledCategories);

        enabledCategories.add("Fonts & Colors");
        tabIndexes = new int[2];

        tabIndexes[1] = 1;
        selectedCategories[0] = "FontsAndColors";
        selectedCategories[1] = "Miscellaneous";
        searchFor("diff", tabIndexes, selectedCategories, enabledCategories, null);

        enabledCategories.clear();
        enabledCategories.add("PHP");

        selectedCategories = new String[1];
        tabIndexes[0] = 5;
        selectedCategories[0] = "PHP";
        searchFor("apigen", tabIndexes, selectedCategories, enabledCategories, null);

        tabIndexes[0] = 8;
        searchFor("symfony2", tabIndexes, selectedCategories, enabledCategories, "php");

        tabIndexes[0] = 11;
        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, null);

        tabIndexes[0] = 2;
        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, null);
    }

    private void searchFor(String searchTxt, int[] selectedTabIndexes, String[] selectedCategories, ArrayList<String> enabledCategories, String clusterName) {
        jTextFieldOperator.setText(searchTxt);
        new EventTool().waitNoEvent(500);
        jTextFieldOperator.pushKey(KeyEvent.VK_ENTER);

            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) {

Lines 77-83 Link Here

(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanel.java (-1 / +1 lines)
77		77
78	@NbBundle.Messages("ApiGenOptionsPanel.keywords.documentation=documentation")	78	@NbBundle.Messages("ApiGenOptionsPanel.keywords.documentation=documentation")
79	@OptionsPanelController.Keywords(keywords={"php", "apigen", "phpdoc", "phpdocumentor", "#ApiGenOptionsPanel.keywords.documentation"},	79	@OptionsPanelController.Keywords(keywords={"php", "apigen", "phpdoc", "phpdocumentor", "#ApiGenOptionsPanel.keywords.documentation"},
80	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	80	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPGenOptionsName")
81	public class ApiGenOptionsPanel extends JPanel {	81	public class ApiGenOptionsPanel extends JPanel {
82		82
83	private static final long serialVersionUID = 458797646546L;	83	private static final long serialVersionUID = 458797646546L;

Lines 59-65 Link Here

(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java (-1 / +1 lines)
59	@OptionsPanelController.SubRegistration(	59	@OptionsPanelController.SubRegistration(
60	location=UiUtils.OPTIONS_PATH,	60	location=UiUtils.OPTIONS_PATH,
61	id=ApiGenOptionsPanelController.OPTIONS_SUBPATH,	61	id=ApiGenOptionsPanelController.OPTIONS_SUBPATH,
62	displayName="#LBL_OptionsName",	62	displayName="#LBL_PHPGenOptionsName",
63	// toolTip="#LBL_OptionsTooltip"	63	// toolTip="#LBL_OptionsTooltip"
64	position=165	64	position=165
65	)	65	)

Lines 39-45 Link Here

(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2011 Sun Microsystems, Inc.	39	# Portions Copyrighted 2011 Sun Microsystems, Inc.
40		40
41	# controller	41	# controller
42	LBL_OptionsName=ApiGen	42	LBL_PHPGenOptionsName=ApiGen
43		43
44	# panel	44	# panel
45	ApiGenOptionsPanel.apiGenLabel.text=&ApiGen Script:	45	ApiGenOptionsPanel.apiGenLabel.text=&ApiGen Script:

Lines 39-45 Link Here

(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2011 Sun Microsystems, Inc.	39	# Portions Copyrighted 2011 Sun Microsystems, Inc.
40		40
41	# options controller	41	# options controller
42	LBL_OptionsName=Doctrine2	42	LBL_PHPDoctrineOptionsName=Doctrine2
43	Doctrine2OptionsPanel.noteLabel.text=<html><em>Note:</em>	43	Doctrine2OptionsPanel.noteLabel.text=<html><em>Note:</em>
44		44
45	# options panel	45	# options panel

Lines 76-82 Link Here

(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanel.java (-1 / +1 lines)
76	/**	76	/**
77	* Panel for Doctrine2 options.	77	* Panel for Doctrine2 options.
78	*/	78	*/
79	@OptionsPanelController.Keywords(keywords={"php", "doctrine", "doctrine2", "orm", "odm"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	79	@OptionsPanelController.Keywords(keywords={"php", "doctrine", "doctrine2", "orm", "odm"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPDoctrineOptionsName")
80	public class Doctrine2OptionsPanel extends JPanel {	80	public class Doctrine2OptionsPanel extends JPanel {
81		81
82	private static final long serialVersionUID = 67643468774654L;	82	private static final long serialVersionUID = 67643468774654L;

Lines 60-66 Link Here

(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java (-1 / +1 lines)
60	@OptionsPanelController.SubRegistration(	60	@OptionsPanelController.SubRegistration(
61	location=UiUtils.OPTIONS_PATH,	61	location=UiUtils.OPTIONS_PATH,
62	id=Doctrine2OptionsPanelController.OPTIONS_SUBPATH,	62	id=Doctrine2OptionsPanelController.OPTIONS_SUBPATH,
63	displayName="#LBL_OptionsName",	63	displayName="#LBL_PHPDoctrineOptionsName",
64	// toolTip="#LBL_OptionsTooltip"	64	// toolTip="#LBL_OptionsTooltip"
65	position=700	65	position=700
66	)	66	)

Lines 39-45 Link Here

(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2009 Sun Microsystems, Inc.	39	# Portions Copyrighted 2009 Sun Microsystems, Inc.
40		40
41	# ide options	41	# ide options
42	LBL_OptionsName=PhpDoc	42	LBL_PHPDocOptionsName=PhpDoc
43	LBL_OptionsTooltip=PhpDoc	43	LBL_OptionsTooltip=PhpDoc
44	LBL_SelectPhpDoc=Select PhpDoc script	44	LBL_SelectPhpDoc=Select PhpDoc script
45	LBL_PhpDocsTitle=PhpDoc scripts	45	LBL_PhpDocsTitle=PhpDoc scripts

Lines 76-82 Link Here

(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanel.java (-1 / +1 lines)
76		76
77	@NbBundle.Messages("PhpDocOptionsPanel.keywords.documentation=documentation")	77	@NbBundle.Messages("PhpDocOptionsPanel.keywords.documentation=documentation")
78	@OptionsPanelController.Keywords(keywords={"php", "phpdoc", "phpdocumentor", "#PhpDocOptionsPanel.keywords.documentation"},	78	@OptionsPanelController.Keywords(keywords={"php", "phpdoc", "phpdocumentor", "#PhpDocOptionsPanel.keywords.documentation"},
79	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	79	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPDocOptionsName")
80	public final class PhpDocOptionsPanel extends JPanel {	80	public final class PhpDocOptionsPanel extends JPanel {
81	private static final long serialVersionUID = 18784654654113L;	81	private static final long serialVersionUID = 18784654654113L;
82	private static final String PHPDOC_LAST_FOLDER_SUFFIX = ".phpdoc"; // NOI18N	82	private static final String PHPDOC_LAST_FOLDER_SUFFIX = ".phpdoc"; // NOI18N

Lines 59-65 Link Here

(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java (-1 / +1 lines)
59	@OptionsPanelController.SubRegistration(	59	@OptionsPanelController.SubRegistration(
60	location=UiUtils.OPTIONS_PATH,	60	location=UiUtils.OPTIONS_PATH,
61	id=PhpDocScript.OPTIONS_SUB_PATH,	61	id=PhpDocScript.OPTIONS_SUB_PATH,
62	displayName="#LBL_OptionsName",	62	displayName="#LBL_PHPDocOptionsName",
63	// toolTip="#LBL_OptionsTooltip"	63	// toolTip="#LBL_OptionsTooltip"
64	position=170	64	position=170
65	)	65	)

Lines 39-45 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2011 Sun Microsystems, Inc.	39	# Portions Copyrighted 2011 Sun Microsystems, Inc.
40		40
41	# options	41	# options
42	LBL_OptionsName=Unit Testing	42	LBL_PHPUnitOptionsName=Unit Testing
43	LBL_OptionsTooltip=PHP Unit Testing	43	LBL_OptionsTooltip=PHP Unit Testing
44	LBL_PhpUnitsTitle=PHPUnit Scripts	44	LBL_PhpUnitsTitle=PHPUnit Scripts
45	LBL_PhpUnits=&PHPUnit Scripts:	45	LBL_PhpUnits=&PHPUnit Scripts:

Lines 85-91 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanel.java (-1 / +1 lines)
85	*/	85	*/
86	@NbBundle.Messages("PhpUnitOptionsPanel.keywords.coverage=coverage")	86	@NbBundle.Messages("PhpUnitOptionsPanel.keywords.coverage=coverage")
87	@OptionsPanelController.Keywords(keywords={"php", "phpunit", "unit testing", "framework", "coverage", "#PhpUnitOptionsPanel.keywords.coverage"},	87	@OptionsPanelController.Keywords(keywords={"php", "phpunit", "unit testing", "framework", "coverage", "#PhpUnitOptionsPanel.keywords.coverage"},
88	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	88	location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPUnitOptionsName")
89	public class PhpUnitOptionsPanel extends JPanel {	89	public class PhpUnitOptionsPanel extends JPanel {
90		90
91	private static final long serialVersionUID = -6453232134654321L;	91	private static final long serialVersionUID = -6453232134654321L;

Lines 62-68 Link Here

(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java (-1 / +1 lines)
62	@OptionsPanelController.SubRegistration(	62	@OptionsPanelController.SubRegistration(
63	location=UiUtils.OPTIONS_PATH,	63	location=UiUtils.OPTIONS_PATH,
64	id=PhpUnit.OPTIONS_SUB_PATH,	64	id=PhpUnit.OPTIONS_SUB_PATH,
65	displayName="#LBL_OptionsName",	65	displayName="#LBL_PHPUnitOptionsName",
66	// toolTip="#LBL_OptionsTooltip"	66	// toolTip="#LBL_OptionsTooltip"
67	position=150	67	position=150
68	)	68	)

Lines 36-42 Link Here

(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties (-1 / +1 lines)
36	# Portions Copyrighted 2009 Sun Microsystems, Inc.	36	# Portions Copyrighted 2009 Sun Microsystems, Inc.
37		37
38	# ide options	38	# ide options
39	LBL_OptionsName=Smarty	39	LBL_PHPSmartyOptionsName=Smarty
40	LBL_OptionsTooltip=PHP Smarty Framework	40	LBL_OptionsTooltip=PHP Smarty Framework
41		41
42	WRN_EmptyDelimiterFields=Delimiter text fields can't be blank.	42	WRN_EmptyDelimiterFields=Delimiter text fields can't be blank.

Lines 89-95 Link Here

(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java (-1 / +1 lines)
89	keywords = {"php", "smarty", "framework", "template", "tpl",	89	keywords = {"php", "smarty", "framework", "template", "tpl",
90	"#SmartyOptionsPanel.keywords.template", "#SmartyOptionsPanel.keywords.framework"},	90	"#SmartyOptionsPanel.keywords.template", "#SmartyOptionsPanel.keywords.framework"},
91	location = UiUtils.OPTIONS_PATH,	91	location = UiUtils.OPTIONS_PATH,
92	tabTitle = "#LBL_OptionsName")	92	tabTitle = "#LBL_PHPSmartyOptionsName")
93	public class SmartyOptionsPanel extends JPanel {	93	public class SmartyOptionsPanel extends JPanel {
94	private static final long serialVersionUID = -1384644114740L;	94	private static final long serialVersionUID = -1384644114740L;
95		95

Lines 57-63 Link Here

(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java (-1 / +1 lines)
57	@OptionsPanelController.SubRegistration(	57	@OptionsPanelController.SubRegistration(
58	location=UiUtils.OPTIONS_PATH,	58	location=UiUtils.OPTIONS_PATH,
59	id=SmartyFramework.OPTIONS_SUB_PATH,	59	id=SmartyFramework.OPTIONS_SUB_PATH,
60	displayName="#LBL_OptionsName",	60	displayName="#LBL_PHPSmartyOptionsName",
61	position=400	61	position=400
62	)	62	)
63	public class SmartyOptionsPanelController extends OptionsPanelController implements ChangeListener {	63	public class SmartyOptionsPanelController extends OptionsPanelController implements ChangeListener {

Lines 39-45 Link Here

(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2009 Sun Microsystems, Inc.	39	# Portions Copyrighted 2009 Sun Microsystems, Inc.
40		40
41	# ide options	41	# ide options
42	LBL_OptionsName=Symfony	42	LBL_PHPSymfonyOptionsName=Symfony
43	LBL_OptionsTooltip=PHP Symfony Framework	43	LBL_OptionsTooltip=PHP Symfony Framework
44	SymfonyOptionsPanel.symfonyLabel.text=&Symfony Script:	44	SymfonyOptionsPanel.symfonyLabel.text=&Symfony Script:
45	SymfonyOptionsPanel.searchButton.text=S&earch...	45	SymfonyOptionsPanel.searchButton.text=S&earch...

Lines 80-86 Link Here

(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanel.java (-1 / +1 lines)
80	/**	80	/**
81	* @author Tomas Mysik	81	* @author Tomas Mysik
82	*/	82	*/
83	@OptionsPanelController.Keywords(keywords={"php", "symfony", "framework", "sf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	83	@OptionsPanelController.Keywords(keywords={"php", "symfony", "framework", "sf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPSymfonyOptionsName")
84	public class SymfonyOptionsPanel extends JPanel {	84	public class SymfonyOptionsPanel extends JPanel {
85	private static final long serialVersionUID = -1384645646121L;	85	private static final long serialVersionUID = -1384645646121L;
86	private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";	86	private static final String SYMFONY_LAST_FOLDER_SUFFIX = ".symfony";

Lines 59-65 Link Here

(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java (-1 / +1 lines)
59	@OptionsPanelController.SubRegistration(	59	@OptionsPanelController.SubRegistration(
60	location=UiUtils.OPTIONS_PATH,	60	location=UiUtils.OPTIONS_PATH,
61	id=SymfonyScript.OPTIONS_SUB_PATH,	61	id=SymfonyScript.OPTIONS_SUB_PATH,
62	displayName="#LBL_OptionsName",	62	displayName="#LBL_PHPSymfonyOptionsName",
63	// toolTip="#LBL_OptionsTooltip"	63	// toolTip="#LBL_OptionsTooltip"
64	position=200	64	position=200
65	)	65	)

Lines 39-45 Link Here

(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2011 Sun Microsystems, Inc.	39	# Portions Copyrighted 2011 Sun Microsystems, Inc.
40		40
41	# options controller	41	# options controller
42	LBL_OptionsName=Symfony2	42	LBL_Symfony2OptionsName=Symfony2
43		43
44	# options panel	44	# options panel
45	Symfony2OptionsPanel.sandboxLabel.text=&Symfony:	45	Symfony2OptionsPanel.sandboxLabel.text=&Symfony:

Lines 77-83 Link Here

(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanel.java (-1 / +1 lines)
77	/**	77	/**
78	* Panel for SYmfony2 options.	78	* Panel for SYmfony2 options.
79	*/	79	*/
80	@OptionsPanelController.Keywords(keywords={"php", "symfony", "symfony2", "framework", "sf", "sf2"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	80	@OptionsPanelController.Keywords(keywords={"php", "symfony", "symfony2", "framework", "sf", "sf2"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_Symfony2OptionsName")
81	@NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)")	81	@NbBundle.Messages("LBL_ZipFilesFilter=Zip File (*.zip)")
82	public class Symfony2OptionsPanel extends JPanel {	82	public class Symfony2OptionsPanel extends JPanel {
83		83

Lines 61-67 Link Here

(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java (-1 / +1 lines)
61	@OptionsPanelController.SubRegistration(	61	@OptionsPanelController.SubRegistration(
62	location=UiUtils.OPTIONS_PATH,	62	location=UiUtils.OPTIONS_PATH,
63	id=Symfony2OptionsPanelController.OPTIONS_SUBPATH,	63	id=Symfony2OptionsPanelController.OPTIONS_SUBPATH,
64	displayName="#LBL_OptionsName",	64	displayName="#LBL_Symfony2OptionsName",
65	// toolTip="#LBL_OptionsTooltip"	65	// toolTip="#LBL_OptionsTooltip"
66	position=190	66	position=190
67	)	67	)

Lines 39-45 Link Here

(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties (-1 / +1 lines)
39	# Portions Copyrighted 2009 Sun Microsystems, Inc.	39	# Portions Copyrighted 2009 Sun Microsystems, Inc.
40		40
41	# ide options	41	# ide options
42	LBL_OptionsName=Zend	42	LBL_PHPZendOptionsName=Zend
43	LBL_OptionsTooltip=PHP Zend Framework	43	LBL_OptionsTooltip=PHP Zend Framework
44	ZendOptionsPanel.zendLabel.text=&Zend Script:	44	ZendOptionsPanel.zendLabel.text=&Zend Script:
45	ZendOptionsPanel.searchButton.text=S&earch...	45	ZendOptionsPanel.searchButton.text=S&earch...

Lines 84-90 Link Here

(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanel.java (-1 / +1 lines)
84	/**	84	/**
85	* @author Tomas Mysik	85	* @author Tomas Mysik
86	*/	86	*/
87	@OptionsPanelController.Keywords(keywords={"php", "zend", "framework", "zf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_OptionsName")	87	@OptionsPanelController.Keywords(keywords={"php", "zend", "framework", "zf"}, location=UiUtils.OPTIONS_PATH, tabTitle= "#LBL_PHPZendOptionsName")
88	public final class ZendOptionsPanel extends JPanel {	88	public final class ZendOptionsPanel extends JPanel {
89	private static final long serialVersionUID = -13564875423210L;	89	private static final long serialVersionUID = -13564875423210L;
90	private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";	90	private static final String ZEND_LAST_FOLDER_SUFFIX = ".zend";

Lines 59-65 Link Here

(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java (-1 / +1 lines)
59	@OptionsPanelController.SubRegistration(	59	@OptionsPanelController.SubRegistration(
60	location=UiUtils.OPTIONS_PATH,	60	location=UiUtils.OPTIONS_PATH,
61	id=ZendScript.OPTIONS_SUB_PATH,	61	id=ZendScript.OPTIONS_SUB_PATH,
62	displayName="#LBL_OptionsName",	62	displayName="#LBL_PHPZendOptionsName",
63	// toolTip="#LBL_OptionsTooltip"	63	// toolTip="#LBL_OptionsTooltip"
64	position=300	64	position=300
65	)	65	)

Return to bug 217166

Line 0 Link Here

(-)a/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java (+136 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2012 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2012 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.ide.ergonomics.fod;
		43
		44	import java.awt.EventQueue;
		45	import java.beans.PropertyChangeListener;
		46	import java.util.concurrent.Callable;
		47	import javax.swing.JButton;
		48	import javax.swing.JComponent;
		49	import org.netbeans.api.options.OptionsDisplayer;
		50	import org.netbeans.spi.options.OptionsPanelController;
		51	import org.openide.filesystems.FileObject;
		52	import org.openide.util.HelpCtx;
		53	import org.openide.util.Lookup;
		54
		55	/**
		56	*
		57	* @author Jaroslav Tulach <jtulach@netbeans.org>
		58	*/
		59	public final class OptionCntrl extends OptionsPanelController
		60	implements Callable<JComponent>, Runnable {
		61	private final FileObject fo;
		62	private ConfigurationPanel panel;
		63	private Lookup master;
		64
65	public OptionCntrl(FileObject fo) {
66	this.fo = fo;
67	}
68
69	static OptionsPanelController advanced(FileObject fo) {
70	return new OptionCntrl(fo);
71	}
72
73	static OptionsPanelController basic(FileObject fo) {
74	return new OptionCntrl(fo);
75	}
76
77	@Override
78	public void update() {
79	}
80
81	@Override
82	public void applyChanges() {
83	}
84
85	@Override
86	public void cancel() {
87	}
88
89	@Override
90	public boolean isValid() {
91	return true;
92	}
93
94	@Override
95	public boolean isChanged() {
96	return false;
97	}
98
99	@Override
100	public JComponent getComponent(Lookup masterLookup) {
101	if (panel == null) {
102	FeatureInfo info = FoDLayersProvider.getInstance().whichProvides(fo);
103	assert info != null;
104	master = masterLookup;
105	panel = new ConfigurationPanel(info.clusterName, this, info, false);
106	}
107	return panel;
108	}
109
110	@Override
111	public JComponent call() throws Exception {
112	assert EventQueue.isDispatchThread();
113	// it would be better not to close the dialog...
114	EventQueue.invokeLater(this);
115	return new JButton();
116	}
117
118	@Override
119	public void run() {
120	OptionsDisplayer.getDefault().open();
121	}
122
123	@Override
124	public HelpCtx getHelpCtx() {
125	return HelpCtx.DEFAULT_HELP;
126	}
127
128	@Override
129	public void addPropertyChangeListener(PropertyChangeListener l) {
130	}
131
132	@Override
133	public void removePropertyChangeListener(PropertyChangeListener l) {
134	}
135
136	}

Lines 62-68 Link Here

(-)a/options.api/test/qa-functional/src/org/netbeans/modules/options/SearchInOptionsTest.java (-59 / +32 lines)
62	*	62	*
63	* @author theofanis	63	* @author theofanis
64	*/	64	*/
65	public class SearchInOptionsTest extends JellyTestCase {	65	public class FoDSearchInOptionsTest extends JellyTestCase {
66		66
67	private StringComparator stringComparator;	67	private StringComparator stringComparator;
68	private OptionsOperator optionsOperator;	68	private OptionsOperator optionsOperator;
Lines 72-78 Link Here
72	/**	72	/**
73	* Constructor required by JUnit	73	* Constructor required by JUnit
74	*/	74	*/
75	public SearchInOptionsTest(String testName) {	75	public FoDSearchInOptionsTest(String testName) {
76	super(testName);	76	super(testName);
77	}	77	}
78		78
Lines 80-87 Link Here
80	* Creates suite from particular test cases.	80	* Creates suite from particular test cases.
81	*/	81	*/
82	public static Test suite() {	82	public static Test suite() {
83	return NbModuleSuite.createConfiguration(SearchInOptionsTest.class).addTest(	83	return NbModuleSuite.createConfiguration(FoDSearchInOptionsTest.class).addTest(
84	"testSearchInOptionsWindow").clusters(".").enableModules(".").gui(true).suite();	84	"testSearchInOptionsWindow").clusters(".*").gui(true).suite();
85	}	85	}
86		86
87	public void testSearchInOptionsWindow() {	87	public void testSearchInOptionsWindow() {
Lines 99-185 Link Here
99	String[] selectedCategories = {"Editor"};	99	String[] selectedCategories = {"Editor"};
100	ArrayList<String> enabledCategories = new ArrayList<String>();	100	ArrayList<String> enabledCategories = new ArrayList<String>();
101	enabledCategories.add("Editor");	101	enabledCategories.add("Editor");
102	searchFor("general editor", tabIndexes, selectedCategories, enabledCategories);	102	searchFor("general editor", tabIndexes, selectedCategories, enabledCategories, null);
103		103
104	tabIndexes[0] = 6;	104	tabIndexes[0] = 6;
105	searchFor("macros", tabIndexes, selectedCategories, enabledCategories);	105	searchFor("macros", tabIndexes, selectedCategories, enabledCategories, null);
106		106
107	tabIndexes[0] = 2;	107	tabIndexes[0] = 2;
108	searchFor("completion", tabIndexes, selectedCategories, enabledCategories);	108	searchFor("completion", tabIndexes, selectedCategories, enabledCategories, null);
109
110	tabIndexes[0] = 3;
111	searchFor("templates", tabIndexes, selectedCategories, enabledCategories);
112
113	tabIndexes[0] = 8;
114	searchFor("dictionary", tabIndexes, selectedCategories, enabledCategories);
115
116	tabIndexes[0] = 7;
117	searchFor("on save", tabIndexes, selectedCategories, enabledCategories);
118		109
119	enabledCategories.clear();	110	enabledCategories.clear();
120	enabledCategories.add("General");	111	enabledCategories.add("General");
121	tabIndexes[0] = -1;	112	tabIndexes[0] = -1;
122	selectedCategories[0] = "General";	113	selectedCategories[0] = "General";
123	searchFor("proxy", tabIndexes, selectedCategories, enabledCategories);	114	searchFor("proxy", tabIndexes, selectedCategories, enabledCategories, null);
124		115
125	enabledCategories.clear();	116	enabledCategories.clear();
126	enabledCategories.add("Fonts & Colors");	117	enabledCategories.add("Fonts & Colors");
127	tabIndexes[0] = 0;	118	tabIndexes[0] = 0;
128	selectedCategories[0] = "FontsAndColors";	119	selectedCategories[0] = "FontsAndColors";
129	searchFor("syntax", tabIndexes, selectedCategories, enabledCategories);	120	searchFor("syntax", tabIndexes, selectedCategories, enabledCategories, null);
130
131	tabIndexes[0] = 1;
132	searchFor("highlighting", tabIndexes, selectedCategories, enabledCategories);
133		121
134	tabIndexes[0] = 4;	122	tabIndexes[0] = 4;
135	searchFor("versioning", tabIndexes, selectedCategories, enabledCategories);	123	searchFor("versioning", tabIndexes, selectedCategories, enabledCategories, null);
136
137	enabledCategories.clear();
138	enabledCategories.add("Keymap");
139	tabIndexes[0] = -1;
140	selectedCategories[0] = "Keymaps";
141	searchFor("keymap", tabIndexes, selectedCategories, enabledCategories);
142		124
143	enabledCategories.clear();	125	enabledCategories.clear();
144	enabledCategories.add("Java");	126	enabledCategories.add("Java");
145	tabIndexes[0] = 5;	127	tabIndexes[0] = 4;
146	selectedCategories[0] = "Java";	128	selectedCategories[0] = "Java";
147	searchFor("maven", tabIndexes, selectedCategories, enabledCategories);	129	searchFor("maven", tabIndexes, selectedCategories, enabledCategories, "java");
148		130
149	tabIndexes[0] = 0;	131	tabIndexes[0] = 0;
150	selectedCategories[0] = "Java";	132	selectedCategories[0] = "Java";
151	searchFor("ant", tabIndexes, selectedCategories, enabledCategories);	133	searchFor("ant", tabIndexes, selectedCategories, enabledCategories, null);
152		134
153	enabledCategories.add("Miscellaneous");	135	tabIndexes[0] = 6;
154	tabIndexes[0] = 4;
155	selectedCategories[0] = "Java";	136	selectedCategories[0] = "Java";
156	searchFor("me", tabIndexes, selectedCategories, enabledCategories);	137	searchFor("fx", tabIndexes, selectedCategories, enabledCategories, "javafx");
157		138
158	enabledCategories.clear();	139	tabIndexes[0] = 2;
159	enabledCategories.add("Java");
160	tabIndexes = new int[1];
161	selectedCategories = new String[1];
162	tabIndexes[0] = 7;
163	selectedCategories[0] = "Java";	140	selectedCategories[0] = "Java";
164	searchFor("fx", tabIndexes, selectedCategories, enabledCategories);	141	searchFor("java card", tabIndexes, selectedCategories, enabledCategories, "javacard");
165		142
166	enabledCategories.clear();	143	enabledCategories.clear();
167	enabledCategories.add("Miscellaneous");	144	enabledCategories.add("Miscellaneous");
168	tabIndexes[0] = 3;	145	tabIndexes[0] = 3;
169	selectedCategories[0] = "Miscellaneous";	146	selectedCategories[0] = "Miscellaneous";
170	searchFor("groovy", tabIndexes, selectedCategories, enabledCategories);	147	searchFor("groovy", tabIndexes, selectedCategories, enabledCategories, "groovy");
171		148
172	tabIndexes[0] = 5;	149	tabIndexes[0] = 6;
173	selectedCategories[0] = "Miscellaneous";	150	selectedCategories[0] = "Miscellaneous";
174	searchFor("javascript", tabIndexes, selectedCategories, enabledCategories);	151	searchFor("terminal", tabIndexes, selectedCategories, enabledCategories, null);
175
176	tabIndexes[0] = 7;
177	selectedCategories[0] = "Miscellaneous";
178	searchFor("svg", tabIndexes, selectedCategories, enabledCategories);
179
180	tabIndexes[0] = 8;
181	selectedCategories[0] = "Miscellaneous";
182	searchFor("terminal", tabIndexes, selectedCategories, enabledCategories);
183		152
184	enabledCategories.add("Fonts & Colors");	153	enabledCategories.add("Fonts & Colors");
185	tabIndexes = new int[2];	154	tabIndexes = new int[2];
Lines 188-194 Link Here
188	tabIndexes[1] = 1;	157	tabIndexes[1] = 1;
189	selectedCategories[0] = "FontsAndColors";	158	selectedCategories[0] = "FontsAndColors";
190	selectedCategories[1] = "Miscellaneous";	159	selectedCategories[1] = "Miscellaneous";
191	searchFor("diff", tabIndexes, selectedCategories, enabledCategories);	160	searchFor("diff", tabIndexes, selectedCategories, enabledCategories, null);
192		161
193	enabledCategories.clear();	162	enabledCategories.clear();
194	enabledCategories.add("PHP");	163	enabledCategories.add("PHP");
Lines 196-224 Link Here
196	selectedCategories = new String[1];	165	selectedCategories = new String[1];
197	tabIndexes[0] = 5;	166	tabIndexes[0] = 5;
198	selectedCategories[0] = "PHP";	167	selectedCategories[0] = "PHP";
199	searchFor("apigen", tabIndexes, selectedCategories, enabledCategories);	168	searchFor("apigen", tabIndexes, selectedCategories, enabledCategories, null);
200		169
201	tabIndexes[0] = 8;	170	tabIndexes[0] = 8;
202	searchFor("symfony2", tabIndexes, selectedCategories, enabledCategories);	171	searchFor("symfony2", tabIndexes, selectedCategories, enabledCategories, "php");
203		172
204	tabIndexes[0] = 11;	173	tabIndexes[0] = 11;
205	searchFor("smarty", tabIndexes, selectedCategories, enabledCategories);	174	searchFor("smarty", tabIndexes, selectedCategories, enabledCategories, "php");
206		175
207	enabledCategories.clear();	176	enabledCategories.clear();
208	enabledCategories.add("C/C++");	177	enabledCategories.add("C/C++");
209	tabIndexes[0] = 0;	178	tabIndexes[0] = 0;
210	selectedCategories[0] = "C/C++";	179	selectedCategories[0] = "C/C++";
211	searchFor("build tools", tabIndexes, selectedCategories, enabledCategories);	180	searchFor("build tools", tabIndexes, selectedCategories, enabledCategories, null);
212		181
213	tabIndexes[0] = 2;	182	tabIndexes[0] = 2;
214	searchFor("code assistance", tabIndexes, selectedCategories, enabledCategories);	183	searchFor("code assistance", tabIndexes, selectedCategories, enabledCategories, null);
215		184
216	enabledCategories.clear();	185	enabledCategories.clear();
217	enabledCategories.addAll(Arrays.asList("General", "Editor", "Fonts & Colors", "Keymap", "Java", "PHP", "C/C++", "Miscellaneous"));	186	enabledCategories.addAll(Arrays.asList("General", "Editor", "Fonts & Colors", "Keymap", "Java", "PHP", "C/C++", "Miscellaneous"));
218	searchFor("", tabIndexes, selectedCategories, enabledCategories);	187	searchFor("", tabIndexes, selectedCategories, enabledCategories, null);
219	}	188	}
220		189
221	private void searchFor(String searchTxt, int[] selectedTabIndexes, String[] selectedCategories, ArrayList<String> enabledCategories) {	190	private void searchFor(String searchTxt, int[] selectedTabIndexes, String[] selectedCategories, ArrayList<String> enabledCategories, String clusterName) {
222	jTextFieldOperator.setText(searchTxt);	191	jTextFieldOperator.setText(searchTxt);
223	new EventTool().waitNoEvent(500);	192	new EventTool().waitNoEvent(500);
224	jTextFieldOperator.pushKey(KeyEvent.VK_ENTER);	193	jTextFieldOperator.pushKey(KeyEvent.VK_ENTER);
Lines 245-250 Link Here
245	if (selectedTabIndex != -1) {	214	if (selectedTabIndex != -1) {
246	jTabbedPaneOperator = new JTabbedPaneOperator(optionsOperator);	215	jTabbedPaneOperator = new JTabbedPaneOperator(optionsOperator);
247	assertEquals(selectedTabIndex, jTabbedPaneOperator.getSelectedIndex());	216	assertEquals(selectedTabIndex, jTabbedPaneOperator.getSelectedIndex());
		217	if(clusterName != null) {
		218	JLabelOperator jLabelOperator = new JLabelOperator(jTabbedPaneOperator);
		219	assertEquals("In order to use this functionality, support for "+clusterName+" must be activated.", jLabelOperator.getText());
		220	}
248	}	221	}
249	}	222	}
250	for (String category : enabledCategories) {	223	for (String category : enabledCategories) {