Warning: the set of usecases that require invoking this method is * very limited and should be generally avoided if possible. In particular, this method diff --git a/projectuiapi/src/org/netbeans/spi/project/ui/support/CommonProjectActions.java b/projectuiapi/src/org/netbeans/spi/project/ui/support/CommonProjectActions.java --- a/projectuiapi/src/org/netbeans/spi/project/ui/support/CommonProjectActions.java +++ b/projectuiapi/src/org/netbeans/spi/project/ui/support/CommonProjectActions.java @@ -73,7 +73,9 @@ * You might include this in the context menu of a logical view. *

* @return an action + * @deprecated No longer recommended for use in logical views. */ + @Deprecated public static Action setAsMainProjectAction() { return Utilities.getActionsFactory().setAsMainProjectAction(); } diff --git a/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java b/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java --- a/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java +++ b/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/Templates.java @@ -216,13 +216,13 @@ /** * Checks whether a project wizard will set the main project. - * (The default is true.) + * (The default is false.) * @param wizardDescriptor a project wizard * @return true if it will set a main project * @since org.netbeans.modules.projectuiapi/1 1.47 */ public static boolean getDefinesMainProject(WizardDescriptor wizardDescriptor) { - return !Boolean.FALSE.equals(wizardDescriptor.getProperty(SET_AS_MAIN)); + return Boolean.TRUE.equals(wizardDescriptor.getProperty(SET_AS_MAIN)); } /** @@ -234,7 +234,9 @@ * @param wizardDescriptor a project wizard * @param definesMainProject true if it will set a main project * @since org.netbeans.modules.projectuiapi/1 1.47 + * @deprecated Projects should not be set as main by default. */ + @Deprecated public static void setDefinesMainProject(WizardDescriptor wizardDescriptor, boolean definesMainProject) { wizardDescriptor.putProperty(SET_AS_MAIN, definesMainProject); } diff --git a/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/package.html b/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/package.html --- a/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/package.html +++ b/projectuiapi/src/org/netbeans/spi/project/ui/templates/support/package.html @@ -50,7 +50,7 @@ file templates described below. The wizard for a project can return {@link org.openide.loaders.DataObject}s or {@link org.openide.loaders.FileObject}s corresponding to the project directories of created files and/or files to be selected in newly created projects. -{@link org.netbeans.spi.project.ui.templates.support.Templates#setDefinesMainProject} may be used.

Each project can also declare own file templates to be exposed it in New File... wizard. This permits users to create new files, which are of types supported by given project type. The project may also diff --git a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/Bundle.properties b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/Bundle.properties --- a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/Bundle.properties +++ b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/Bundle.properties @@ -1,10 +1,10 @@ OpenIDE-Module-Display-Category=Task List OpenIDE-Module-Long-Description=\ - Enables the Task List window to scan for tasks in the main project or all opened projects. + Enables the Task List window to scan for tasks in the selected project or all opened projects. OpenIDE-Module-Name=Task List - Project Integration -LBL_MainProjectScope=Main Project -HINT_MainProjectScope=Show tasks for the main project and for the opened projects which depend on it +LBL_MainProjectScope=Selected Project +HINT_MainProjectScope=Show tasks for the selected project LBL_OpenedProjectsScope=Opened Projects HINT_OpenedProjectsScope=Show tasks for all opened projects @@ -13,6 +13,5 @@ LBL_OpenedProjectsStatusBar=in all opened projects LBL_NoProjectStatusBar= -LBL_MainProjectStatusBar=in the main project and in the opened projects which depends on it LBL_CurrentProjectStatusBar=in {0} HINT_CurrentProjectScope=Show tasks in {0} diff --git a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectIterator.java b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectIterator.java --- a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectIterator.java +++ b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectIterator.java @@ -45,16 +45,12 @@ package org.netbeans.modules.tasklist.projectint; import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import org.netbeans.api.project.Project; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.SourceGroup; import org.netbeans.api.project.Sources; -import org.netbeans.api.project.ui.OpenProjects; -import org.netbeans.spi.project.SubprojectProvider; import org.openide.filesystems.FileObject; -import org.openide.util.Utilities; /** * Iterate all resources (files and folders) that are under the current main project @@ -92,38 +88,17 @@ } protected Iterator createIterator() { - boolean isMainProject = true; - Project currentProject = OpenProjects.getDefault().getMainProject(); - if( null == currentProject ) { - isMainProject = false; - currentProject = MainProjectScanningScope.findCurrentProject(); + Project currentProject = MainProjectScanningScope.findCurrentProject(); if( null == currentProject ) return new EmptyIterator(); - } ArrayList roots = new ArrayList(10); addProject( currentProject, roots ); - if( isMainProject ) - addDependantProjects( currentProject, roots ); - return new FileObjectIterator( roots ); } - private void addDependantProjects( Project mainProject, ArrayList roots ) { - Project[] projects = OpenProjects.getDefault().getOpenProjects(); - for( int i=0; i roots ) { Sources sources = ProjectUtils.getSources( p ); SourceGroup[] groups = sources.getSourceGroups( Sources.TYPE_GENERIC ); diff --git a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectScanningScope.java b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectScanningScope.java --- a/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectScanningScope.java +++ b/tasklist.projectint/src/org/netbeans/modules/tasklist/projectint/MainProjectScanningScope.java @@ -62,7 +62,6 @@ import org.netbeans.api.project.ProjectInformation; import org.netbeans.api.project.ProjectUtils; import org.netbeans.api.project.ui.OpenProjects; -import org.netbeans.spi.project.SubprojectProvider; import org.netbeans.spi.tasklist.TaskScanningScope; import org.openide.filesystems.FileObject; import org.openide.loaders.DataObject; @@ -75,7 +74,7 @@ import org.openide.windows.TopComponent; /** - * Task scanning scope for the main project and all opened projects that depend on it. + * Task scanning scope for the selected project. * * @author S. Aubrecht */ @@ -127,21 +126,6 @@ if( owner.equals( p ) ) return true; - if( p.equals( OpenProjects.getDefault().getMainProject() ) ) { - Project[] projects = OpenProjects.getDefault().getOpenProjects(); - for( int i=0; i +

@@ -16,27 +16,6 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentVisualPanel.java b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentVisualPanel.java --- a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentVisualPanel.java +++ b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentVisualPanel.java @@ -46,8 +46,6 @@ package org.netbeans.modules.vmd.componentssupport.ui.wizard; import java.awt.BorderLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; @@ -113,11 +111,9 @@ void store(WizardDescriptor d) { String name = projectNameTextField.getText().trim(); String folder = createdFolderTextField.getText().trim(); - Boolean setAsMain = mainProject.isSelected(); d.putProperty(CustomComponentWizardIterator.PROJECT_DIR, new File(folder)); d.putProperty(CustomComponentWizardIterator.PROJECT_NAME, name); - d.putProperty(CustomComponentWizardIterator.SET_AS_MAIN, setAsMain); } void read(WizardDescriptor settings) { @@ -138,9 +134,6 @@ // invoke store to have changes in mySettings //typeChooserPanel.store(mySettings); - if (getIsMainProject() != null){ - this.mainProject.setSelected(getIsMainProject()); - } setLocation(getProjectLocation().getAbsolutePath()); this.projectNameTextField.setText(getProjectName()); @@ -165,18 +158,12 @@ checkValidity(); } }; - isMainAL = new ActionListener() { - public void actionPerformed(ActionEvent e) { - mainProjectTouched = true; - } - }; } private void attachDocumentListeners() { if (!listenersAttached) { projectNameTextField.getDocument().addDocumentListener(nameDL); projectLocationTextField.getDocument().addDocumentListener(locationDL); - mainProject.addActionListener(isMainAL); listenersAttached = true; } } @@ -185,7 +172,6 @@ if (listenersAttached) { projectNameTextField.getDocument().removeDocumentListener(nameDL); projectLocationTextField.getDocument().removeDocumentListener(locationDL); - mainProject.removeActionListener(isMainAL); listenersAttached = false; } } @@ -209,9 +195,6 @@ return; } - if (!mainProjectTouched) { - mainProject.setSelected(isStandAlone); - } if (!locationUpdated) { setLocation(computeInitialLocationValue()); } @@ -405,12 +388,6 @@ return projectName; } - Boolean getIsMainProject(){ - Boolean isMain = (Boolean) getSettings() - .getProperty(CustomComponentWizardIterator.SET_AS_MAIN); - return isMain; - } - /* * is invoked from myPanel.validate() * which implements WizardDescriptor.ValidatingPanel @@ -428,7 +405,6 @@ private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; - mainProject = new javax.swing.JCheckBox(); infoPanel = new javax.swing.JPanel(); projectNameLabel = new javax.swing.JLabel(); projectNameTextField = new javax.swing.JTextField(); @@ -442,17 +418,6 @@ setLayout(new java.awt.GridBagLayout()); - mainProject.setSelected(true); - org.openide.awt.Mnemonics.setLocalizedText(mainProject, org.openide.util.NbBundle.getMessage(CustomComponentVisualPanel.class, "LBL_SetAsMainProject")); // NOI18N - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0); - add(mainProject, gridBagConstraints); - mainProject.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CustomComponentVisualPanel.class, "ACSN_SetAsMainProject")); // NOI18N - mainProject.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomComponentVisualPanel.class, "ACSD_SetAsMainProject")); // NOI18N - infoPanel.setLayout(new java.awt.GridBagLayout()); projectNameLabel.setLabelFor(projectNameTextField); @@ -588,7 +553,6 @@ private javax.swing.JTextField createdFolderTextField; private javax.swing.JPanel fillerPanel; private javax.swing.JPanel infoPanel; - private javax.swing.JCheckBox mainProject; private javax.swing.JLabel projectLocationLabel; private javax.swing.JTextField projectLocationTextField; private javax.swing.JLabel projectNameLabel; @@ -648,12 +612,10 @@ private CustomComponentWizardPanel myPanel; private JComponent typeChooserPanel; private boolean locationUpdated; - private boolean mainProjectTouched; private boolean listenersAttached; private DocumentListener nameDL; private DocumentListener locationDL; - private ActionListener isMainAL; static boolean isIllegalName(final String name) { return name.length() == 0 || diff --git a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentWizardIterator.java b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentWizardIterator.java --- a/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentWizardIterator.java +++ b/vmd.componentssupport/src/org/netbeans/modules/vmd/componentssupport/ui/wizard/CustomComponentWizardIterator.java @@ -100,7 +100,6 @@ // properties public static final String PROJECT_DIR = "projDir"; // NOI18N public static final String PROJECT_NAME = "projName"; // NOI18N - public static final String SET_AS_MAIN = "setAsMain"; // NOI18N public static final String LAYER_PATH = "layer"; // NOI18N public static final String BUNDLE_PATH = "bundle"; // NOI18N public static final String CODE_BASE_NAME diff --git a/web.debug/src/org/netbeans/modules/web/debug/actions/JspRunToCursorActionProvider.java b/web.debug/src/org/netbeans/modules/web/debug/actions/JspRunToCursorActionProvider.java --- a/web.debug/src/org/netbeans/modules/web/debug/actions/JspRunToCursorActionProvider.java +++ b/web.debug/src/org/netbeans/modules/web/debug/actions/JspRunToCursorActionProvider.java @@ -120,6 +120,7 @@ // check if current project supports this action Project p = MainProjectManager.getDefault ().getMainProject (); + // XXX revisit - should perhaps check selection? if (p == null) return false; ActionProvider actionProvider = (ActionProvider)p.getLookup ().lookup (ActionProvider.class); if (actionProvider == null) return false; diff --git a/web.examples/src/org/netbeans/modules/web/examples/Bundle.properties b/web.examples/src/org/netbeans/modules/web/examples/Bundle.properties --- a/web.examples/src/org/netbeans/modules/web/examples/Bundle.properties +++ b/web.examples/src/org/netbeans/modules/web/examples/Bundle.properties @@ -80,6 +80,3 @@ LBL_NWP1_SelectProjectLocation=Select Project Location MSG_IllegalProjectName=Project Name is not valid folder name. MSG_ProjectFolderExists=Project Folder already exists and is not empty. -LBL_NWP1_SetAsMain_CheckBox=Set as Main Project -LBL_NWP1_SetAsMain_CheckBoxMnemonic=M -ACS_LBL_NWP1_SetAsMain_A11YDesc=Set as Main Project diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.form @@ -27,21 +27,5 @@ - - - - - - - - - - - - - - - - diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java --- a/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java +++ b/web.examples/src/org/netbeans/modules/web/examples/PanelConfigureProjectVisual.java @@ -54,7 +54,6 @@ private PanelConfigureProject panel; private PanelProjectLocationVisual projectLocationPanel; - private PanelOptionsVisual optionsPanel; /** Creates new form PanelInitProject */ public PanelConfigureProjectVisual(PanelConfigureProject panel) { @@ -65,26 +64,21 @@ projectLocationPanel = new PanelProjectLocationVisual(panel); locationContainer.add(projectLocationPanel, java.awt.BorderLayout.NORTH); - optionsPanel = new PanelOptionsVisual(panel); - optionsContainer.add(optionsPanel, java.awt.BorderLayout.NORTH); - // Provide a name in the title bar. setName(NbBundle.getMessage(PanelConfigureProjectVisual.class, "LBL_NWP1_ProjectTitleName")); //NOI18N putClientProperty ("NewProjectWizard_Title", NbBundle.getMessage(PanelConfigureProjectVisual.class, "TXT_NewWebApp")); //NOI18N } boolean valid(WizardDescriptor wizardDescriptor) { - return projectLocationPanel.valid(wizardDescriptor) && optionsPanel.valid(wizardDescriptor); + return projectLocationPanel.valid(wizardDescriptor); } void read (WizardDescriptor d) { projectLocationPanel.read(d); - optionsPanel.read(d); } void store(WizardDescriptor d) { projectLocationPanel.store(d); - optionsPanel.store(d); } /** This method is called from within the constructor to @@ -92,48 +86,25 @@ * WARNING: Do NOT modify this code. The content of this method is * always regenerated by the Form Editor. */ - // //GEN-BEGIN:initComponents + // //GEN-BEGIN:initComponents private void initComponents() { java.awt.GridBagConstraints gridBagConstraints; locationContainer = new javax.swing.JPanel(); - jSeparator1 = new javax.swing.JSeparator(); - optionsContainer = new javax.swing.JPanel(); + setRequestFocusEnabled(false); setLayout(new java.awt.GridBagLayout()); - setRequestFocusEnabled(false); locationContainer.setLayout(new java.awt.BorderLayout()); - gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; gridBagConstraints.weightx = 1.0; add(locationContainer, gridBagConstraints); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.insets = new java.awt.Insets(12, 0, 12, 0); - add(jSeparator1, gridBagConstraints); - - optionsContainer.setLayout(new java.awt.BorderLayout()); - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - add(optionsContainer, gridBagConstraints); - }// //GEN-END:initComponents // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JSeparator jSeparator1; private javax.swing.JPanel locationContainer; - private javax.swing.JPanel optionsContainer; // End of variables declaration//GEN-END:variables /** Help context where to find more about the paste type action. diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form deleted file mode 100644 --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.form +++ /dev/null @@ -1,57 +0,0 @@ - - -

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java b/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java deleted file mode 100644 --- a/web.examples/src/org/netbeans/modules/web/examples/PanelOptionsVisual.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2010 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]" - * - * Contributor(s): - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - * - * 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. - */ - -package org.netbeans.modules.web.examples; - -import org.openide.WizardDescriptor; - -class PanelOptionsVisual extends javax.swing.JPanel { - - private PanelConfigureProject panel; - - /** Creates new form PanelOptionsVisual */ - public PanelOptionsVisual(PanelConfigureProject panel) { - initComponents(); - this.panel = panel; - } - - /** This method is called from within the constructor to - * initialize the form. - * WARNING: Do NOT modify this code. The content of this method is - * always regenerated by the Form Editor. - */ - private void initComponents() {//GEN-BEGIN:initComponents - java.awt.GridBagConstraints gridBagConstraints; - - setAsMainCheckBox = new javax.swing.JCheckBox(); - jScrollPane1 = new javax.swing.JScrollPane(); - - setLayout(new java.awt.GridBagLayout()); - - setAsMainCheckBox.setMnemonic(org.openide.util.NbBundle.getMessage(PanelOptionsVisual.class, "LBL_NWP1_SetAsMain_CheckBoxMnemonic").charAt(0)); - setAsMainCheckBox.setSelected(true); - setAsMainCheckBox.setText(org.openide.util.NbBundle.getMessage(PanelOptionsVisual.class, "LBL_NWP1_SetAsMain_CheckBox")); - setAsMainCheckBox.setActionCommand("Set as Main Project"); - setAsMainCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 11, 0); - add(setAsMainCheckBox, gridBagConstraints); - setAsMainCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(PanelOptionsVisual.class, "ACS_LBL_NWP1_SetAsMain_A11YDesc")); - - jScrollPane1.setBorder(null); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.weightx = 1.0; - gridBagConstraints.weighty = 1.0; - gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); - add(jScrollPane1, gridBagConstraints); - - }//GEN-END:initComponents - - boolean valid(WizardDescriptor wizardDescriptor) { - return true; - } - - void store(WizardDescriptor d) { - d.putProperty(WizardProperties.SET_AS_MAIN, setAsMainCheckBox.isSelected() ? Boolean.TRUE : Boolean.FALSE ); - } - - void read(WizardDescriptor d) { - } - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JCheckBox setAsMainCheckBox; - // End of variables declaration//GEN-END:variables - -} - diff --git a/web.examples/src/org/netbeans/modules/web/examples/WizardProperties.java b/web.examples/src/org/netbeans/modules/web/examples/WizardProperties.java --- a/web.examples/src/org/netbeans/modules/web/examples/WizardProperties.java +++ b/web.examples/src/org/netbeans/modules/web/examples/WizardProperties.java @@ -49,7 +49,6 @@ public static final String NAME = "name"; //NOI18N public static final String SOURCE_ROOT = "sourceRoot"; //NOI18N - public static final String SET_AS_MAIN = "setAsMain"; //NOI18N public static final String J2EE_LEVEL = "j2eeLevel"; //NOI18N public static final String CONTEXT_PATH = "contextPath"; //NOI18N diff --git a/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml b/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml --- a/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml +++ b/web.project/src/org/netbeans/modules/web/project/ui/resources/layer.xml @@ -250,10 +250,6 @@ - - - -