사용자에게 좀더 친숙한 메시지로 변경

hangum · Sep 24, 2016 · 0ed6feb · 0ed6feb
1 parent 6171dca
commit 0ed6feb
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 52 deletions.
diff --git a/...gum.tadpole.applicaion.start/bin/com/hangum/tadpole/application/start/messages.properties b/...gum.tadpole.applicaion.start/bin/com/hangum/tadpole/application/start/messages.properties
@@ -36,7 +36,7 @@ ApplicationActionBarAdvisor_4 = &Settings
 
 ApplicationActionBarAdvisor_5 = &Help
 
-ApplicationWorkbenchWindowAdvisor_2 = An error occurred while trying to start the software.\nTadpole DB Hub will be shutting down. \nPlease contact Tadpole DB Hub Support Team (adi.tadpole@gmail.com).\n
+ApplicationWorkbenchWindowAdvisor_2 = An error occurred while trying to start the software.\n1. Please make sure that the license of the period has been expired.\n2. engine database Please check is successfully generated.\nPlease contact Support Team (hangum@tadpolehub.com).\n
 
 ApplicationWorkbenchWindowAdvisor_4 = Do you want to leave Tadpole DB Hub?
 

diff --git a/....tadpole.applicaion.start/bin/com/hangum/tadpole/application/start/messages_ko.properties b/....tadpole.applicaion.start/bin/com/hangum/tadpole/application/start/messages_ko.properties
@@ -36,7 +36,7 @@ ApplicationActionBarAdvisor_4 = \uD658\uACBD\uC124\uC815
 
 ApplicationActionBarAdvisor_5 = \uB3C4\uC6C0\uB9D0
 
-ApplicationWorkbenchWindowAdvisor_2 = Tadpole DB Hub\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n\uC815\uC0C1\uC801\uC73C\uB85C \uC2DC\uC2A4\uD15C\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\nTadpole DB Hub\uB85C \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.(adi.tadpole@gmail.com)\n
+ApplicationWorkbenchWindowAdvisor_2 = \uD14C\uB4DC\uD3F4 \uB514\uBE44\uD5C8\uBE0C\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n1. \uB77C\uC774\uC120\uC2A4\uAC00 \uB9CC\uB8CC\uAC00 \uB418\uC5C8\uB294\uC9C0 \uD655\uC778\uD574 \uC8FC\uC2ED\uC2DC\uC624. \n2. \uC5D4\uC9C4\uB514\uBE44\uAC00 \uC815\uC0C1 \uC0DD\uC131\uB418\uC5C8\uB294\uC9C0 \uD655\uC778\uD574 \uC8FC\uC2ED\uC2DC\uC624. \n\uC11C\uD3EC\uD2B8\uD300\uC5D0 \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.(hangum@tadpolehub.com)
 
 ApplicationWorkbenchWindowAdvisor_4 = Tadpole DB Hub\uB97C \uB5A0\uB098\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 

diff --git a/...gum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/messages.properties b/...gum.tadpole.applicaion.start/src/com/hangum/tadpole/application/start/messages.properties
@@ -36,7 +36,7 @@ ApplicationActionBarAdvisor_4 = &Settings
 
 ApplicationActionBarAdvisor_5 = &Help
 
-ApplicationWorkbenchWindowAdvisor_2 = An error occurred while trying to start the software.\nTadpole DB Hub will be shutting down. \nPlease contact Tadpole DB Hub Support Team (adi.tadpole@gmail.com).\n
+ApplicationWorkbenchWindowAdvisor_2 = An error occurred while trying to start the software.\n1. Please make sure that the license of the period has been expired.\n2. engine database Please check is successfully generated.\nPlease contact Support Team (hangum@tadpolehub.com).\n
 
 ApplicationWorkbenchWindowAdvisor_4 = Do you want to leave Tadpole DB Hub?
 

diff --git a/....tadpole.applicaion.start/src/com/hangum/tadpole/application/start/messages_ko.properties b/....tadpole.applicaion.start/src/com/hangum/tadpole/application/start/messages_ko.properties
@@ -36,7 +36,7 @@ ApplicationActionBarAdvisor_4 = \uD658\uACBD\uC124\uC815
 
 ApplicationActionBarAdvisor_5 = \uB3C4\uC6C0\uB9D0
 
