diff -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b ide.ergonomics/nbproject/project.xml --- a/ide.ergonomics/nbproject/project.xml Mon Aug 20 18:02:36 2012 +0200 +++ b/ide.ergonomics/nbproject/project.xml Tue Aug 21 15:56:43 2012 +0200 @@ -50,6 +50,15 @@ + org.netbeans.modules.options.api + + + + 1 + 1.27 + + +

org.netbeans.modules.project.ant

diff -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/OptionCntrl.java Tue Aug 21 15:56:43 2012 +0200 @@ -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(null, 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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -39,7 +39,7 @@ # Portions Copyrighted 2011 Sun Microsystems, Inc. # controller -LBL_OptionsName=ApiGen +LBL_PHPGenOptionsName=ApiGen # panel ApiGenOptionsPanel.apiGenLabel.text=&ApiGen Script: diff -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -36,7 +36,7 @@ # Portions Copyrighted 2009 Sun Microsystems, Inc. # ide options -LBL_OptionsName=Smarty +LBL_PHPSmartyOptionsName=Smarty LBL_OptionsTooltip=PHP Smarty Framework SmartyOptionsPanel.openDelimiterLabel.text=Open delimiter: SmartyOptionsPanel.closeDelimiterLabel.text=Close delimiter: diff -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties Tue Aug 21 15:56:43 2012 +0200 @@ -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 -r 4aa9856ba59b 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 Mon Aug 20 18:02:36 2012 +0200 +++ b/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java Tue Aug 21 15:56:43 2012 +0200 @@ -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 )