1.1 --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm Fri Apr 13 07:23:11 2007 +0000
1.2 +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-map.jhm Fri Apr 13 07:58:56 2007 +0000
1.3 @@ -7,11 +7,8 @@
1.4 "http://java.sun.com/products/javahelp/map_1_0.dtd">
1.5
1.6 <map version="1.0">
1.7 - <mapID target="jdbc_about" url="about.html"/>
1.8 - <mapID target="orch_intro" url="intro.html"/>
1.9 - <mapID target="orch_wizard_about" url="wizard/about.html"/>
1.10 - <mapID target="orch_wsdl_props" url="wizard/wsdlprops.html"/>
1.11 - <mapID target="orch_tableobjs_sel" url="wizard/tableobjsel.html"/>
1.12 - <mapID target="orch_operspec_sel" url="wizard/operspecsel.html"/>
1.13 - <mapID target="orch_jndi_input" url="wizard/jndiinput.html"/>
1.14 + <mapID target="org.netbeans.modules.jdbcwizard.wizards.SimpleTargetChooserPanel" url="wizard/wsdlprops.html"/>
1.15 + <mapID target="org.netbeans.modules.jdbcwizard.wizards.JDBCWizardSelectionPanel" url="wizard/tableobjsel.html"/>
1.16 + <mapID target="org.netbeans.modules.jdbcwizard.wizards.JDBCWizardTransferPanel" url="wizard/operspecsel.html"/>
1.17 + <mapID target="org.netbeans.modules.jdbcwizard.wizards.JNDINamePanel" url="wizard/jndiinput.html"/>
1.18 </map>
2.1 --- a/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-toc.xml Fri Apr 13 07:23:11 2007 +0000
2.2 +++ b/sql.help/javahelp/org/netbeans/modules/jdbc/jdbchelp/jdbchelp-toc.xml Fri Apr 13 07:58:56 2007 +0000
2.3 @@ -21,9 +21,8 @@
2.4 "http://java.sun.com/products/javahelp/toc_2_0.dtd">
2.5
2.6 <toc version="2.0">
2.7 -<tocitem text="Servers and Databases">
2.8 -<tocitem text="Working With Databases">
2.9 -<tocitem text="Generating WSDL from a JDBC Data Source" target="jdbc_about" />
2.10 -</tocitem>
2.11 -</tocitem>
2.12 + <tocitem text="About jdbcwizard" target="org.netbeans.modules.jdbcwizard.wizards.SimpleTargetChooserPanel"/>
2.13 + <tocitem text="Table Objects Selection" target="org.netbeans.modules.jdbcwizard.wizards.JDBCWizardSelectionPanel"/>
2.14 + <tocitem text="Select Operation Specific Attributes" target="org.netbeans.modules.jdbcwizard.wizards.JDBCWizardTransferPanel" />
2.15 + <tocitem text="Enter JNDI Name" target="org.netbeans.modules.jdbcwizard.wizards.JNDINamePanel" />
2.16 </toc>
3.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardNamePanel.java Fri Apr 13 07:23:11 2007 +0000
3.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardNamePanel.java Fri Apr 13 07:58:56 2007 +0000
3.3 @@ -221,7 +221,7 @@
3.4 */
3.5 public HelpCtx getHelp() {
3.6 // Show no Help button for this panel:
3.7 - return HelpCtx.DEFAULT_HELP;
3.8 + return new HelpCtx(JDBCWizardNamePanel.class);
3.9
3.10 }
3.11
4.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardSelectionPanel.java Fri Apr 13 07:23:11 2007 +0000
4.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardSelectionPanel.java Fri Apr 13 07:58:56 2007 +0000
4.3 @@ -435,8 +435,7 @@
4.4 public HelpCtx getHelp() {
4.5 // Show no Help button for this panel:
4.6 return new HelpCtx(JDBCWizardSelectionPanel.class);
4.7 - //return HelpCtx.DEFAULT_HELP;
4.8 - }
4.9 + }
4.10
4.11 /**
4.12 * @param settings
4.13 @@ -512,7 +511,6 @@
4.14 */
4.15 public DBTable populateDBTable(String tableName){
4.16 final Connection connection = this.selectedConnection.getJDBCConnection();
4.17 - String driverName = null;
4.18 try{
4.19 final String[][] tableList = DBMetaData.getTablesOnly("", "", "", false,connection);
4.20 DBTable ffTable = null;
4.21 @@ -523,7 +521,7 @@
4.22 if(tableName.equals(currTable[DBMetaData.NAME])){
4.23 ffTable = new DBTableImpl(currTable[DBMetaData.NAME], currTable[DBMetaData.SCHEMA], currTable[DBMetaData.CATALOG]);
4.24 Table t = null;
4.25 - driverName = connection.getMetaData().getDriverName();
4.26 + String driverName = connection.getMetaData().getDriverName();
4.27 //For JDBC-ODBC driver we need to select columns by order otherwise, driver throws
4.28 //Invalid Descriptor Index exception
4.29 if(driverName.startsWith("JDBC-ODBC")){
5.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardTransferPanel.java Fri Apr 13 07:23:11 2007 +0000
5.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardTransferPanel.java Fri Apr 13 07:58:56 2007 +0000
5.3 @@ -134,7 +134,7 @@
5.4 */
5.5 public HelpCtx getHelp() {
5.6 // Show no Help button for this panel:
5.7 - return HelpCtx.DEFAULT_HELP;
5.8 + return new HelpCtx(JDBCWizardTransferPanel.class);
5.9
5.10 }
5.11
6.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JNDINamePanel.java Fri Apr 13 07:23:11 2007 +0000
6.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JNDINamePanel.java Fri Apr 13 07:58:56 2007 +0000
6.3 @@ -128,7 +128,7 @@
6.4 */
6.5 public HelpCtx getHelp() {
6.6 // Show no Help button for this panel:
6.7 - return HelpCtx.DEFAULT_HELP;
6.8 + return new HelpCtx(JNDINamePanel.class);
6.9 }
6.10
6.11 /**
7.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/SimpleTargetChooserPanel.java Fri Apr 13 07:23:11 2007 +0000
7.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/SimpleTargetChooserPanel.java Fri Apr 13 07:58:56 2007 +0000
7.3 @@ -122,16 +122,7 @@
7.4 * @return DOCUMENT ME!
7.5 */
7.6 public HelpCtx getHelp() {
7.7 - if (this.bottomPanel != null) {
7.8 - final HelpCtx bottomHelp = this.bottomPanel.getHelp();
7.9 -
7.10 - if (bottomHelp != null) {
7.11 - return bottomHelp;
7.12 - }
7.13 - }
7.14 -
7.15 - // XXX
7.16 - return null;
7.17 + return new HelpCtx(SimpleTargetChooserPanel.class);
7.18 }
7.19
7.20 /**