-ApplicationWorkbenchWindowAdvisor_2 = Tadpole DB Hub\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n\uC815\uC0C1\uC801\uC73C\uB85C \uC2DC\uC2A4\uD15C\uC744 \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.\nTadpole DB Hub\uB85C \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.(adi.tadpole@gmail.com)\n
+ApplicationWorkbenchWindowAdvisor_2 = \uD14C\uB4DC\uD3F4 \uB514\uBE44\uD5C8\uBE0C\uB97C \uC2DC\uC791\uD558\uB294 \uC911 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4.\n1. \uB77C\uC774\uC120\uC2A4\uAC00 \uB9CC\uB8CC\uAC00 \uB418\uC5C8\uB294\uC9C0 \uD655\uC778\uD574 \uC8FC\uC2ED\uC2DC\uC624. \n2. \uC5D4\uC9C4\uB514\uBE44\uAC00 \uC815\uC0C1 \uC0DD\uC131\uB418\uC5C8\uB294\uC9C0 \uD655\uC778\uD574 \uC8FC\uC2ED\uC2DC\uC624. \n\uC11C\uD3EC\uD2B8\uD300\uC5D0 \uBB38\uC758\uD558\uC5EC \uC8FC\uC2ED\uC2DC\uC624.(hangum@tadpolehub.com)
 
 ApplicationWorkbenchWindowAdvisor_4 = Tadpole DB Hub\uB97C \uB5A0\uB098\uC2DC\uACA0\uC2B5\uB2C8\uAE4C?
 

diff --git a/com.hangum.tadpole.application/src/com/hangum/tadpole/application/Application.java b/com.hangum.tadpole.application/src/com/hangum/tadpole/application/Application.java
@@ -66,7 +66,7 @@ private void systemInitialize() {
 			}
 		} catch(Exception e) {
 			logger.error("Initialization failed.", e); //$NON-NLS-1$
-			MessageDialog.openError(null, "Error", com.hangum.tadpole.application.start.Messages.get().ApplicationWorkbenchWindowAdvisor_2 + e.getMessage());
+			MessageDialog.openError(null, "Error", com.hangum.tadpole.application.start.Messages.get().ApplicationWorkbenchWindowAdvisor_2);
 
 			System.exit(0);
 		}

diff --git a/...adpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java b/...adpole.commons.sql/src/com/hangum/tadpole/engine/initialize/TadpoleSystemInitializer.java
@@ -152,48 +152,6 @@ public static boolean initSystem() throws Exception {
 		return TadpoleApplicationContextManager.getSystemAdmin() == null?false:true;
 	}
 
-//	/**
-//	 * system table의 존재 유무를 파악하여 생성합니다.
-//	 * 
-//	 */
-//	private static void createSystemTable() throws Exception {
-//
-//		java.sql.Connection javaConn = null;
-//		Statement stmt = null;
-//		String createMsg = "";
-//
-//		try {
-//			SqlMapClient sqlClient = TadpoleSQLManager.getInstance(TadpoleSystemInitializer.getUserDB());
-//			javaConn = sqlClient.getDataSource().getConnection();
-//
-//			// 테이블 생성
-//			stmt = javaConn.createStatement();
-//			Object obj = null;
-//			if (ApplicationArgumentUtils.isDBServer()) {
-//				logger.info("*** Remote DB System Teable creation ***");
-//
-//				obj = new TadpoleMySQLDDL();
-//			}
-//
-//			String targetDDL = "";
-//			for (java.lang.reflect.Field field : obj.getClass().getFields()) {
-//				targetDDL = obj.getClass().getField(field.getName()).get("").toString();
-//				//targetDDL = new String(targetDDL.getBytes(), "ISO-8859-1");
-//				createMsg = "System Table create [" + targetDDL + "]";
-//				stmt.execute(targetDDL);
-//				logger.info(" ==>> " + field.getName());
-//			}
-//
-//		} catch (Exception e) {
-//			logger.error(createMsg, e);
-//			throw e;
-//
-//		} finally {
-//			try { stmt.close(); } catch(Exception e) {}
-//			try { javaConn.close(); } catch (Exception e) {}
-//		}
-//	}
-
 	/**
 	 * initialize jdbc driver
 	 */

