DATABIND : Remove resource leak

Change-Id: I715292a32dbf5dd5158fa920472355e4f6b3f2a3
Signed-off-by: jaeyeol lee <jaeyeol148.lee@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java
index f2044f2..f753ae3 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingDnDManager.java
@@ -254,7 +254,11 @@ public class DataBindingDnDManager {
             }
             
             public void drop(DropTargetEvent event) {
-                if ((event == null) || (event.data == null)) {
+               if (event == null) {
+                       return;
+               }
+               
+                if (event.data == null) {
                     event.detail = DND.DROP_NONE;
                     return;
                 }
@@ -280,7 +284,6 @@ public class DataBindingDnDManager {
                         if (parent != null) {
                             event.detail = DND.DROP_NONE;
                         } else {
-//                           
                                BindingData viewModel = dataBindingPage.getViewModel(item.getText());
                                BindingData dataSource = dataBindingPage.getDataSource(sourceItem.getText());
                                dataBindingPage.setDataSourceToViewModel(dataSource, viewModel);
@@ -292,14 +295,13 @@ public class DataBindingDnDManager {
                     }
                 } else if (ViewModelTreeItemTransfer.getInstance()
                         .isSupportedType(event.currentDataType)) {
-                    // if ((event.item != null) &&
-                    // (getRootItemFromTree((TreeItem)
-                    // event.item).getData("SOURCETYPE").equals("STATIC"))) {
-                    TreeItemData treeItemData =
-                            (TreeItemData) getRootItemFromTree((TreeItem) event.item)
-                                    .getData("TREEITEMDATA");
-                    BindingData dataModel = (BindingData) treeItemData.getModel();
-                    if ((event.item != null) && (dataModel != null) && (dataModel.getModelType().equals("STATIC"))) {
+                       BindingData dataModel = null;
+                       if (event.item != null) {
+                               TreeItemData treeItemData =
+                                               (TreeItemData) getRootItemFromTree((TreeItem) event.item).getData("TREEITEMDATA");
+                       dataModel = (BindingData) treeItemData.getModel();
+                       }
+                    if ((dataModel != null) && (dataModel.getModelType().equals("STATIC"))) {
                         TreeItem item = (TreeItem) event.item;
                         Point pt = tree.getDisplay().map(null, tree, event.x, event.y);
                         Rectangle bounds = item.getBounds();

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
index ee22e86..7c802fc 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java
@@ -1420,13 +1420,17 @@ public class SetSourceDialog extends Dialog {
         return importGroup;
     }
 
-    private static String readAll(Reader rd) throws IOException {
+    private static String readAll(Reader rd){
         StringBuilder sb = new StringBuilder();
         int cp;
-        while ((cp = rd.read()) != -1) {
-            sb.append((char) cp);
-        }
-        rd.close();
+        try {
+                       while ((cp = rd.read()) != -1) {
+                           sb.append((char) cp);
+                       }
+               } catch (IOException e) {
+                       e.printStackTrace();
+               }
+        //rd.close();
         return sb.toString();
     }
 
@@ -1458,19 +1462,15 @@ public class SetSourceDialog extends Dialog {
         BufferedReader rd;
                try {
                        rd = new BufferedReader(new FileReader(file));
-                       String jsonText;
-                       try {
-                               jsonText = readAll(rd);
-                               JSONObject json = (JSONObject) JSONValue.parse(jsonText);
-                       return json;
-                       } catch (IOException e) {
-                               return null;
-                       }
-               
+                       String jsonText = readAll(rd);
+                       JSONObject json = (JSONObject) JSONValue.parse(jsonText);
+                       rd.close();
+               return json;
                } catch (FileNotFoundException e) {
                        return null;
+               } catch (IOException e) {
+                       return null;
                }
-        
     }
 
     private void makeTreeItemsFromJson(JSONObject json, String str, TreeItem parentTreeItem,