From 222efe686bd83b79177afdca5ef3d90a88e94e65 Mon Sep 17 00:00:00 2001
From: zack <zack@finereport.com>
Date: Tue, 19 Apr 2016 18:32:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BF=9D=E6=8C=81private?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/datapane/TableDataSourceOP.java      | 10 ++++++-
 .../design/data/datapane/TableDataTree.java   |  9 ++++++-
 .../data/datapane/TableDataTreePane.java      | 26 ++++++++++++++++---
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
index fdb5695ba..10e46edd3 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataSourceOP.java
@@ -30,13 +30,21 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     public static final int STORE_PRECEDURE_DATA = 2;
     public static int dataMode = -1;
 
-    protected DesignModelAdapter<?, ?> tc;
+    private DesignModelAdapter<?, ?> tc;
 
 
     public TableDataSourceOP(DesignModelAdapter<?, ?> tc) {
         this.tc = tc;
     }
 
+    public DesignModelAdapter<?, ?> getTc() {
+        return tc;
+    }
+
+    public void setTc(DesignModelAdapter<?, ?> tc) {
+        this.tc = tc;
+    }
+
     /**
      * 初始化数据集的list
      *
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTree.java b/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
index 82663e499..bb8553d30 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTree.java
@@ -32,7 +32,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         this.setEditable(false);
     }
     // CellRenderer
-    protected DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
+    private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() {
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -81,6 +81,13 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
         }
     };
 
+    public DefaultTreeCellRenderer getTableDataTreeCellRenderer() {
+        return tableDataTreeCellRenderer;
+    }
+
+    public void setTableDataTreeCellRenderer(DefaultTreeCellRenderer tableDataTreeCellRenderer) {
+        this.tableDataTreeCellRenderer = tableDataTreeCellRenderer;
+    }
 
     protected void refreshTreeNode(ExpandMutableTreeNode eTreeNode, String childName) {
         if (interceptRefresh(eTreeNode)) {
diff --git a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
index 7cc9d20ba..84c56e794 100644
--- a/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
+++ b/designer_base/src/com/fr/design/data/datapane/TableDataTreePane.java
@@ -77,8 +77,8 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
         return singleton;
     }
 
-    protected static TableDataTree dataTree;
-    protected TableDataSourceOP op;
+    private TableDataTree dataTree;
+    private TableDataSourceOP op;
 
     private MenuDef addMenuDef;
     private EditAction editAction;
@@ -147,6 +147,26 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
         checkButtonEnabled();
     }
 
+    public void setDataTree(TableDataTree dataTree) {
+        this.dataTree = dataTree;
+    }
+
+    public TableDataSourceOP getOp() {
+        return op;
+    }
+
+    public void setOp(TableDataSourceOP op) {
+        this.op = op;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public MenuDef getAddMenuDef() {
         return addMenuDef;
     }
@@ -275,7 +295,7 @@ public class TableDataTreePane extends DockingView implements ResponseDataSource
     /**
      * 刷新
      */
-    public static void refresh() {
+    public void refresh() {
         dataTree.refresh();
     }