TEIIDDES-3088

* Added update source model check-box to allow updates. Differences report/pages were already implemented.
Teiid-Designer · Oct 25, 2017 · 09b7462 · 09b7462
1 parent 96f6784
commit 09b7462
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/...org.teiid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/Messages.java b/...org.teiid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/Messages.java
@@ -110,6 +110,8 @@ public class Messages extends NLS {
     public static String SelectTargetPage_EnterModelNameMsg;
     public static String SelectTargetPage_SrcModelUndefined;
     public static String SelectTargetPage_SrcModelSelected;
+    public static String SelectTargetPage_SrcModelExistsAndWillBeUpdated;
+    public static String SelectTargetPage_UpdateExistingModel;
     public static String SelectTargetPage_NoOpenProjMsg;
     public static String SelectTargetPage_SrcLocationNotSpecified;
     public static String SelectTargetPage_ModelExistsWithThisNameMsg;

diff --git a/...iid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/messages.properties b/...iid.designer.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/messages.properties
@@ -29,7 +29,7 @@ createDataSourcePanel_jndiName=JNDI Name:
 createDataSourcePanel_driver=Driver:
 createDataSourcePanel_driversGroupTxt=Available Drivers
 createDataSourcePanel_dataSourcePropertiesGroupTxt=Data Source Properties
-createDataSourcePanel_JndiNameErrorMessage=JNDI name error >> \
+createDataSourcePanel_JndiNameErrorMessage=JNDI name error >> 
 editDataSourcePanelEnterChanges=Click on a property value if you wish to change it.
 
 dataSourcePropertiesPanel_nameColText=Name
@@ -103,6 +103,8 @@ SelectTargetPage_ModelStatus=Model Status
 SelectTargetPage_EnterModelNameMsg=Please enter a name for the target model.
 SelectTargetPage_SrcModelUndefined=No model name defined
 SelectTargetPage_SrcModelSelected=Model name defined
+SelectTargetPage_SrcModelExistsAndWillBeUpdated= Source model {0} exists and will be updated
+SelectTargetPage_UpdateExistingModel=Update existing model
 SelectTargetPage_NoOpenProjMsg=No open projects in workspace
 SelectTargetPage_SrcLocationNotSpecified=The Model Location must be specified.
 SelectTargetPage_ModelExistsWithThisNameMsg=A model with the name {0} already exists.

diff --git a/...ner.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/wizard/SelectTargetPage.java b/...ner.teiidimporter.ui/src/org/teiid/designer/teiidimporter/ui/wizard/SelectTargetPage.java
@@ -74,6 +74,7 @@ public class SelectTargetPage extends AbstractWizardPage implements UiConstants
     private Text targetModelFileText;
     private Text targetModelInfoText;
     private Text timeoutText;
+    private Button setUpdatableCB;
     private Button filterRedundantUCsCB;
     private Button createConnProfileCB;
     private StyledTextEditor vdbTextEditor;
@@ -260,6 +261,18 @@ public void modifyText( ModifyEvent e ) {
         gd.horizontalSpan=3;
         targetModelInfoText.setLayoutData(gd);
 
+        setUpdatableCB = WidgetFactory.createCheckBox(modelDefnPanel, Messages.SelectTargetPage_UpdateExistingModel , 0, 3);
+		this.setUpdatableCB.addSelectionListener(new SelectionAdapter() {
+
+			@Override
+			public void widgetSelected(final SelectionEvent event) {
+				//((JdbcImportWizard)getWizard()).setUpdatable(setUpdatableCB.getSelection());;
+				validatePage();
+			}
+		});
+		setUpdatableCB.setToolTipText(Messages.SelectTargetPage_UpdateExistingModel);
+		setUpdatableCB.setSelection(true);
+
         // CheckBox for FilterRedundantUniqueConstraints DDL Import property
         filterRedundantUCsCB = WidgetFactory.createCheckBox(modelDefnPanel, Messages.SelectTargetPage_FilterRedundantUCsCB_Label, SWT.NONE, 3);
         filterRedundantUCsCB.setToolTipText(Messages.SelectTargetPage_FilterRedundantUCsCB_ToolTip);
@@ -470,7 +483,7 @@ private boolean validateTargetModelSelection() {
         }
 
         // Valid target model - now compare it's connection profile vs the selected profile
-        if( importManager.targetModelExists() ) {
+        if( importManager.targetModelExists() && !this.setUpdatableCB.getSelection() ) {
             setThisPageComplete(NLS.bind(Messages.SelectTargetPage_ModelExistsWithThisNameMsg, fileText), ERROR);
             return false;
         }
@@ -572,7 +585,9 @@ private void setTargetModelInfoText() {
         String targetModelName = this.targetModelFileText.getText();
         if(targetModelName==null || targetModelName.trim().length()==0) {
             this.targetModelInfoText.setText(Messages.SelectTargetPage_SrcModelUndefined);
-        } else {
+        } else if( importManager.targetModelExists() && this.setUpdatableCB.getSelection() ) {
+        	this.targetModelInfoText.setText(NLS.bind(Messages.SelectTargetPage_SrcModelExistsAndWillBeUpdated, targetModelName)); //$NON-NLS-1$
+    	} else {
             this.targetModelInfoText.setText(Messages.SelectTargetPage_SrcModelSelected+": "+targetModelName); //$NON-NLS-1$
         }
     }