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

(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/Bundle.properties (-1 / +1 lines)
Lines 38-44 Link Here
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...
(-)a/hudson.php/src/org/netbeans/modules/hudson/php/ui/options/HudsonOptionsPanelController.java (-1 / +1 lines)
Lines 60-66 Link Here
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
)
(-)a/ide.ergonomics/nbproject/project.xml (+9 lines)
Lines 50-55 Link Here
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/>
(-)a/ide.ergonomics/src-ant/org/netbeans/modules/ide/ergonomics/ant/entry-points.xsl (+45 lines)
Lines 55-60 Link Here
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">
(-)4aa9856ba59b (+136 lines)
Added Link Here
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(null, 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
}
(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/ApiGenOptionsPanelController.java (-1 / +1 lines)
Lines 59-65 Link Here
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
)
(-)a/php.apigen/src/org/netbeans/modules/php/apigen/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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:
(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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
(-)a/php.doctrine2/src/org/netbeans/modules/php/doctrine2/ui/options/Doctrine2OptionsPanelController.java (-1 / +1 lines)
Lines 60-66 Link Here
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
)
(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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
(-)a/php.phpdoc/src/org/netbeans/modules/php/phpdoc/ui/options/PhpDocOptionsPanelController.java (-1 / +1 lines)
Lines 59-65 Link Here
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
)
(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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:
(-)a/php.project/src/org/netbeans/modules/php/project/phpunit/ui/options/PhpUnitOptionsPanelController.java (-1 / +1 lines)
Lines 62-68 Link Here
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
)
(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/Bundle.properties (-1 / +1 lines)
Lines 36-42 Link Here
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
SmartyOptionsPanel.openDelimiterLabel.text=Open delimiter:
41
SmartyOptionsPanel.openDelimiterLabel.text=Open delimiter:
42
SmartyOptionsPanel.closeDelimiterLabel.text=Close delimiter:
42
SmartyOptionsPanel.closeDelimiterLabel.text=Close delimiter:
(-)a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanelController.java (-1 / +1 lines)
Lines 57-63 Link Here
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 {
(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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...
(-)a/php.symfony/src/org/netbeans/modules/php/symfony/ui/options/SymfonyOptionsPanelController.java (-1 / +1 lines)
Lines 59-65 Link Here
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
)
(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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:
(-)a/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/options/Symfony2OptionsPanelController.java (-1 / +1 lines)
Lines 61-67 Link Here
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
)
(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/Bundle.properties (-1 / +1 lines)
Lines 39-45 Link Here
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...
(-)a/php.zend/src/org/netbeans/modules/php/zend/ui/options/ZendOptionsPanelController.java (-1 / +1 lines)
Lines 59-65 Link Here
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