# HG changeset patch
# User Matthias Bläsing <matthias42@netbeans.org>
# Date 1363468373 -3600
# Branch dataview-rework-2
# Node ID 05a67a3d543d9acc1c4d72f0e731694257d0922d
# Parent  a35c53722dcd45ba5b79b713b4789d8af8b6a46c
Move editable handling completly into the DataViewTableUIModel, that is part of DataViewPageContext

diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataView.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataView.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataView.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataView.java
@@ -129,7 +129,7 @@
         synchronized (this) {
             DataViewDBTable tblMeta = dataPage.getTableMetaData();
             this.dataViewUI = new DataViewUI(this, dataPage, nbOutputComponent);
-            dataViewUI.setEditable(tblMeta == null ? false : tblMeta.hasOneTable());
+            dataPage.getModel().setEditable(tblMeta == null ? false : tblMeta.hasOneTable());
             resetToolbar(hasExceptions());
         }
         results = new ArrayList<Component>();
@@ -194,7 +194,7 @@
     }
 
     public synchronized void setEditable(boolean editable) {
-        dataViewUI.setEditable(editable);
+        getDataViewPageContext().getModel().setEditable(editable);
     }
 
     // Used by org.netbeans.modules.db.dataview.api.DataViewPageContext#getPageSize
@@ -238,7 +238,7 @@
     }
 
     public boolean isEditable() {
-        return dataViewUI.isEditable();
+        return getDataViewPageContext().getModel().isEditable();
     }
 
     synchronized void disableButtons() {
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
@@ -305,7 +305,7 @@
 
             if (e.getSource() == table.getSelectionModel() && table.getRowSelectionAllowed()) {
                 boolean rowSelected = table.getSelectedRows().length > 0;
-                if (rowSelected && dataviewUI.isEditable()) {
+                if (rowSelected && getModel().isEditable()) {
                     dataviewUI.enableDeleteBtn(true);
                 } else {
                     dataviewUI.enableDeleteBtn(false);
@@ -566,7 +566,7 @@
                     if (!inSelection) {
                         changeSelection(selectedRow, selectedColumn, false, false);
                     }
-                    if (!dataviewUI.isEditable()) {
+                    if (! getModel().isEditable()) {
                         miInsertAction.setEnabled(false);
                         miDeleteAction.setEnabled(false);
                         miTruncateRecord.setEnabled(false);
diff --git a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
--- a/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
+++ b/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewUI.java
@@ -206,14 +206,6 @@
         return editButtons;
     }
 
-    void setEditable(boolean editable) {
-        getDataViewTableUIModel().setEditable(editable);
-    }
-
-    boolean isEditable() {
-        return getDataViewTableUIModel().isEditable();
-    }
-
     void updateTotalCountLabel() {
         assert SwingUtilities.isEventDispatchThread() : "Must be called from AWT thread";  //NOI18N
 
@@ -315,7 +307,7 @@
             }
 
             // editing controls
-            if (!isEditable()) {
+            if (! dataPanel.getModel().isEditable()) {
                 commit.setEnabled(false);
                 cancel.setEnabled(false);
                 deleteRow.setEnabled(false);