From 15fb90a1d7c7e8a45e024b80ea81ead90129144b Mon Sep 17 00:00:00 2001
From: jeongjaehong <jeongjaehong@gmail.com>
Date: Thu, 28 Apr 2016 11:32:07 +0900
Subject: [PATCH] merge from hangum

---
 .../start/ApplicationActionBarAdvisor.java         |   1 -
 com.hangum.tadpole.application/html/body.html      |   5 -
 .../initialize/TadpoleEngineDBEngine.sqlite_1.7.1  | Bin 58368 -> 0 bytes
 .../initialize/TadpoleSystemInitializer.java       |   5 -
 com.hangum.tadpole.rdb.core/plugin.xml             |   6 +-
 .../resources/icons/{ => dbs}/altibase_add.png     | Bin
 .../resources/icons/{ => dbs}/cubrid-add.png       | Bin
 .../resources/icons/{ => dbs}/hive-add.png         | Bin
 .../resources/icons/{ => dbs}/mariadb-add.png      | Bin
 .../resources/icons/{ => dbs}/mongodb-add.png      | Bin
 .../resources/icons/{ => dbs}/mssql-add.png        | Bin
 .../resources/icons/{ => dbs}/mysql-add.png        | Bin
 .../resources/icons/{ => dbs}/oracle-add.png       | Bin
 .../resources/icons/{ => dbs}/postgresSQL-add.png  | Bin
 .../resources/icons/{ => dbs}/sqlite-add.png       | Bin
 .../resources/icons/{ => dbs}/tajo-add.jpg         | Bin
 .../resources/icons/{ => dbs}/tibero_add.png       | Bin
 .../resources/icons/editor/compile_0.28.png        | Bin 0 -> 696 bytes
 .../resources/icons/editor/hammer-icon.png         | Bin 135 -> 0 bytes
 .../resources/icons/object_editor.png              | Bin 509 -> 0 bytes
 .../resources/icons/object_editor_0.28.png         | Bin 268 -> 0 bytes
 .../global/OpenObjectQueryEditorAction.java        |   2 +-
 .../rdb/core/dialog/db/UserDBGroupDialog.java      |   2 +-
 .../export/sqlresult/ResultSetDownloadDialog.java  |  26 ++--
 .../export/sqltoapplication/SQLToStringDialog.java | 125 +++--------------
 .../composites/AbstractSQLToComposite.java         |  55 ++++++++
 .../AxisjComposite.java}                           | 144 ++++----------------
 .../SQLToOthersComposite.java}                     | 148 +++++----------------
 .../tadpole/rdb/core/editors/main/MainEditor.java  |   2 +-
 .../rdb/core/editors/main/MainEditorInput.java     |   1 -
 .../rdb/core/viewers/connections/DBIconsUtils.java |   4 +-
 .../tadpole/rdb/erd/core/.ModelConverter.xtendbin  | Bin 643 -> 643 bytes
 32 files changed, 151 insertions(+), 375 deletions(-)
 delete mode 100644 com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleEngineDBEngine.sqlite_1.7.1
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/altibase_add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/cubrid-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/hive-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/mariadb-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/mongodb-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/mssql-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/mysql-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/oracle-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/postgresSQL-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/sqlite-add.png (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/tajo-add.jpg (100%)
 rename com.hangum.tadpole.rdb.core/resources/icons/{ => dbs}/tibero_add.png (100%)
 create mode 100644 com.hangum.tadpole.rdb.core/resources/icons/editor/compile_0.28.png
 delete mode 100644 com.hangum.tadpole.rdb.core/resources/icons/editor/hammer-icon.png
 delete mode 100644 com.hangum.tadpole.rdb.core/resources/icons/object_editor.png
 delete mode 100644 com.hangum.tadpole.rdb.core/resources/icons/object_editor_0.28.png
 create mode 100644 com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AbstractSQLToComposite.java
 copy com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/{SQLToStringDialog.java => composites/AxisjComposite.java} (50%)
 copy com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/{SQLToStringDialog.java => composites/SQLToOthersComposite.java} (50%)
 rewrite com.hangum.tadpole.rdb.erd.core/xtend-gen/com/hangum/tadpole/rdb/erd/core/.ModelConverter.xtendbin (67%)

diff --git a/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationActionBarAdvisor.java b/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationActionBarAdvisor.java
index becc69611..e1434a297 100644
--- a/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationActionBarAdvisor.java
+++ b/com.hangum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/ApplicationActionBarAdvisor.java
@@ -44,7 +44,6 @@ import com.hangum.tadpole.manager.core.actions.global.RestfulAPIManagerAction;
 import com.hangum.tadpole.manager.core.actions.global.SQLAuditAction;
 import com.hangum.tadpole.manager.core.actions.global.SchemaHistoryAction;
 import com.hangum.tadpole.manager.core.actions.global.TransactionConnectionManagerAction;
-import com.hangum.tadpole.monitoring.core.actions.monitoring.MonitoringRealTimeAction;
 import com.hangum.tadpole.rdb.core.actions.global.ConnectDatabaseAction;
 import com.hangum.tadpole.rdb.core.actions.global.DeleteResourceAction;
 import com.hangum.tadpole.rdb.core.actions.global.ExitAction;
diff --git a/com.hangum.tadpole.application/html/body.html b/com.hangum.tadpole.application/html/body.html
index 55471e36b..48d818cd8 100644
--- a/com.hangum.tadpole.application/html/body.html
+++ b/com.hangum.tadpole.application/html/body.html
@@ -3,16 +3,11 @@
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
   ga('create', 'UA-53250504-1', 'auto');
- /* ga('send', 'pageview'); */
 </script>
-
 <div id="splash" style="position: absolute; margin-left: -75px; margin-top: -50px; left: 50%; top: 50%; width: 200px; border: 1px solid #c0c0c0; background-color: #fafafa; text-align: center;">
   <img src="./loading.gif" width="32" height="32" style="margin: 10px 15px 0" />
-  
   <div style="margin: 5px 15px 10px; color: #2A8C1D; font: 12px Verdana, 'Lucida Sans', sans-serif">
     Tadpole DB Hub loading...
   </div>
-  
 </div>
diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleEngineDBEngine.sqlite_1.7.1 b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleEngineDBEngine.sqlite_1.7.1
deleted file mode 100644
index 1e5836160c8e3a5be47cd80c43a258c572bc0600..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 58368
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
XNT-esSiCO5-^Yjh)`X6r!T0}vmO9GK

diff --git a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java
index 1bc7278a7..bc9e37657 100644
--- a/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java
+++ b/com.hangum.tadpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java
@@ -14,16 +14,11 @@ import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Path;
-import org.osgi.framework.Bundle;
 
 import com.hangum.tadpole.cipher.core.manager.CipherManager;
 import com.hangum.tadpole.commons.libs.core.define.SystemDefine;
diff --git a/com.hangum.tadpole.rdb.core/plugin.xml b/com.hangum.tadpole.rdb.core/plugin.xml
index 250168934..6e1b94ed7 100644
--- a/com.hangum.tadpole.rdb.core/plugin.xml
+++ b/com.hangum.tadpole.rdb.core/plugin.xml
@@ -59,7 +59,7 @@
       <editor
             class="com.hangum.tadpole.mongodb.core.ext.editors.javascript.ServerSideJavaScriptEditor"
             default="false"
-            icon="resources/icons/mongodb-add.png"
+            icon="resources/icons/dbs/mongodb-add.png"
             id="com.hangum.tadpole.mongodb.core.ext.editor.javascript"
             name="%editor.name.3">
       </editor>
@@ -93,7 +93,7 @@
       <editor
             class="com.hangum.tadpole.rdb.core.editors.objectmain.ObjectEditor"
             default="false"
-            icon="resources/icons/editor/hammer-icon.png"
+            icon="resources/icons/editor/compile.png"
             id="com.hangum.tadpole.rdb.core.editor.main.procedure"
             name="%editor.name.8">
       </editor>
@@ -285,7 +285,7 @@
          </action>
          <action
                class="com.hangum.tadpole.rdb.core.actions.connections.ObjecCompileAction"
-               icon="resources/icons/object_editor.png"
+               icon="resources/icons/editor/compile.png"
                id="com.hangum.tadpole.rdb.core.action.query.object.compile.editor"
                label="%action.label.openObjectCompile"
                menubarPath="additions">
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/altibase_add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/altibase_add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/altibase_add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/altibase_add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/cubrid-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/cubrid-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/cubrid-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/cubrid-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/hive-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/hive-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/hive-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/hive-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/mariadb-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/mariadb-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/mariadb-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/mariadb-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/mongodb-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/mongodb-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/mongodb-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/mongodb-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/mssql-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/mssql-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/mssql-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/mssql-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/mysql-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/mysql-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/mysql-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/mysql-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/oracle-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/oracle-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/oracle-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/oracle-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/postgresSQL-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/postgresSQL-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/postgresSQL-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/postgresSQL-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/sqlite-add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/sqlite-add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/sqlite-add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/sqlite-add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/tajo-add.jpg b/com.hangum.tadpole.rdb.core/resources/icons/dbs/tajo-add.jpg
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/tajo-add.jpg
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/tajo-add.jpg
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/tibero_add.png b/com.hangum.tadpole.rdb.core/resources/icons/dbs/tibero_add.png
similarity index 100%
rename from com.hangum.tadpole.rdb.core/resources/icons/tibero_add.png
rename to com.hangum.tadpole.rdb.core/resources/icons/dbs/tibero_add.png
diff --git a/com.hangum.tadpole.rdb.core/resources/icons/editor/compile_0.28.png b/com.hangum.tadpole.rdb.core/resources/icons/editor/compile_0.28.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f9d84eb3c3e643dcfae2a18ee5b5786bde11212
GIT binary patch
literal 696
zcwXxa@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z8pn}NEkcg59UmvUF{9L`nl>DSry^7od1`x2RumUo3Q%e#RDspr3imfVa
zmB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)DJWiJpOy9hZWFf=y9MnpKdC8&o@xXRDM^
zQc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3nOBlnp_^B%3^4>|j!SBBa#3bM
zNoIbY0*IfOlwVq6tE2=~0|5|=N;1<BHsuvVy#@53K1fF2P|rXgZZ^nxkf@b^QD!R8
zW{~-IhBo>bVlcPpqd5lRQ+=pc?YM08;lXCd<#R|q5*U&{JY5_^BqWnl5)u-4_6e*%
zdg$!Y>JNY3?bbi^Zcmy(qG?ja=ik~MeXJe^^?!faHog2WzqLL`N4W9Ncb_%&vi}SX
zYFIY?H(=!4Hb1`p*Pmbiwcp&oeg9U1qvNv64!<M>;+bcDc>8?2yi8C1f1^E>zkjJu
zIRD}Q_4-1Eqnt;I&in~|q&X)h#xH;W9`S_w(|`W1f4cwke)AgfB!Ps4^dAQgoK?}(
zoP1`*xm6#$AAPS6^!>QvzJA?n#!|bq2kEsOOU^SGHXEF`S?Qcq9rE9}#n^@U=Num;
zpHc@a{*KKOJ(4|<jXc_H(rp%TY;1yU5rugQ_Zd5U8*WH36wU~^=hUy42}(|$u6{1-
HoD!M<;3@jf

literal 0
HcwPel00001

diff --git a/com.hangum.tadpole.rdb.core/resources/icons/editor/hammer-icon.png b/com.hangum.tadpole.rdb.core/resources/icons/editor/hammer-icon.png
deleted file mode 100644
index 331dbe2ae4d4748f4bcb1b783f813ef8dc6ded06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 135
zcwXxa@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6{5)M8Ln;`P6$E#L?2ceg+}mxs
zOr-sE)%5=b5&bI_WHoxi9XEQLOxW{&68}~vYljz0Co+liEodsM;o8&4<@Y!^fdA7Y
i2JH)sS|=3^>lo!KjVHZR@^t~4%;4$j=d#Wzp$Py>-YZG~

diff --git a/com.hangum.tadpole.rdb.core/resources/icons/object_editor.png b/com.hangum.tadpole.rdb.core/resources/icons/object_editor.png
deleted file mode 100644
index 6ce2e3643884e23fa3fab229d970e1256f8f6aca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 509
zcwPbh0RsMsP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0005RNkl<Zcmb8m
z1B@JK07vnEZQE^7o`SpDZB$IKwr$(CZQHhO+qS*?)xNefzvRUa|3_L{`lYOtY=*X`
z_HcMe_*7p{UwwanzvuAK(0`x?13g0_7bjPOxVU(dp03`gi;D|cUt1&NqoW(;B_$b3
z3JUu`i}0}U*_GvGGCDG{QCU$**x1<On3$NhfEtR5is#$f+WPu>d#4Qzji-c!geTqI
zJxEkk^n#9#t`L4FDl96cyr^j0)5AlVo}OVVg+kfF%*@g$D=WWYZEd52UokQ=5+3O5
zBRV=dcKC|2vhrz0MkY)AN}<ahnU(3LvCP!e8Z9lYouGxU8iZDhu8`rlz4Imt|1g6V
zwo<q?m3DGrGW9qqb-|z_D-MHNHj+3x5WTB?G4B#-4+4>Ah9qbasgLOO(i>zjW+$<c
zL@8+DA`iZq%(G-7<p?Qo#IgiEZi8CxO1Ll*zi(nb=R9fj1CgYM1*ny5j!kWWNLeen
zM*5?+ksvJ;OEF+8sAVmI1M@i-*G3Z$l5ATnusp{D04KicIDlgSjsVyXU>AUG05;>3
z2;(D^Br{YBQD6q(34ogbt^qg;;LyiuGycaLDzeN$uFt!y00000NkvXXu0mjfBFy7&

diff --git a/com.hangum.tadpole.rdb.core/resources/icons/object_editor_0.28.png b/com.hangum.tadpole.rdb.core/resources/icons/object_editor_0.28.png
deleted file mode 100644
index 44dbad426fe69b2c5d2ab2ffac2ff0919d9af7cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 268
zcwPYv0rUQeP)<h;3K|Lk000e1NJLTq000O8000OG1^@s6#1FoU0002fNkl<ZcmZPo
zfzZ%UW)K}18tO4;?!0RU4jy`FY3HKLfDBfxTEzyUSvaLFA3S*Uf6v~14}e^5kQn3t
zRja@z7+c!uE?%<i<<@OG|DQg4?*H-?t6m|DFv>Gtw_)@9-Fx=_kBE-Xo-uRIosQ0)
zEnvCLmAXs!%`W@1YVD@Ksi_&UP%ZL6%*wE-!E4U5^=bbPHe3BKR%Ivy$;_NNlNE0A
zx#{8mk9E2JuX7UE)mi4p3l(N$`2U{~OxHOwR5p9dPIGW@-~q`rG%zqB`wjpJ)KR?}
S5f8`!0000<MNUMnLSTYO?08lH

diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/actions/global/OpenObjectQueryEditorAction.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/actions/global/OpenObjectQueryEditorAction.java
index b5ed6471c..b5cb61cb5 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/actions/global/OpenObjectQueryEditorAction.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/actions/global/OpenObjectQueryEditorAction.java
@@ -47,7 +47,7 @@ public class OpenObjectQueryEditorAction extends Action implements ISelectionLis
 		setId(ID);
 		setText(Messages.get().CompileObjectEditorOpen);
 		setToolTipText(Messages.get().CompileObjectEditorOpen);
-		setImageDescriptor( ResourceManager.getPluginImageDescriptor(Activator.PLUGIN_ID, "resources/icons/object_editor.png"));
+		setImageDescriptor( ResourceManager.getPluginImageDescriptor(Activator.PLUGIN_ID, "resources/icons/editor/compile.png"));
 		setEnabled(false);
 		
 		window.getSelectionService().addPostSelectionListener(this);
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/db/UserDBGroupDialog.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/db/UserDBGroupDialog.java
index 14abdbae4..af5bf6c3a 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/db/UserDBGroupDialog.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/db/UserDBGroupDialog.java
@@ -56,7 +56,7 @@ public class UserDBGroupDialog extends Dialog {
 		
 		// get group list ----------------------------------
 		try {
-			listUserGroup = TadpoleSystem_UserDBQuery.getUserGroupDB(userDB.getGroup_name());
+			listUserGroup = TadpoleSystem_UserDBQuery.getUserGroupDB(oriUserDB.getGroup_name());
 		} catch(Exception e) {
 			logger.error("get group info", e);
 		}
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqlresult/ResultSetDownloadDialog.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqlresult/ResultSetDownloadDialog.java
index bb3b5b10e..d6531c6ee 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqlresult/ResultSetDownloadDialog.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqlresult/ResultSetDownloadDialog.java
@@ -92,7 +92,7 @@ public class ResultSetDownloadDialog extends Dialog {
 	
 	protected DownloadServiceHandler downloadServiceHandler;
 	private boolean isSendEditor;
-	private MainEditor editor;
+	private MainEditor targetEditor;
 	
 	/**
 	 * Create the dialog.
@@ -182,9 +182,9 @@ public class ResultSetDownloadDialog extends Dialog {
 			IEditorPart activeEditor = qea.open(queryExecuteResultDTO.getUserDB());
 			
 			if (activeEditor instanceof MainEditor) {
-				editor = (MainEditor) activeEditor;
-				editor.setDirty(true); // 저장버튼 활성
-				editor.setFocus();
+				targetEditor = (MainEditor) activeEditor;
+				targetEditor.setDirty(true); // 저장버튼 활성
+				targetEditor.setFocus();
 			}
 			okPressed();
 		}
@@ -268,7 +268,7 @@ public class ResultSetDownloadDialog extends Dialog {
 			if (isPreview) {
 				previewDataLoad(targetName, CSVExpoter.makeContent(isAddHead, targetName, queryExecuteResultDTO, seprator, PREVIEW_COUNT), encoding);
 			}else if (this.isSendEditor) {
-				editor.appendText(CSVExpoter.makeContent(isAddHead, targetName, queryExecuteResultDTO, seprator));
+				targetEditor.appendText(CSVExpoter.makeContent(isAddHead, targetName, queryExecuteResultDTO, seprator));
 			}else{
 				downloadFile(targetName, CSVExpoter.makeCSVFile(isAddHead, targetName, queryExecuteResultDTO, seprator), encoding);
 			}
@@ -282,7 +282,7 @@ public class ResultSetDownloadDialog extends Dialog {
 			if (isPreview) {
 				previewDataLoad(targetName, HTMLExporter.makeContent(targetName, queryExecuteResultDTO, PREVIEW_COUNT), encoding);
 			}else if (isSendEditor) {
-				editor.appendText(HTMLExporter.makeContent(targetName, queryExecuteResultDTO));
+				targetEditor.appendText(HTMLExporter.makeContent(targetName, queryExecuteResultDTO));
 			}else{
 				downloadFile(targetName, HTMLExporter.makeContentFile(targetName, queryExecuteResultDTO), encoding);
 			}
@@ -297,7 +297,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, JsonExpoter.makeContent(targetName, queryExecuteResultDTO, schemeKey, recordKey, isFormat, PREVIEW_COUNT), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(JsonExpoter.makeContent(targetName, queryExecuteResultDTO, schemeKey, recordKey, isFormat, -1));
+					targetEditor.appendText(JsonExpoter.makeContent(targetName, queryExecuteResultDTO, schemeKey, recordKey, isFormat, -1));
 				}else{
 					downloadFile(targetName, JsonExpoter.makeContentFile(targetName, queryExecuteResultDTO, schemeKey, recordKey, isFormat), encoding);
 				}
@@ -305,7 +305,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, JsonExpoter.makeContent(targetName, queryExecuteResultDTO, isFormat, PREVIEW_COUNT), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(JsonExpoter.makeContent(targetName, queryExecuteResultDTO, isFormat, -1));
+					targetEditor.appendText(JsonExpoter.makeContent(targetName, queryExecuteResultDTO, isFormat, -1));
 				}else{
 					downloadFile(targetName, JsonExpoter.makeContentFile(targetName, queryExecuteResultDTO, isFormat), encoding);
 				}
@@ -320,7 +320,7 @@ public class ResultSetDownloadDialog extends Dialog {
 			if (isPreview) {
 				previewDataLoad(targetName, XMLExporter.makeContent(targetName, queryExecuteResultDTO, PREVIEW_COUNT), encoding);
 			}else if (isSendEditor) {
-				editor.appendText(XMLExporter.makeContent(targetName, queryExecuteResultDTO));
+				targetEditor.appendText(XMLExporter.makeContent(targetName, queryExecuteResultDTO));
 			}else{
 				downloadFile(targetName, XMLExporter.makeContentFile(targetName, queryExecuteResultDTO), encoding);
 			}
@@ -336,7 +336,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, SQLExporter.makeFileBatchInsertStatment(targetName, queryExecuteResultDTO, PREVIEW_COUNT, commit), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(SQLExporter.makeFileBatchInsertStatment(targetName, queryExecuteResultDTO, -1, commit));
+					targetEditor.appendText(SQLExporter.makeFileBatchInsertStatment(targetName, queryExecuteResultDTO, -1, commit));
 				}else{
 					downloadFile(targetName, SQLExporter.makeFileBatchInsertStatment(targetName, queryExecuteResultDTO, commit), encoding);
 				}
@@ -344,7 +344,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, SQLExporter.makeFileInsertStatment(targetName, queryExecuteResultDTO, PREVIEW_COUNT, commit), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(SQLExporter.makeFileInsertStatment(targetName, queryExecuteResultDTO, -1, commit));
+					targetEditor.appendText(SQLExporter.makeFileInsertStatment(targetName, queryExecuteResultDTO, -1, commit));
 				}else{
 					downloadFile(targetName, SQLExporter.makeFileInsertStatment(targetName, queryExecuteResultDTO, commit), encoding);
 				}
@@ -352,7 +352,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, SQLExporter.makeFileUpdateStatment(targetName, queryExecuteResultDTO, listWhere, PREVIEW_COUNT, commit), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(SQLExporter.makeFileUpdateStatment(targetName, queryExecuteResultDTO, listWhere, -1, commit));
+					targetEditor.appendText(SQLExporter.makeFileUpdateStatment(targetName, queryExecuteResultDTO, listWhere, -1, commit));
 				}else{
 					downloadFile(targetName, SQLExporter.makeFileUpdateStatment(targetName, queryExecuteResultDTO, listWhere, commit), encoding);
 				}
@@ -360,7 +360,7 @@ public class ResultSetDownloadDialog extends Dialog {
 				if (isPreview) {
 					previewDataLoad(targetName, SQLExporter.makeFileMergeStatment(targetName, queryExecuteResultDTO, listWhere, PREVIEW_COUNT, commit), encoding);
 				}else if (isSendEditor) {
-					editor.appendText(SQLExporter.makeFileMergeStatment(targetName, queryExecuteResultDTO, listWhere, -1, commit));
+					targetEditor.appendText(SQLExporter.makeFileMergeStatment(targetName, queryExecuteResultDTO, listWhere, -1, commit));
 				}else{
 					downloadFile(targetName, SQLExporter.makeFileMergeStatment(targetName, queryExecuteResultDTO, listWhere, commit), encoding);
 				}
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
index 53146d92e..4f11c62d4 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
@@ -10,31 +10,25 @@
  ******************************************************************************/
 package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.custom.CTabFolder;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
 
 import com.hangum.tadpole.ace.editor.core.define.EditorDefine;
 import com.hangum.tadpole.commons.google.analytics.AnalyticCaller;
-import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine;
 import com.hangum.tadpole.commons.util.GlobalImageUtils;
 import com.hangum.tadpole.engine.query.dao.system.UserDBDAO;
 import com.hangum.tadpole.rdb.core.Messages;
-import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.application.SQLToJavaConvert;
+import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.composites.AxisjComposite;
+import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.composites.SQLToOthersComposite;
 
 /**
  * sql to application string 
@@ -45,25 +39,18 @@ import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.application.SQ
 public class SQLToStringDialog extends Dialog {
 	private static final Logger logger = Logger.getLogger(SQLToStringDialog.class);
 	private UserDBDAO userDB;
-	private Combo comboLanguageType;
-	private String languageType = ""; //$NON-NLS-1$
 	private String sql = ""; //$NON-NLS-1$
-	
-	private Text textConvert;
-	private Text textVariable;
 
 	/**
 	 * Create the dialog.
 	 * @param parentShell
-	 * @param languageType 디폴트 변화 언어
 	 * @param sql sql
 	 */
-	public SQLToStringDialog(Shell parentShell, UserDBDAO userDB, String languageType, String sql) {
+	public SQLToStringDialog(Shell parentShell, UserDBDAO userDB, String sql) {
 		super(parentShell);
 		setShellStyle(SWT.RESIZE | SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
 		
 		this.userDB = userDB;
-		this.languageType = languageType;
 		this.sql = sql;
 	}
 	
@@ -91,59 +78,22 @@ public class SQLToStringDialog extends Dialog {
 		compositeBody.setLayout(new GridLayout(1, false));
 		compositeBody.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
-		Composite compositeTitle = new Composite(compositeBody, SWT.NONE);
-		compositeTitle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		compositeTitle.setLayout(new GridLayout(3, false));
-		
-		Label lblType = new Label(compositeTitle, SWT.NONE);
-		lblType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblType.setText(Messages.get().Language);
-		
-		comboLanguageType = new Combo(compositeTitle, SWT.READ_ONLY);
-		comboLanguageType.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textVariable.setText("");
-				sqlToStr();
-			}
-		});
-		comboLanguageType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		for(EditorDefine.SQL_TO_APPLICATION app : EditorDefine.SQL_TO_APPLICATION.values()) {
-			comboLanguageType.add(app.toString());
-			comboLanguageType.setData(app.toString(), app);
-		}
-		comboLanguageType.setText(this.languageType);
-		
-		Button btnOriginalText = new Button(compositeTitle, SWT.NONE);
-		btnOriginalText.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textConvert.setText(sql);
-			}
-		});
-		btnOriginalText.setText(Messages.get().SQLToStringDialog_4);
-		
-		Label lblVariable = new Label(compositeTitle, SWT.NONE);
-		lblVariable.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblVariable.setText(Messages.get().Variable);
-		
-		textVariable = new Text(compositeTitle, SWT.BORDER);
-		textVariable.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		textVariable.setText(SQLToJavaConvert.DEFAULT_VARIABLE);
+		CTabFolder tabFolder = new CTabFolder(compositeBody, SWT.NONE);
+		tabFolder.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+
+		SQLToOthersComposite compositeText = new SQLToOthersComposite(tabFolder, userDB, "PHP", sql, EditorDefine.SQL_TO_APPLICATION.PHP);
+		compositeText.setLayout(new GridLayout(1, false));
 		
-		Button btnConvertSQL = new Button(compositeTitle, SWT.NONE);
-		btnConvertSQL.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				sqlToStr();
-			}
-		});
-		btnConvertSQL.setText(Messages.get().SQLToStringDialog_btnNewButton_text);
+		SQLToOthersComposite compositeJavaString = new SQLToOthersComposite(tabFolder, userDB, "Java StringBuffer", sql, EditorDefine.SQL_TO_APPLICATION.Java_StringBuffer);
+		compositeJavaString.setLayout(new GridLayout(1, false));
 		
-		textConvert = new Text(compositeBody, SWT.BORDER | SWT.WRAP | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CANCEL);
-		textConvert.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+		SQLToOthersComposite compositeMybatis = new SQLToOthersComposite(tabFolder, userDB, "MyBatis", sql, EditorDefine.SQL_TO_APPLICATION.MyBatis);
+		compositeMybatis.setLayout(new GridLayout(1, false));
 		
-		sqlToStr();
+		AxisjComposite compositeAxisj = new AxisjComposite(tabFolder, userDB, "Axisj", sql, EditorDefine.SQL_TO_APPLICATION.AXISJ);
+		compositeAxisj.setLayout(new GridLayout(1, false));
+
+		tabFolder.setSelection(0);
 		
 		// google analytic
 		AnalyticCaller.track(this.getClass().getName());
@@ -151,46 +101,6 @@ public class SQLToStringDialog extends Dialog {
 		return container;
 	}
 
-	/**
-	 * sql to str
-	 */
-	private void sqlToStr() {
-		StringBuffer sbStr = new StringBuffer();
-		String[] sqls = parseSQL();
-		
-		SQLToLanguageConvert slt = new SQLToLanguageConvert(userDB, (EditorDefine.SQL_TO_APPLICATION)comboLanguageType.getData(comboLanguageType.getText()) );
-
-		String variable = textVariable.getText();
-		if(StringUtils.isEmpty(variable)){ 
-			variable = slt.getDefaultVariable();
-			textVariable.setText(variable);
-		}
-		
-		for(int i=0; i < sqls.length; i++) {
-			if("".equals(StringUtils.trimToEmpty(sqls[i]))) continue; //$NON-NLS-1$
-			
-			if(i ==0) sbStr.append( slt.sqlToString(variable, sqls[i]) );
-			else sbStr.append( slt.sqlToString(variable + i, sqls[i]) );
-			
-			// 쿼리가 여러개일 경우 하나씩 한개를 준다.
-			sbStr.append("\r\n"); //$NON-NLS-1$
-		}
-		
-		textConvert.setText(sbStr.toString());
-	}
-	
-	/**
-	 * parese sql
-	 * @return
-	 */
-	private String[] parseSQL() {
-		String[] arry = sql.split(PublicTadpoleDefine.SQL_DELIMITER); //$NON-NLS-1$
-		 if( arry.length == 1) {
-			 String ars[] = { sql };
-			 return ars;
-		 }
-		 return arry;
-	}
 
 	/**
 	 * Create contents of the button bar.
@@ -208,5 +118,4 @@ public class SQLToStringDialog extends Dialog {
 	protected Point getInitialSize() {
 		return new Point(562, 481);
 	}
-
 }
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AbstractSQLToComposite.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AbstractSQLToComposite.java
new file mode 100644
index 000000000..6df1ed845
--- /dev/null
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AbstractSQLToComposite.java
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2016 hangum.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the GNU Lesser Public License v2.1
+ * which accompanies this distribution, and is available at
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * 
+ * Contributors:
+ *     hangum - initial API and implementation
+ ******************************************************************************/
+package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.composites;
+
+import org.eclipse.swt.widgets.Composite;
+
+import com.hangum.tadpole.ace.editor.core.define.EditorDefine;
+import com.hangum.tadpole.ace.editor.core.define.EditorDefine.SQL_TO_APPLICATION;
+import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine;
+import com.hangum.tadpole.engine.query.dao.system.UserDBDAO;
+
+/**
+ * abstract sql to composite
+ * 
+ * @author hangum
+ *
+ */
+public class AbstractSQLToComposite extends Composite {
+	protected UserDBDAO userDB;
+	protected EditorDefine.SQL_TO_APPLICATION type;
+	protected String sql = ""; //$NON-NLS-1$
+	
+	public AbstractSQLToComposite(Composite parent, int style, UserDBDAO userDB, String sql, SQL_TO_APPLICATION type) {
+		super(parent, style);
+		
+		this.userDB = userDB;
+		this.sql = sql;
+		this.type = type;
+	}
+	
+	/**
+	 * parese sql
+	 * @return
+	 */
+	protected String[] parseSQL() {
+		String[] arry = sql.split(PublicTadpoleDefine.SQL_DELIMITER); //$NON-NLS-1$
+		 if( arry.length == 1) {
+			 String ars[] = { sql };
+			 return ars;
+		 }
+		 return arry;
+	}
+
+	@Override
+	protected void checkSubclass() {
+	}
+}
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AxisjComposite.java
similarity index 50%
copy from com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
copy to com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AxisjComposite.java
index 53146d92e..dc87e2f72 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/AxisjComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 hangum.
+ * Copyright (c) 2016 hangum.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
@@ -8,120 +8,56 @@
  * Contributors:
  *     hangum - initial API and implementation
  ******************************************************************************/
-package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication;
+package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.composites;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import com.hangum.tadpole.ace.editor.core.define.EditorDefine;
-import com.hangum.tadpole.commons.google.analytics.AnalyticCaller;
-import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine;
-import com.hangum.tadpole.commons.util.GlobalImageUtils;
 import com.hangum.tadpole.engine.query.dao.system.UserDBDAO;
 import com.hangum.tadpole.rdb.core.Messages;
+import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.SQLToLanguageConvert;
 import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.application.SQLToJavaConvert;
 
 /**
- * sql to application string 
+ * axisj composite
  * 
  * @author hangum
  *
  */
-public class SQLToStringDialog extends Dialog {
-	private static final Logger logger = Logger.getLogger(SQLToStringDialog.class);
-	private UserDBDAO userDB;
-	private Combo comboLanguageType;
-	private String languageType = ""; //$NON-NLS-1$
-	private String sql = ""; //$NON-NLS-1$
-	
+public class AxisjComposite extends AbstractSQLToComposite {
 	private Text textConvert;
 	private Text textVariable;
-
-	/**
-	 * Create the dialog.
-	 * @param parentShell
-	 * @param languageType 디폴트 변화 언어
-	 * @param sql sql
-	 */
-	public SQLToStringDialog(Shell parentShell, UserDBDAO userDB, String languageType, String sql) {
-		super(parentShell);
-		setShellStyle(SWT.RESIZE | SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
-		
-		this.userDB = userDB;
-		this.languageType = languageType;
-		this.sql = sql;
-	}
 	
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(Messages.get().SQLToStringDialog_2);
-		newShell.setImage(GlobalImageUtils.getTadpoleIcon());
-	}
-
 	/**
-	 * Create contents of the dialog.
+	 * Create the composite.
 	 * @param parent
+	 * @param style
 	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout gridLayout = (GridLayout) container.getLayout();
-		gridLayout.verticalSpacing = 4;
-		gridLayout.horizontalSpacing = 4;
-		gridLayout.marginHeight = 4;
-		gridLayout.marginWidth = 4;
+	public AxisjComposite(Composite tabFolderObject, UserDBDAO userDB, String strTitle, final String sql, EditorDefine.SQL_TO_APPLICATION type) {
+		super(tabFolderObject, SWT.NONE, userDB, sql, type);
+		CTabItem tbtmTable = new CTabItem((CTabFolder)tabFolderObject, SWT.NONE);
+		tbtmTable.setText(strTitle);
+		tbtmTable.setData(type);
 		
-		Composite compositeBody = new Composite(container, SWT.NONE);
+		Composite compositeBody = new Composite(tabFolderObject, SWT.NONE);
+		tbtmTable.setControl(compositeBody);
 		compositeBody.setLayout(new GridLayout(1, false));
 		compositeBody.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
 		Composite compositeTitle = new Composite(compositeBody, SWT.NONE);
 		compositeTitle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		compositeTitle.setLayout(new GridLayout(3, false));
-		
-		Label lblType = new Label(compositeTitle, SWT.NONE);
-		lblType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblType.setText(Messages.get().Language);
-		
-		comboLanguageType = new Combo(compositeTitle, SWT.READ_ONLY);
-		comboLanguageType.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textVariable.setText("");
-				sqlToStr();
-			}
-		});
-		comboLanguageType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		for(EditorDefine.SQL_TO_APPLICATION app : EditorDefine.SQL_TO_APPLICATION.values()) {
-			comboLanguageType.add(app.toString());
-			comboLanguageType.setData(app.toString(), app);
-		}
-		comboLanguageType.setText(this.languageType);
-		
-		Button btnOriginalText = new Button(compositeTitle, SWT.NONE);
-		btnOriginalText.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textConvert.setText(sql);
-			}
-		});
-		btnOriginalText.setText(Messages.get().SQLToStringDialog_4);
+		compositeTitle.setLayout(new GridLayout(4, false));
 		
 		Label lblVariable = new Label(compositeTitle, SWT.NONE);
 		lblVariable.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -140,15 +76,19 @@ public class SQLToStringDialog extends Dialog {
 		});
 		btnConvertSQL.setText(Messages.get().SQLToStringDialog_btnNewButton_text);
 		
+		Button btnOriginalText = new Button(compositeTitle, SWT.NONE);
+		btnOriginalText.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				textConvert.setText(sql);
+			}
+		});
+		btnOriginalText.setText(Messages.get().SQLToStringDialog_4);
+		
 		textConvert = new Text(compositeBody, SWT.BORDER | SWT.WRAP | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CANCEL);
 		textConvert.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
 		sqlToStr();
-		
-		// google analytic
-		AnalyticCaller.track(this.getClass().getName());
-
-		return container;
 	}
 
 	/**
@@ -158,7 +98,7 @@ public class SQLToStringDialog extends Dialog {
 		StringBuffer sbStr = new StringBuffer();
 		String[] sqls = parseSQL();
 		
-		SQLToLanguageConvert slt = new SQLToLanguageConvert(userDB, (EditorDefine.SQL_TO_APPLICATION)comboLanguageType.getData(comboLanguageType.getText()) );
+		SQLToLanguageConvert slt = new SQLToLanguageConvert(userDB, type);
 
 		String variable = textVariable.getText();
 		if(StringUtils.isEmpty(variable)){ 
@@ -178,35 +118,5 @@ public class SQLToStringDialog extends Dialog {
 		
 		textConvert.setText(sbStr.toString());
 	}
-	
-	/**
-	 * parese sql
-	 * @return
-	 */
-	private String[] parseSQL() {
-		String[] arry = sql.split(PublicTadpoleDefine.SQL_DELIMITER); //$NON-NLS-1$
-		 if( arry.length == 1) {
-			 String ars[] = { sql };
-			 return ars;
-		 }
-		 return arry;
-	}
-
-	/**
-	 * Create contents of the button bar.
-	 * @param parent
-	 */
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, Messages.get().Close, true);
-	}
-
-	/**
-	 * Return the initial size of the dialog.
-	 */
-	@Override
-	protected Point getInitialSize() {
-		return new Point(562, 481);
-	}
 
 }
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/SQLToOthersComposite.java
similarity index 50%
copy from com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
copy to com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/SQLToOthersComposite.java
index 53146d92e..767b28934 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/SQLToStringDialog.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/dialog/export/sqltoapplication/composites/SQLToOthersComposite.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2013 hangum.
+ * Copyright (c) 2016 hangum.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Lesser Public License v2.1
  * which accompanies this distribution, and is available at
@@ -8,120 +8,60 @@
  * Contributors:
  *     hangum - initial API and implementation
  ******************************************************************************/
-package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication;
+package com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.composites;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.custom.CTabItem;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 
 import com.hangum.tadpole.ace.editor.core.define.EditorDefine;
-import com.hangum.tadpole.commons.google.analytics.AnalyticCaller;
-import com.hangum.tadpole.commons.libs.core.define.PublicTadpoleDefine;
-import com.hangum.tadpole.commons.util.GlobalImageUtils;
 import com.hangum.tadpole.engine.query.dao.system.UserDBDAO;
 import com.hangum.tadpole.rdb.core.Messages;
+import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.SQLToLanguageConvert;
 import com.hangum.tadpole.rdb.core.dialog.export.sqltoapplication.application.SQLToJavaConvert;
 
 /**
- * sql to application string 
+ * SQL to other composite
  * 
  * @author hangum
  *
  */
-public class SQLToStringDialog extends Dialog {
-	private static final Logger logger = Logger.getLogger(SQLToStringDialog.class);
-	private UserDBDAO userDB;
-	private Combo comboLanguageType;
-	private String languageType = ""; //$NON-NLS-1$
-	private String sql = ""; //$NON-NLS-1$
-	
+public class SQLToOthersComposite extends AbstractSQLToComposite {
 	private Text textConvert;
 	private Text textVariable;
 
 	/**
-	 * Create the dialog.
-	 * @param parentShell
-	 * @param languageType 디폴트 변화 언어
-	 * @param sql sql
-	 */
-	public SQLToStringDialog(Shell parentShell, UserDBDAO userDB, String languageType, String sql) {
-		super(parentShell);
-		setShellStyle(SWT.RESIZE | SWT.APPLICATION_MODAL | SWT.DIALOG_TRIM);
-		
-		this.userDB = userDB;
-		this.languageType = languageType;
-		this.sql = sql;
-	}
-	
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		newShell.setText(Messages.get().SQLToStringDialog_2);
-		newShell.setImage(GlobalImageUtils.getTadpoleIcon());
-	}
-
-	/**
-	 * Create contents of the dialog.
+	 * Create the composite.
+	 * @param userDB 
 	 * @param parent
+	 * @param strTitle
+	 * @param sql
+	 * @param type
 	 */
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		Composite container = (Composite) super.createDialogArea(parent);
-		GridLayout gridLayout = (GridLayout) container.getLayout();
-		gridLayout.verticalSpacing = 4;
-		gridLayout.horizontalSpacing = 4;
-		gridLayout.marginHeight = 4;
-		gridLayout.marginWidth = 4;
+	public SQLToOthersComposite(Composite tabFolderObject, UserDBDAO userDB, String strTitle, final String sql, EditorDefine.SQL_TO_APPLICATION type) {
+		super(tabFolderObject, SWT.NONE, userDB, sql, type);
 		
-		Composite compositeBody = new Composite(container, SWT.NONE);
+		CTabItem tbtmTable = new CTabItem((CTabFolder)tabFolderObject, SWT.NONE);
+		tbtmTable.setText(strTitle);
+		tbtmTable.setData(type);
+		
+		Composite compositeBody = new Composite(tabFolderObject, SWT.NONE);
+		tbtmTable.setControl(compositeBody);
 		compositeBody.setLayout(new GridLayout(1, false));
 		compositeBody.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
 		Composite compositeTitle = new Composite(compositeBody, SWT.NONE);
 		compositeTitle.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		compositeTitle.setLayout(new GridLayout(3, false));
-		
-		Label lblType = new Label(compositeTitle, SWT.NONE);
-		lblType.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-		lblType.setText(Messages.get().Language);
-		
-		comboLanguageType = new Combo(compositeTitle, SWT.READ_ONLY);
-		comboLanguageType.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textVariable.setText("");
-				sqlToStr();
-			}
-		});
-		comboLanguageType.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
-		for(EditorDefine.SQL_TO_APPLICATION app : EditorDefine.SQL_TO_APPLICATION.values()) {
-			comboLanguageType.add(app.toString());
-			comboLanguageType.setData(app.toString(), app);
-		}
-		comboLanguageType.setText(this.languageType);
-		
-		Button btnOriginalText = new Button(compositeTitle, SWT.NONE);
-		btnOriginalText.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				textConvert.setText(sql);
-			}
-		});
-		btnOriginalText.setText(Messages.get().SQLToStringDialog_4);
+		compositeTitle.setLayout(new GridLayout(4, false));
 		
 		Label lblVariable = new Label(compositeTitle, SWT.NONE);
 		lblVariable.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
@@ -140,15 +80,19 @@ public class SQLToStringDialog extends Dialog {
 		});
 		btnConvertSQL.setText(Messages.get().SQLToStringDialog_btnNewButton_text);
 		
+		Button btnOriginalText = new Button(compositeTitle, SWT.NONE);
+		btnOriginalText.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				textConvert.setText(sql);
+			}
+		});
+		btnOriginalText.setText(Messages.get().SQLToStringDialog_4);
+		
 		textConvert = new Text(compositeBody, SWT.BORDER | SWT.WRAP | SWT.H_SCROLL | SWT.V_SCROLL | SWT.CANCEL);
 		textConvert.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
 		
 		sqlToStr();
-		
-		// google analytic
-		AnalyticCaller.track(this.getClass().getName());
-
-		return container;
 	}
 
 	/**
@@ -158,7 +102,7 @@ public class SQLToStringDialog extends Dialog {
 		StringBuffer sbStr = new StringBuffer();
 		String[] sqls = parseSQL();
 		
-		SQLToLanguageConvert slt = new SQLToLanguageConvert(userDB, (EditorDefine.SQL_TO_APPLICATION)comboLanguageType.getData(comboLanguageType.getText()) );
+		SQLToLanguageConvert slt = new SQLToLanguageConvert(userDB, type);
 
 		String variable = textVariable.getText();
 		if(StringUtils.isEmpty(variable)){ 
@@ -178,35 +122,5 @@ public class SQLToStringDialog extends Dialog {
 		
 		textConvert.setText(sbStr.toString());
 	}
-	
-	/**
-	 * parese sql
-	 * @return
-	 */
-	private String[] parseSQL() {
-		String[] arry = sql.split(PublicTadpoleDefine.SQL_DELIMITER); //$NON-NLS-1$
-		 if( arry.length == 1) {
-			 String ars[] = { sql };
-			 return ars;
-		 }
-		 return arry;
-	}
-
-	/**
-	 * Create contents of the button bar.
-	 * @param parent
-	 */
-	@Override
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, Messages.get().Close, true);
-	}
-
-	/**
-	 * Return the initial size of the dialog.
-	 */
-	@Override
-	protected Point getInitialSize() {
-		return new Point(562, 481);
-	}
 
 }
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditor.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditor.java
index efec6fe6f..1273c1c1e 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditor.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditor.java
@@ -331,7 +331,7 @@ public class MainEditor extends EditorExtension {
 			public void widgetSelected(SelectionEvent e) {
 				String strQuery = browserEvaluateToStr(EditorFunctionService.ALL_TEXT);
 				
-				SQLToStringDialog dialog = new SQLToStringDialog(null, getUserDB(), EditorDefine.SQL_TO_APPLICATION.Java_StringBuffer.toString(), strQuery);
+				SQLToStringDialog dialog = new SQLToStringDialog(null, getUserDB(), strQuery);
 				dialog.open();
 				setFocus();
 			}
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditorInput.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditorInput.java
index 7a2fb19d7..211232f7c 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditorInput.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/editors/main/MainEditorInput.java
@@ -76,7 +76,6 @@ public class MainEditorInput implements IEditorInput {
 		this.resourceDAO = dao;
 		
 		this.OPEN_TYPE = PublicTadpoleDefine.EDITOR_OPEN_TYPE.FILE;
-		
 		this.defaultStr = TadpoleSystem_UserDBResource.getResourceData(dao);
 	}
 	
diff --git a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/DBIconsUtils.java b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/DBIconsUtils.java
index 4375b1a5a..4ffcfe24e 100644
--- a/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/DBIconsUtils.java
+++ b/com.hangum.tadpole.rdb.core/src/com/hangum/tadpole/rdb/core/viewers/connections/DBIconsUtils.java
@@ -57,7 +57,7 @@ public class DBIconsUtils {
 		else if(DBDefine.ALTIBASE_DEFAULT == dbType) strBaseImage = "altibase_add.png";
 		else  strBaseImage = "database-add.png";
 		
-		return "resources/icons/" + strBaseImage;
+		return "resources/icons/dbs/" + strBaseImage;
 	}
 	
 //	/**
@@ -90,7 +90,7 @@ public class DBIconsUtils {
 	public static Image getProcedureImage(UserDBDAO userDB) {
 		Image baseImage = getEditorImage(userDB);
 		try {
-			return getDecorateImage(baseImage, "resources/icons/object_editor_0.28.png", ResourceManager.BOTTOM_RIGHT);
+			return getDecorateImage(baseImage, "resources/icons/editor/compile_0.28.png", ResourceManager.BOTTOM_RIGHT);
 		} catch(Exception e) {
 			return baseImage;
 		}
diff --git a/com.hangum.tadpole.rdb.erd.core/xtend-gen/com/hangum/tadpole/rdb/erd/core/.ModelConverter.xtendbin b/com.hangum.tadpole.rdb.erd.core/xtend-gen/com/hangum/tadpole/rdb/erd/core/.ModelConverter.xtendbin
dissimilarity index 67%
index 62ec8ab93c4dcca27c94bc763c3e238c900281b3..8c3e0005a119937ee68929021a496bb82fe908fd 100644
GIT binary patch
delta 59
zcwTE}ZD!>S@MdNaVc_84V3-;(dm^thGl&Yl2cjmMF!qD#V~pk?dJ>a8nCryk2mtZ2
B5^(?k

delta 59
zcwTE}ZD!>S@MdNaVc_84VA#q%bt11bGl&Yl2cjmMF!qD#V~pk?dJ>a8nCryk2msl-
B5pMth

-- 
2.11.4.GIT