Ensure valid URL syntax for Template Project URL after editing

spring-attic · Jun 25, 2012 · 4506867 · 4506867
1 parent c631fab
commit 4506867
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/...c/org/springframework/ide/eclipse/wizard/template/util/AbstractNameUrlPreferencePage.java b/...c/org/springframework/ide/eclipse/wizard/template/util/AbstractNameUrlPreferencePage.java
@@ -249,21 +249,27 @@ public void widgetSelected(SelectionEvent e) {
 				if (dialog.open() == Dialog.OK) {
 					String urlString = dialog.getUrlString();
 					String name = dialog.getName();
+					if (!validateUrl(urlString)) {
+						String title = NLS.bind("Invalid URL", null);
+						MessageDialog.openError(null, title, validationErrorMessage(urlString));
+					}
+					else {
 
-					if (name.length() > 0 && urlString.length() > 0) {
-						try {
-							if (oldNameUrl != null) {
-								model.removeNameUrlPairInEncodedString(oldNameUrl);
+						if (name.length() > 0 && urlString.length() > 0) {
+							try {
+								if (oldNameUrl != null) {
+									model.removeNameUrlPairInEncodedString(oldNameUrl);
+								}
+								model.addNameUrlPairInEncodedString(new NameUrlPair(name, urlString));
+								tableViewer.refresh();
+								// the tableViewer refresh deselects the line,
+								// so disable the buttons
+								editButton.setEnabled(false);
+								removeButton.setEnabled(false);
+							}
+							catch (URISyntaxException e1) {
+								errorText.setText("Error!  The URL " + urlString + " was malformed.  Ignoring.");
 							}
-							model.addNameUrlPairInEncodedString(new NameUrlPair(name, urlString));
-							tableViewer.refresh();
-							// the tableViewer refresh deselects the line, so
-							// disable the buttons
-							editButton.setEnabled(false);
-							removeButton.setEnabled(false);
-						}
-						catch (URISyntaxException e1) {
-							errorText.setText("Error!  The URL " + urlString + " was malformed.  Ignoring.");
 						}
 					}
 				}