Merge pull request #432 from tejones/teiiddes-2415-update

teiiddes-2415
Teiid-Designer · Feb 10, 2015 · 50d47de · 50d47de
2 parents 4239389 + fae9418
commit 50d47de
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/...id.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java b/...id.designer.datatools.ui/src/org/teiid/designer/datatools/profiles/ws/ParameterPanel.java
@@ -450,7 +450,26 @@ protected void setValue(Object element, Object value) {
 							propertiesViewer.refresh(element);
 						}
 					}
+
 			}
+
+			if (wsProfileDetailsWizardPage!=null){
+            	for( Object key : parameterMap.keySet() )  {
+            		Parameter para = (Parameter)parameterMap.get(key);
+            		wsProfileDetailsWizardPage.getProfileProperties().put(para.getPropertyKey(), para.getPropertyValue());
+            	}
+            	wsProfileDetailsWizardPage.setParameterMap(parameterMap);
+            	wsProfileDetailsWizardPage.urlPreviewText.setText(wsProfileDetailsWizardPage.updateUrlPreview().toString());
+            }else{
+            	for( Object key : parameterMap.keySet() )  {
+            		Parameter para = (Parameter)parameterMap.get(key);
+            		propertyPage.getExtraProperties().put(para.getPropertyKey(), para.getPropertyValue());
+            	}
+            	propertyPage.setParameterMap(parameterMap);
+            	propertyPage.urlPreviewText.setText(propertyPage.updateUrlPreview().toString());
+            }
+
+
 		}
 
 	}
@@ -638,6 +657,7 @@ void handleDefaultValueChanged( String newDefaultValue ) {
 
         void handleTypeChanged(Object type) {
             this.type = (String)type;
+            handleAddProperty();
             updateState();
         }
 
@@ -704,7 +724,7 @@ public String validateName( String proposedName ) {
             // make sure only letters
             for (char c : proposedName.toCharArray()) {
                 if ( ! isValidChar(c)) {
-                    return UTIL.getString("AddParameterDialog_invalidParametersName");  //$NON-NLS-1$
+                    return UTIL.getString("AddParameterDialog_invalidParameterName");  //$NON-NLS-1$
                 }
             }
 

diff --git a/...n.ui/src/org/teiid/designer/transformation/ui/wizards/rest/TeiidRestImportSourcePage.java b/...n.ui/src/org/teiid/designer/transformation/ui/wizards/rest/TeiidRestImportSourcePage.java
@@ -906,6 +906,7 @@ public static String formatPath(URL newUrl) {
 		if (dotLocation > -1) {
 			filePath = filePath.substring(0, dotLocation);
 		}
+		if (filePath.equals(EMPTY_STRING)) filePath="response";  //$NON-NLS-1$
 		return filePath;
 	}