diff --git a/....tadpole.commons.sql/src/com/hangum/tadpole/engine/query/sql/TadpoleSystem_UserQuery.java b/....tadpole.commons.sql/src/com/hangum/tadpole/engine/query/sql/TadpoleSystem_UserQuery.java
@@ -300,7 +300,7 @@ public static List<UserLoginHistoryDAO> getLoginHistory(String strEmail, long st
 	 */
 	public static UserDAO getSystemAdmin() throws TadpoleSQLManagerException, SQLException {
 		SqlMapClient sqlClient = TadpoleSQLManager.getInstance(TadpoleSystemInitializer.getUserDB());
-		return (UserDAO)sqlClient.queryForObject("getSystemAdmin"); //$NON-NLS-1$
+			return (UserDAO)sqlClient.queryForObject("getSystemAdmin"); //$NON-NLS-1$
 	}
 
 	/**

diff --git a/com.hangum.tadpole.preference/bin/com/hangum/tadpole/preference/messages.properties b/com.hangum.tadpole.preference/bin/com/hangum/tadpole/preference/messages.properties
@@ -170,7 +170,7 @@ SecurityCredentialPreference_2 = Secret Key
 
 SecurityCredentialPreference_3 = Confirm
 
-SecurityCredentialPreference_4 = Do you want to have a new API key?\nIf so, the current API key must be updated with the new one. 
+SecurityCredentialPreference_4 = Do you want to have a new API key?\nExisting connected API key is, it can not be used anymore. Those newly fish, you will need to update all.
 
 SecurityCredentialPreference_5 = Create an API key
 

diff --git a/com.hangum.tadpole.preference/bin/com/hangum/tadpole/preference/messages_ko.properties b/com.hangum.tadpole.preference/bin/com/hangum/tadpole/preference/messages_ko.properties
@@ -169,7 +169,7 @@ SecurityCredentialPreference_2 = Secret \uD0A4
 
 SecurityCredentialPreference_3 = \uD655\uC778
 
-SecurityCredentialPreference_4 = \uC0C8\uB85C\uC6B4 API \uD0A4\uB97C \uB9CC\uB4DC\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? \n\uC0C8\uB86D\uAC8C \uB9CC\uB4E4\uBA74 \uAE30\uC874 \uC5F0\uACB0\uB41C API key\uB294 \uC0C8\uB86D\uAC8C \uC218\uC815\uB41C \uAC83\uC73C\uB85C \uAC31\uC2E0\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+SecurityCredentialPreference_4 = \uC0C8\uB85C\uC6B4 API \uD0A4\uB97C \uB9CC\uB4DC\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? \n\uAE30\uC874 \uC5F0\uACB0\uB41C API key\uB294 \uB354 \uC774\uC0C1 \uC0AC\uC6A9 \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC0C8\uB86D\uAC8C \uC0DD\uC120 \uB41C \uAC83\uC73C\uB85C \uBAA8\uB450 \uAC31\uC2E0\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
 
 SecurityCredentialPreference_5 = API\uD0A4 \uC0DD\uC131
 

diff --git a/com.hangum.tadpole.preference/src/com/hangum/tadpole/preference/messages.properties b/com.hangum.tadpole.preference/src/com/hangum/tadpole/preference/messages.properties
@@ -170,7 +170,7 @@ SecurityCredentialPreference_2 = Secret Key
 
 SecurityCredentialPreference_3 = Confirm
 
-SecurityCredentialPreference_4 = Do you want to have a new API key?\nIf so, the current API key must be updated with the new one. 
+SecurityCredentialPreference_4 = Do you want to have a new API key?\nExisting connected API key is, it can not be used anymore. Those newly fish, you will need to update all.
 
 SecurityCredentialPreference_5 = Create an API key
 

diff --git a/com.hangum.tadpole.preference/src/com/hangum/tadpole/preference/messages_ko.properties b/com.hangum.tadpole.preference/src/com/hangum/tadpole/preference/messages_ko.properties
@@ -169,7 +169,7 @@ SecurityCredentialPreference_2 = Secret \uD0A4
 
 SecurityCredentialPreference_3 = \uD655\uC778
 
-SecurityCredentialPreference_4 = \uC0C8\uB85C\uC6B4 API \uD0A4\uB97C \uB9CC\uB4DC\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? \n\uC0C8\uB86D\uAC8C \uB9CC\uB4E4\uBA74 \uAE30\uC874 \uC5F0\uACB0\uB41C API key\uB294 \uC0C8\uB86D\uAC8C \uC218\uC815\uB41C \uAC83\uC73C\uB85C \uAC31\uC2E0\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
+SecurityCredentialPreference_4 = \uC0C8\uB85C\uC6B4 API \uD0A4\uB97C \uB9CC\uB4DC\uC2DC\uACA0\uC2B5\uB2C8\uAE4C? \n\uAE30\uC874 \uC5F0\uACB0\uB41C API key\uB294 \uB354 \uC774\uC0C1 \uC0AC\uC6A9 \uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. \uC0C8\uB86D\uAC8C \uC0DD\uC120 \uB41C \uAC83\uC73C\uB85C \uBAA8\uB450 \uAC31\uC2E0\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4.
 
 SecurityCredentialPreference_5 = API\uD0A4 \uC0DD\uC131