1.1 --- a/jemmysupport/manifest.mf Wed Jun 15 09:57:14 2005 +0000
1.2 +++ b/jemmysupport/manifest.mf Fri Jun 17 11:30:35 2005 +0000
1.3 @@ -1,6 +1,6 @@
1.4 OpenIDE-Module: org.netbeans.modules.jemmysupport/1
1.5 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/jemmysupport/Bundle.properties
1.6 -OpenIDE-Module-Specification-Version: 1.19
1.7 +OpenIDE-Module-Specification-Version: 1.20
1.8 OpenIDE-Module-Layer: org/netbeans/modules/jemmysupport/mf-layer.xml
1.9 OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help
1.10
2.1 --- a/jemmysupport/nbproject/project.xml Wed Jun 15 09:57:14 2005 +0000
2.2 +++ b/jemmysupport/nbproject/project.xml Fri Jun 17 11:30:35 2005 +0000
2.3 @@ -67,21 +67,7 @@
2.4 </run-dependency>
2.5 </dependency>
2.6 <dependency>
2.7 - <code-name-base>org.openide.util</code-name-base>
2.8 - <compile-dependency/>
2.9 - <run-dependency>
2.10 - <specification-version>6.2</specification-version>
2.11 - </run-dependency>
2.12 - </dependency>
2.13 - <dependency>
2.14 - <code-name-base>org.openide.loaders</code-name-base>
2.15 - <compile-dependency/>
2.16 - <run-dependency>
2.17 - <specification-version>5.3</specification-version>
2.18 - </run-dependency>
2.19 - </dependency>
2.20 - <dependency>
2.21 - <code-name-base>org.openide.nodes</code-name-base>
2.22 + <code-name-base>org.openide.dialogs</code-name-base>
2.23 <build-prerequisite/>
2.24 <compile-dependency/>
2.25 <run-dependency>
2.26 @@ -89,7 +75,7 @@
2.27 </run-dependency>
2.28 </dependency>
2.29 <dependency>
2.30 - <code-name-base>org.openide.dialogs</code-name-base>
2.31 + <code-name-base>org.openide.explorer</code-name-base>
2.32 <build-prerequisite/>
2.33 <compile-dependency/>
2.34 <run-dependency>
2.35 @@ -105,6 +91,28 @@
2.36 </run-dependency>
2.37 </dependency>
2.38 <dependency>
2.39 + <code-name-base>org.openide.loaders</code-name-base>
2.40 + <build-prerequisite/>
2.41 + <compile-dependency/>
2.42 + <run-dependency>
2.43 + <specification-version>5.3</specification-version>
2.44 + </run-dependency>
2.45 + </dependency>
2.46 + <dependency>
2.47 + <code-name-base>org.openide.nodes</code-name-base>
2.48 + <build-prerequisite/>
2.49 + <compile-dependency/>
2.50 + <run-dependency>
2.51 + <specification-version>6.2</specification-version>
2.52 + </run-dependency>
2.53 + </dependency>
2.54 + <dependency>
2.55 + <code-name-base>org.openide.src</code-name-base>
2.56 + <build-prerequisite/>
2.57 + <compile-dependency/>
2.58 + <run-dependency/>
2.59 + </dependency>
2.60 + <dependency>
2.61 <code-name-base>org.openide.text</code-name-base>
2.62 <build-prerequisite/>
2.63 <compile-dependency/>
2.64 @@ -113,6 +121,14 @@
2.65 </run-dependency>
2.66 </dependency>
2.67 <dependency>
2.68 + <code-name-base>org.openide.util</code-name-base>
2.69 + <build-prerequisite/>
2.70 + <compile-dependency/>
2.71 + <run-dependency>
2.72 + <specification-version>6.2</specification-version>
2.73 + </run-dependency>
2.74 + </dependency>
2.75 + <dependency>
2.76 <code-name-base>org.openide.windows</code-name-base>
2.77 <build-prerequisite/>
2.78 <compile-dependency/>
2.79 @@ -120,28 +136,6 @@
2.80 <specification-version>6.2</specification-version>
2.81 </run-dependency>
2.82 </dependency>
2.83 - <dependency>
2.84 - <code-name-base>org.openide.compat</code-name-base>
2.85 - <build-prerequisite/>
2.86 - <compile-dependency/>
2.87 - <run-dependency>
2.88 - <specification-version>6.2</specification-version>
2.89 - </run-dependency>
2.90 - </dependency>
2.91 - <dependency>
2.92 - <code-name-base>org.openide.explorer</code-name-base>
2.93 - <build-prerequisite/>
2.94 - <compile-dependency/>
2.95 - <run-dependency>
2.96 - <specification-version>6.2</specification-version>
2.97 - </run-dependency>
2.98 - </dependency>
2.99 - <dependency>
2.100 - <code-name-base>org.openide.src</code-name-base>
2.101 - <build-prerequisite/>
2.102 - <compile-dependency/>
2.103 - <run-dependency/>
2.104 - </dependency>
2.105 </module-dependencies>
2.106 <public-packages/>
2.107 </data>
3.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorPanel.form Wed Jun 15 09:57:14 2005 +0000
3.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorPanel.form Fri Jun 17 11:30:35 2005 +0000
3.3 @@ -9,48 +9,22 @@
3.4 </Property>
3.5 </Properties>
3.6 <AuxValues>
3.7 + <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
3.8 + <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
3.9 + <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
3.10 + <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
3.11 <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,50,0,0,2,118"/>
3.12 </AuxValues>
3.13
3.14 <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
3.15 <SubComponents>
3.16 - <Container class="org.openide.explorer.ExplorerPanel" name="packagesPanel">
3.17 - <Properties>
3.18 - <Property name="name" type="java.lang.String" value=""/>
3.19 - </Properties>
3.20 - <Constraints>
3.21 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
3.22 - <GridBagConstraints gridX="0" gridY="1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="12" insetsBottom="0" insetsRight="12" anchor="10" weightX="1.0" weightY="10.0"/>
3.23 - </Constraint>
3.24 - </Constraints>
3.25 -
3.26 - <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
3.27 - <SubComponents>
3.28 - <Container class="org.openide.explorer.view.BeanTreeView" name="packagesTreeView">
3.29 - <Properties>
3.30 - <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.31 - <ResourceString bundle="org/netbeans/modules/jemmysupport/generator/Bundle.properties" key="TTT_Package" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.32 - </Property>
3.33 - <Property name="popupAllowed" type="boolean" value="false"/>
3.34 - <Property name="autoscrolls" type="boolean" value="true"/>
3.35 - </Properties>
3.36 - <Constraints>
3.37 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
3.38 - <BorderConstraints direction="Center"/>
3.39 - </Constraint>
3.40 - </Constraints>
3.41 -
3.42 - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
3.43 - </Container>
3.44 - </SubComponents>
3.45 - </Container>
3.46 <Component class="javax.swing.JLabel" name="selectLabel">
3.47 <Properties>
3.48 <Property name="displayedMnemonic" type="int" editor="org.netbeans.modules.i18n.form.FormI18nMnemonicEditor">
3.49 <ResourceString bundle="org/netbeans/modules/jemmysupport/generator/Bundle.properties" key="MNM_Package" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
3.50 </Property>
3.51 <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
3.52 - <ComponentRef name="packagesTreeView"/>
3.53 + <ComponentRef name="default"/>
3.54 </Property>
3.55 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.56 <ResourceString bundle="org/netbeans/modules/jemmysupport/generator/Bundle.properties" key="LBL_Package" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.57 @@ -65,6 +39,15 @@
3.58 </Constraint>
3.59 </Constraints>
3.60 </Component>
3.61 + <Container class="javax.swing.JPanel" name="projectViewPanel">
3.62 + <Constraints>
3.63 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
3.64 + <GridBagConstraints gridX="0" gridY="1" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="12" insetsBottom="0" insetsRight="12" anchor="10" weightX="1.0" weightY="10.0"/>
3.65 + </Constraint>
3.66 + </Constraints>
3.67 +
3.68 + <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
3.69 + </Container>
3.70 <Component class="javax.swing.JLabel" name="helpLabel">
3.71 <Properties>
3.72 <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
3.73 @@ -125,8 +108,8 @@
3.74 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="startButtonActionPerformed"/>
3.75 </Events>
3.76 <AuxValues>
3.77 + <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value=""/>
3.78 <AuxValue name="JavaCodeGenerator_CreateCodePost" type="java.lang.String" value="stopButton.setVisible(false);"/>
3.79 - <AuxValue name="JavaCodeGenerator_CreateCodeCustom" type="java.lang.String" value=""/>
3.80 </AuxValues>
3.81 <Constraints>
3.82 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
4.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorPanel.java Wed Jun 15 09:57:14 2005 +0000
4.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentGeneratorPanel.java Fri Jun 17 11:30:35 2005 +0000
4.3 @@ -7,20 +7,25 @@
4.4 * http://www.sun.com/
4.5 *
4.6 * The Original Code is NetBeans. The Initial Developer of the Original
4.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
4.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
4.9 * Microsystems, Inc. All Rights Reserved.
4.10 */
4.11
4.12 package org.netbeans.modules.jemmysupport.generator;
4.13
4.14 +import java.awt.BorderLayout;
4.15 import java.awt.event.ActionEvent;
4.16 import java.awt.event.ActionListener;
4.17 +import java.util.ArrayList;
4.18 import java.util.StringTokenizer;
4.19 import org.netbeans.api.project.FileOwnerQuery;
4.20 import org.netbeans.api.project.Project;
4.21 import org.netbeans.spi.project.ui.LogicalViewProvider;
4.22 import org.openide.DialogDescriptor;
4.23 import org.openide.DialogDisplayer;
4.24 +import org.openide.explorer.ExplorerManager;
4.25 +import org.openide.explorer.ExplorerUtils;
4.26 +import org.openide.explorer.view.BeanTreeView;
4.27 import org.openide.loaders.DataFolder;
4.28 import org.openide.loaders.DataObject;
4.29 import org.openide.nodes.AbstractNode;
4.30 @@ -30,6 +35,7 @@
4.31 import org.openide.util.Lookup;
4.32 import org.openide.util.NbBundle;
4.33 import org.openide.util.Utilities;
4.34 +import org.openide.windows.TopComponent;
4.35
4.36 /** Component Generator panel
4.37 * @author <a href="mailto:adam.sotona@sun.com">Adam Sotona</a>
4.38 @@ -46,6 +52,8 @@
4.39 private java.util.Properties props;
4.40 // "<default package>"
4.41 private static final String DEFAULT_PACKAGE_LABEL = NbBundle.getBundle("org.netbeans.modules.java.project.Bundle").getString("LBL_DefaultPackage");
4.42 + // TopComponent for showing project structure
4.43 + private ProjectView projectView;
4.44
4.45
4.46 /** creates ans shows Component Generator dialog
4.47 @@ -60,9 +68,8 @@
4.48 }
4.49 });
4.50 }
4.51 - // XXX doesn't work for projects
4.52 - //panel.setSelectedNodes(nodes);
4.53 - dialog.show();
4.54 + panel.setSelectedNodes(nodes);
4.55 + dialog.setVisible(true);
4.56 }
4.57
4.58 /** Creates new ComponentGeneratorPanel
4.59 @@ -70,42 +77,88 @@
4.60 public ComponentGeneratorPanel(Node[] nodes) {
4.61 loadProperties();
4.62 initComponents();
4.63 - packagesPanel.getExplorerManager().setRootContext(createPackagesNode());
4.64 - packagesPanel.getExplorerManager().addVetoableChangeListener(this);
4.65 - packagesPanel.getExplorerManager().addPropertyChangeListener(this);
4.66 + projectView = new ProjectView();
4.67 + projectView.getExplorerManager().setRootContext(createPackagesNode(nodes));
4.68 + projectView.getExplorerManager().addVetoableChangeListener(this);
4.69 + projectView.getExplorerManager().addPropertyChangeListener(this);
4.70 + projectViewPanel.add(projectView, BorderLayout.CENTER);
4.71 }
4.72 -
4.73
4.74 - private void setSelectedNodes(Node[] nodes) {
4.75 - // XXX this doesnt work anymore
4.76 - DataFolder df;
4.77 - if (packagesTreeView.isEnabled() && nodes!=null && nodes.length>0 && (df=(DataFolder)nodes[0].getCookie(DataFolder.class))!=null) {
4.78 - try {
4.79 - StringTokenizer packageName = new StringTokenizer(df.getPrimaryFile().getPackageName('.'), "."); // NOI18N
4.80 - Node node = packagesPanel.getExplorerManager().getRootContext().getChildren().findChild(df.getPrimaryFile().getFileSystem().getSystemName());
4.81 - while (packageName.hasMoreTokens()) {
4.82 - node = node.getChildren().findChild(packageName.nextToken());
4.83 - }
4.84 - packagesPanel.getExplorerManager().setSelectedNodes(new Node[]{node});
4.85 - }
4.86 - catch(Exception e) {}
4.87 + private class ProjectView extends TopComponent implements ExplorerManager.Provider, Lookup.Provider {
4.88 +
4.89 + private ExplorerManager manager;
4.90 + private BeanTreeView projectTreeView;
4.91 +
4.92 + public ProjectView() {
4.93 + this.setName("");
4.94 + this.manager = new ExplorerManager();
4.95 + this.setLayout(new java.awt.BorderLayout());
4.96 + projectTreeView = new BeanTreeView();
4.97 + projectTreeView.setRootVisible(true);
4.98 + projectTreeView.setToolTipText(org.openide.util.NbBundle.getMessage(ComponentGeneratorPanel.class, "TTT_Package"));
4.99 + projectTreeView.setPopupAllowed(false);
4.100 + projectTreeView.setAutoscrolls(true);
4.101 + this.add(projectTreeView, BorderLayout.CENTER);
4.102 + }
4.103 +
4.104 + public ExplorerManager getExplorerManager() {
4.105 + return manager;
4.106 + }
4.107 +
4.108 + public BeanTreeView getBeanTreeView() {
4.109 + return projectTreeView;
4.110 }
4.111 }
4.112
4.113 - private Node createPackagesNode() {
4.114 - Lookup context = Utilities.actionsGlobalContext();
4.115 - DataObject dataObject = (DataObject)context.lookup(DataObject.class);
4.116 - if(dataObject != null) {
4.117 - Project p = FileOwnerQuery.getOwner(dataObject.getPrimaryFile());
4.118 - if(p != null) {
4.119 - LogicalViewProvider lvp = (LogicalViewProvider)p.getLookup().lookup(LogicalViewProvider.class);
4.120 - return new DataFolderFilterNode(lvp.createLogicalView().cloneNode());
4.121 +
4.122 + private void setSelectedNodes(Node[] nodes) {
4.123 + DataFolder df;
4.124 + if (projectView.getBeanTreeView().isEnabled() && nodes != null && nodes.length > 0 &&
4.125 + (df=(DataFolder)nodes[0].getCookie(DataFolder.class)) != null) {
4.126 + try {
4.127 + // create pathList of node selected in Project view
4.128 + Node node = nodes[0];
4.129 + ArrayList pathList = new ArrayList();
4.130 + pathList.add(node.getName());
4.131 + while((node = node.getParentNode()) != null) {
4.132 + // ignore root node
4.133 + if(node.getParentNode() != null) {
4.134 + pathList.add(node.getName());
4.135 + }
4.136 + }
4.137 + // find node in our tree
4.138 + Node nodeToSelect = projectView.getExplorerManager().getRootContext();
4.139 + for(int i=0;i<pathList.size()-1;i++) {
4.140 + String name = (String)pathList.get(pathList.size()-2-i);
4.141 + nodeToSelect = nodeToSelect.getChildren().findChild(name);
4.142 + }
4.143 + projectView.getExplorerManager().setSelectedNodes(new Node[] {nodeToSelect});
4.144 + }
4.145 + catch(Exception e) {
4.146 + // ignore
4.147 }
4.148 }
4.149 - // no project selected => create a dummy node with message "Please, close the dialog and select a project."
4.150 - Node node = new AbstractNode(Children.LEAF);
4.151 - node.setDisplayName(NbBundle.getMessage(ComponentGeneratorPanel.class, "LBL_SelectProjectNode")); // NOI18N
4.152 - return node;
4.153 + }
4.154 +
4.155 + private Node createPackagesNode(Node[] nodes) {
4.156 + Project project = (Project)nodes[0].getLookup().lookup(Project.class);
4.157 + if(project == null) {
4.158 + // no project root node is selected
4.159 + DataObject dataObject = (DataObject)nodes[0].getLookup().lookup(DataObject.class);
4.160 + if(dataObject != null) {
4.161 + // find project of selected DataObject
4.162 + project = FileOwnerQuery.getOwner(dataObject.getPrimaryFile());
4.163 + }
4.164 + }
4.165 + if(project != null) {
4.166 + LogicalViewProvider lvp = (LogicalViewProvider)project.getLookup().lookup(LogicalViewProvider.class);
4.167 + return new DataFolderFilterNode(lvp.createLogicalView().cloneNode());
4.168 + } else {
4.169 + // no project selected => create a dummy node with message "Please, close the dialog and select a project."
4.170 + Node node = new AbstractNode(Children.LEAF);
4.171 + node.setDisplayName(NbBundle.getMessage(ComponentGeneratorPanel.class, "LBL_SelectProjectNode")); // NOI18N
4.172 + return node;
4.173 + }
4.174 }
4.175
4.176 void loadProperties() {
4.177 @@ -140,12 +193,12 @@
4.178 * WARNING: Do NOT modify this code. The content of this method is
4.179 * always regenerated by the Form Editor.
4.180 */
4.181 - private void initComponents() {//GEN-BEGIN:initComponents
4.182 + // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
4.183 + private void initComponents() {
4.184 java.awt.GridBagConstraints gridBagConstraints;
4.185
4.186 - packagesPanel = new org.openide.explorer.ExplorerPanel();
4.187 - packagesTreeView = new org.openide.explorer.view.BeanTreeView();
4.188 selectLabel = new javax.swing.JLabel();
4.189 + projectViewPanel = new javax.swing.JPanel();
4.190 helpLabel = new javax.swing.JLabel();
4.191 helpLabel.setVisible(false);
4.192 stopButton = new javax.swing.JButton();
4.193 @@ -161,24 +214,7 @@
4.194 setAlignmentX(0.0F);
4.195 setAlignmentY(0.0F);
4.196 setPreferredSize(new java.awt.Dimension(600, 300));
4.197 - packagesPanel.setName("");
4.198 - packagesTreeView.setToolTipText(org.openide.util.NbBundle.getMessage(ComponentGeneratorPanel.class, "TTT_Package"));
4.199 - packagesTreeView.setPopupAllowed(false);
4.200 - packagesTreeView.setAutoscrolls(true);
4.201 - packagesPanel.add(packagesTreeView, java.awt.BorderLayout.CENTER);
4.202 -
4.203 - gridBagConstraints = new java.awt.GridBagConstraints();
4.204 - gridBagConstraints.gridx = 0;
4.205 - gridBagConstraints.gridy = 1;
4.206 - gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
4.207 - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
4.208 - gridBagConstraints.weightx = 1.0;
4.209 - gridBagConstraints.weighty = 10.0;
4.210 - gridBagConstraints.insets = new java.awt.Insets(11, 12, 0, 12);
4.211 - add(packagesPanel, gridBagConstraints);
4.212 -
4.213 selectLabel.setDisplayedMnemonic(java.util.ResourceBundle.getBundle("org/netbeans/modules/jemmysupport/generator/Bundle").getString("MNM_Package").charAt(0));
4.214 - selectLabel.setLabelFor(packagesTreeView);
4.215 selectLabel.setText(org.openide.util.NbBundle.getMessage(ComponentGeneratorPanel.class, "LBL_Package"));
4.216 selectLabel.setToolTipText(org.openide.util.NbBundle.getMessage(ComponentGeneratorPanel.class, "TTT_Package"));
4.217 gridBagConstraints = new java.awt.GridBagConstraints();
4.218 @@ -191,6 +227,18 @@
4.219 gridBagConstraints.insets = new java.awt.Insets(12, 12, 0, 12);
4.220 add(selectLabel, gridBagConstraints);
4.221
4.222 + projectViewPanel.setLayout(new java.awt.BorderLayout());
4.223 +
4.224 + gridBagConstraints = new java.awt.GridBagConstraints();
4.225 + gridBagConstraints.gridx = 0;
4.226 + gridBagConstraints.gridy = 1;
4.227 + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
4.228 + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
4.229 + gridBagConstraints.weightx = 1.0;
4.230 + gridBagConstraints.weighty = 10.0;
4.231 + gridBagConstraints.insets = new java.awt.Insets(11, 12, 0, 12);
4.232 + add(projectViewPanel, gridBagConstraints);
4.233 +
4.234 helpLabel.setFont(new java.awt.Font("Dialog", 2, 12));
4.235 helpLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
4.236 helpLabel.setText(org.openide.util.NbBundle.getMessage(ComponentGeneratorPanel.class, "LBL_Help"));
4.237 @@ -293,7 +341,8 @@
4.238 gridBagConstraints.insets = new java.awt.Insets(11, 12, 0, 12);
4.239 add(cbUseComponentName, gridBagConstraints);
4.240
4.241 - }//GEN-END:initComponents
4.242 + }
4.243 + // </editor-fold>//GEN-END:initComponents
4.244
4.245 private void stopButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_stopButtonActionPerformed
4.246 if (thread!=null) {
4.247 @@ -302,7 +351,7 @@
4.248 }
4.249 stopButton.setVisible(false);
4.250 helpLabel.setVisible(false);
4.251 - packagesTreeView.setEnabled(true);
4.252 + projectView.getBeanTreeView().setEnabled(true);
4.253 startButton.setVisible(true);
4.254 // customizeButton.setEnabled(true);
4.255 screenShot.setEnabled(true);
4.256 @@ -312,7 +361,7 @@
4.257 }//GEN-LAST:event_stopButtonActionPerformed
4.258
4.259 private void startButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_startButtonActionPerformed
4.260 - packagesTreeView.setEnabled(false);
4.261 + projectView.getBeanTreeView().setEnabled(false);
4.262 startButton.setVisible(false);
4.263 stopButton.setVisible(true);
4.264 // customizeButton.setEnabled(false);
4.265 @@ -348,9 +397,9 @@
4.266 public void propertyChange(java.beans.PropertyChangeEvent ev) {
4.267 if (org.openide.explorer.ExplorerManager.PROP_SELECTED_NODES.equals(ev.getPropertyName())) {
4.268 startButton.setEnabled(false);
4.269 - Node[] arr = packagesPanel.getExplorerManager().getSelectedNodes();
4.270 + Node[] arr = projectView.getExplorerManager().getSelectedNodes();
4.271 if (arr.length == 1) {
4.272 - org.openide.loaders.DataFolder df = (org.openide.loaders.DataFolder)arr[0].getCookie(org.openide.loaders.DataFolder.class);
4.273 + DataFolder df = (DataFolder)arr[0].getCookie(DataFolder.class);
4.274 try {
4.275 if ((df != null) && (!df.getPrimaryFile().getFileSystem().isReadOnly())) {
4.276 startButton.setEnabled(true);
4.277 @@ -377,8 +426,7 @@
4.278 private javax.swing.JCheckBox cbUseComponentName;
4.279 private javax.swing.JLabel helpLabel;
4.280 private javax.swing.JCheckBox mergeConflicts;
4.281 - private org.openide.explorer.ExplorerPanel packagesPanel;
4.282 - private org.openide.explorer.view.BeanTreeView packagesTreeView;
4.283 + private javax.swing.JPanel projectViewPanel;
4.284 private javax.swing.JCheckBox screenShot;
4.285 private javax.swing.JLabel selectLabel;
4.286 private javax.swing.JCheckBox showEditor;
5.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentsEditorPanel.form Wed Jun 15 09:57:14 2005 +0000
5.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentsEditorPanel.form Fri Jun 17 11:30:35 2005 +0000
5.3 @@ -65,7 +65,6 @@
5.4 <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
5.5 <ResourceString bundle="org/netbeans/modules/jemmysupport/generator/Bundle.properties" key="TTT_Properties" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}", {arguments})"/>
5.6 </Property>
5.7 - <Property name="displayWritableOnly" type="boolean" value="true"/>
5.8 </Properties>
5.9 <AccessibilityProperties>
5.10 <Property name="AccessibleContext.accessibleName" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
6.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentsEditorPanel.java Wed Jun 15 09:57:14 2005 +0000
6.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/generator/ComponentsEditorPanel.java Fri Jun 17 11:30:35 2005 +0000
6.3 @@ -7,7 +7,7 @@
6.4 * http://www.sun.com/
6.5 *
6.6 * The Original Code is NetBeans. The Initial Developer of the Original
6.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2002 Sun
6.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
6.9 * Microsystems, Inc. All Rights Reserved.
6.10 */
6.11
6.12 @@ -161,7 +161,6 @@
6.13 splitPane.setLeftComponent(scrollPane);
6.14
6.15 propertySheet.setToolTipText(org.openide.util.NbBundle.getMessage(ComponentsEditorPanel.class, "TTT_Properties", new Object[] {}));
6.16 - propertySheet.setDisplayWritableOnly(true);
6.17 splitPane.setRightComponent(propertySheet);
6.18 propertySheet.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(ComponentsEditorPanel.class, "LBL_Properties", new Object[] {}));
6.19
6.20 @@ -219,7 +218,7 @@
6.21 public static boolean showDialog(ComponentGenerator gen) {
6.22 DialogDescriptor desc = new DialogDescriptor(new ComponentsEditorPanel(gen), NbBundle.getMessage(ComponentsEditorPanel.class, "ComponentsEditor_Title"), true, DialogDescriptor.OK_CANCEL_OPTION, DialogDescriptor.OK_OPTION, null); // NOI18N
6.23 desc.setHelpCtx(new HelpCtx(ComponentsEditorPanel.class));
6.24 - org.openide.DialogDisplayer.getDefault().createDialog(desc).show();
6.25 + org.openide.DialogDisplayer.getDefault().createDialog(desc).setVisible(true);
6.26 return desc.getValue()==DialogDescriptor.OK_OPTION;
6.27 }
6.28
7.1 --- a/jemmysupport/src/org/netbeans/modules/jemmysupport/namelookup/NameLookupPanel.java Wed Jun 15 09:57:14 2005 +0000
7.2 +++ b/jemmysupport/src/org/netbeans/modules/jemmysupport/namelookup/NameLookupPanel.java Fri Jun 17 11:30:35 2005 +0000
7.3 @@ -7,7 +7,7 @@
7.4 * http://www.sun.com/
7.5 *
7.6 * The Original Code is NetBeans. The Initial Developer of the Original
7.7 - * Code is Sun Microsystems, Inc. Portions Copyright 1997-2004 Sun
7.8 + * Code is Sun Microsystems, Inc. Portions Copyright 1997-2005 Sun
7.9 * Microsystems, Inc. All Rights Reserved.
7.10 */
7.11
7.12 @@ -57,7 +57,7 @@
7.13 )
7.14 );
7.15 }
7.16 - dialog.show();
7.17 + dialog.setVisible(true);
7.18 }
7.19
7.20