# HG changeset patch # User Matthias Bläsing # Date 1363290724 -3600 # Branch dataview-rework-2 # Node ID 38d6becc353cb4e54c181b601157659c28fab81b # Parent 7454aebb8846d6f711c50e6eb89da1309e830032 Fix spelling of DataViewDBTable#getTable and DataViewDBTable#getTableCount diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewActionHandler.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewActionHandler.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewActionHandler.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewActionHandler.java @@ -156,7 +156,7 @@ } void truncateActionPerformed() { - String confirmMsg = NbBundle.getMessage(DataViewActionHandler.class, "MSG_confirm_truncate_table") + dataView.getDataViewDBTable().geTable(0).getDisplayName(); + String confirmMsg = NbBundle.getMessage(DataViewActionHandler.class, "MSG_confirm_truncate_table") + dataView.getDataViewDBTable().getTable(0).getDisplayName(); if ((showYesAllDialog(confirmMsg, confirmMsg)).equals(NotifyDescriptor.YES_OPTION)) { execHelper.executeTruncate(); } diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewDBTable.java @@ -77,11 +77,11 @@ columns = Collections.unmodifiableList(cols); } - public DBTable geTable(int index) { + public DBTable getTable(int index) { return dbTables[index]; } - public int geTableCount() { + public int getTableCount() { return dbTables.length; } diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewTableUI.java @@ -415,7 +415,7 @@ @Override public void actionPerformed(ActionEvent e) { try { - DBTable table = dataView.getDataViewDBTable().geTable(0); + DBTable table = dataView.getDataViewDBTable().getTable(0); String createSQL = dataView.getSQLStatementGenerator().generateCreateStatement(table); ShowSQLDialog dialog = new ShowSQLDialog(); dialog.setLocationRelativeTo(WindowManager.getDefault().getMainWindow()); diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLExecutionHelper.java @@ -488,7 +488,7 @@ public void execute() throws SQLException, DBException { - DBTable dbTable = dataView.getDataViewDBTable().geTable(0); + DBTable dbTable = dataView.getDataViewDBTable().getTable(0); String truncateSql = "TRUNCATE TABLE " + dbTable.getFullyQualifiedName(true); // NOI18N try { diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java --- a/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java +++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/SQLStatementGenerator.java @@ -395,7 +395,7 @@ } private void generateWhereCondition(StringBuilder result, List types, List values, int rowNum, DataViewTableUIModel model) { - DBPrimaryKey key = tblMeta.geTable(0).getPrimaryKey(); + DBPrimaryKey key = tblMeta.getTable(0).getPrimaryKey(); boolean keySelected = false; boolean and = false; @@ -426,7 +426,7 @@ } private void generateWhereCondition(StringBuilder sql, int rowNum, DataViewTableUIModel model) { - DBPrimaryKey key = tblMeta.geTable(0).getPrimaryKey(); + DBPrimaryKey key = tblMeta.getTable(0).getPrimaryKey(); boolean keySelected = false; boolean and = false; diff --git a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/output/DataViewDBTableTest.java b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/output/DataViewDBTableTest.java --- a/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/output/DataViewDBTableTest.java +++ b/db.dataview/test/unit/src/org/netbeans/modules/db/dataview/output/DataViewDBTableTest.java @@ -93,7 +93,7 @@ } public static DBTable getTable(DataView dv, int index){ - return dv.getDataViewDBTable().geTable(index); + return dv.getDataViewDBTable().getTable(index); } /** * Test of geTable method, of class DataViewDBTable. @@ -103,7 +103,7 @@ String sqlStr = context.getSqlSelect(); DataView dv = DataView.create(dbconn, sqlStr, index); DataViewDBTable instance = dv.getDataViewDBTable(); - DBTable result = instance.geTable(0); + DBTable result = instance.getTable(0); assertNotNull(result); assertEquals(11, instance.getColumnCount()); } @@ -117,7 +117,7 @@ DataView dv = DataView.create(dbconn, sqlStr, index); DataViewDBTable instance = dv.getDataViewDBTable(); int expResult = 1; - int result = instance.geTableCount(); + int result = instance.getTableCount(); assertEquals(expResult, result); }