diff --git a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.java b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.java index b969e8f7..55fbe6d1 100644 --- a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.java +++ b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.java @@ -53,7 +53,6 @@ public class Messages extends NLS { public static String btnAddFromHDFS; public static String btnAddUserSchema; public static String btnCreateUserSQL; - public static String btnSplitSchema; public static String btnAdvanced; public static String btnAdvancedSettings; public static String btnAgreed; @@ -136,6 +135,8 @@ public class Messages extends NLS { public static String btnShowMessages; public static String btnShowWindowAgain; public static String btnSingleThreadImporting; + public static String btnSplitSchema; + public static String btnSplitSchemaQuestion; public static String btnSrcCSVFiles; public static String btnSrcCSVFilesDes; public static String btnSrcMySQLDumpDB; diff --git a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.properties b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.properties index a716416c..0994f17a 100644 --- a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.properties +++ b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages.properties @@ -14,7 +14,6 @@ btnAdd=&Add... btnAddFromHDFS=Add from HDFS btnAddUserSchema=Add User Schema btnCreateUserSQL=Create user SQL -btnSplitSchema=Split schema file btnAdvanced=JDBC Advanced... btnAdvancedSettings=Advanced Settings... btnAgreed=I agree. @@ -98,6 +97,8 @@ btnSettings=Settings... btnShowMessages=Show messages area btnShowWindowAgain=Do not show this window on your next startup. btnSingleThreadImporting=Each file has only one importing thread. +btnSplitSchema=Split schema file +btnSplitSchemaQuestion=split schema information by object and generate each file; when unchecked create all objects in schema file, indexes file btnSrcCSVFiles=CSV files btnSrcCSVFilesDes=Importing CSV files filled with data. btnSrcMySQLDumpDB=Local MYSQL XML dump file diff --git a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages_ko_KR.properties b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages_ko_KR.properties index f92254d5..9db49ec9 100644 --- a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages_ko_KR.properties +++ b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/message/Messages_ko_KR.properties @@ -14,7 +14,6 @@ btnAdd=\uCD94\uAC00(&A)... btnAddFromHDFS=HDFS\uB85C\uBD80\uD130 \uCD94\uAC00 btnAddUserSchema=user schema \ucd94\uac00 btnCreateUserSQL=\uC720\uC800 \uC0DD\uC131 \uCFFC\uB9AC \uCD9C\uB825 -btnSplitSchema=\uC2A4\uD0A4\uB9C8 \uD30C\uC77C \uBD84\uB9AC btnAdvanced=JDBC \uACE0\uAE09 \uC124\uC815... btnAdvancedSettings=\uACE0\uAE09 \uC131\uB2A5 \uC124\uC815... btnAgreed=\uB3D9\uC758 \uD568 @@ -98,6 +97,8 @@ btnSettings=CSV \uD615\uC2DD \uC124\uC815... btnShowMessages=\uBA54\uC2DC\uC9C0 \uBCF4\uC774\uAE30 btnShowWindowAgain=\uB2E4\uC74C \uC2DC\uC791\uD560 \uB54C \uC774 \uCC3D\uC744 \uD45C\uC2DC\uD558\uC9C0 \uC54A\uC74C btnSingleThreadImporting=\uC785\uB825\uD560 \uD30C\uC77C\uBCC4 \uB3D9\uC2DC \uC785\uB825 \uD5C8\uC6A9\uD558\uC9C0 \uC54A\uC74C +btnSplitSchema=\uC2A4\uD0A4\uB9C8 \uD30C\uC77C \uBD84\uB9AC +btnSplitSchemaQuestion=\uC2A4\uD0A4\uB9C8 \uC815\uBCF4\uB97C \uAC1D\uCCB4\uBCC4\uB85C \uBD84\uD560\uD558\uC5EC \uAC01 \uD30C\uC77C\uC5D0 \uC0DD\uC131; \uCCB4\uD06C \uD574\uC81C \uC2DC \uBAA8\uB4E0 \uAC1D\uCCB4\uAC00 \uD558\uB098\uC758 schema \uD30C\uC77C, indexes \uD30C\uC77C\uC5D0 \uC0DD\uC131 btnSrcCSVFiles=\uB85C\uCEEC CSV \uD30C\uC77C btnSrcCSVFilesDes=\uC774\uBBF8 \uC6D0\uBCF8 \uC2A4\uD0A4\uB9C8\uAC00 \uB300\uC0C1\uC758 \uC628\uB77C\uC778 CUBRID \uB370\uC774\uD130\uBCA0\uC774\uC2A4\uC5D0 \uB9C8\uC774\uADF8\uB808\uC774\uC158\uB41C \uACBD\uC6B0\n\uB370\uC774\uD130\uB9CC \uC785\uB825\uD558\uAE30 \uC704\uD574 CSV \uD30C\uC77C\uC744 \uC0AC\uC6A9\uD569\uB2C8\uB2E4. btnSrcMySQLDumpDB=\uB85C\uCEEC MYSQL XML dump \uD30C\uC77C diff --git a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/wizard/page/SelectDestinationPage.java b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/wizard/page/SelectDestinationPage.java index 7e67b1fb..7d91552c 100644 --- a/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/wizard/page/SelectDestinationPage.java +++ b/com.cubrid.cubridmigration.ui/src/com/cubrid/cubridmigration/ui/wizard/page/SelectDestinationPage.java @@ -57,12 +57,14 @@ import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.graphics.Image; 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.DirectoryDialog; +import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; @@ -665,24 +667,50 @@ public void modifyText(ModifyEvent ev) { new Label(fileRepositoryContainer, SWT.NONE); new Label(fileRepositoryContainer, SWT.NONE); + Image questionImage = Display.getDefault().getSystemImage(SWT.ICON_QUESTION); + final int width = questionImage.getBounds().width; + final int height = questionImage.getBounds().height; + Image questionImage050 = + new Image( + Display.getDefault(), + questionImage + .getImageData() + .scaledTo((int) (width * 0.5), (int) (height * 0.5))); + Composite checkboxComposite = new Composite(fileRepositoryContainer, SWT.NONE); - GridLayout checkboxGridLayout = new GridLayout(1, false); - checkboxComposite.setLayout(checkboxGridLayout); + checkboxComposite.setLayout(new GridLayout(1, false)); + + Composite splitSchemaComposite = new Composite(checkboxComposite, SWT.NONE); + splitSchemaComposite.setLayout(new GridLayout(2, false)); - btnSplitSchema = new Button(checkboxComposite, SWT.CHECK); + btnSplitSchema = new Button(splitSchemaComposite, SWT.CHECK); btnSplitSchema.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false)); btnSplitSchema.setText(Messages.btnSplitSchema); btnSplitSchema.setSelection(cfg.isSplitSchema()); - btnOneTableOneFile = new Button(checkboxComposite, SWT.CHECK); + Label lblSplitSchema = new Label(splitSchemaComposite, SWT.NONE); + lblSplitSchema.setImage(questionImage050); + lblSplitSchema.setToolTipText(Messages.btnSplitSchemaQuestion); + + Composite oneTableOneFileComposite = new Composite(checkboxComposite, SWT.NONE); + oneTableOneFileComposite.setLayout(new GridLayout(2, false)); + + btnOneTableOneFile = new Button(oneTableOneFileComposite, SWT.CHECK); btnOneTableOneFile.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); btnOneTableOneFile.setText(Messages.btnOneTableOneFile); - btnCreateUserSQL = new Button(checkboxComposite, SWT.CHECK); + new Label(oneTableOneFileComposite, SWT.NONE); + + Composite createUserSQLComposite = new Composite(checkboxComposite, SWT.NONE); + createUserSQLComposite.setLayout(new GridLayout(2, false)); + + btnCreateUserSQL = new Button(createUserSQLComposite, SWT.CHECK); btnCreateUserSQL.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); btnCreateUserSQL.setText(Messages.btnCreateUserSQL); btnCreateUserSQL.setSelection(cfg.isCreateUserSQL()); + new Label(createUserSQLComposite, SWT.NONE); + if (!getMigrationWizard().isLoadMigrationScript() && firstVisible) { btnSplitSchema.setSelection(true); }