Merge pull request #179 from Springrbua/master

Change the AbstractWizardNewTypeScriptProjectCreationPage API

Author: angelozerr

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/widgets/NpmInstallWidget.java

@@ -49,7 +49,7 @@
 
 /**
  * NPM install widget provides :
- * 
+ *
  * <ul>
  * <li>a text field to fill a NPM module version</li>
  * <li>a "Browse..." button to search available versions for the given node
@@ -226,7 +226,7 @@ private void addContentProposal(Text text) {
 	/**
 	 * Validate the given version and update the status of the
 	 * {@link IStatusChangeListener}.
-	 * 
+	 *
 	 * @param version
 	 */
 	private void validateVersion(String version) {
@@ -259,7 +259,7 @@ private void validateVersionSynch(NpmModule module) {
 	}
 
 	private void validateVersionASynch(NpmModule module) {
-		statusChanged(new StatusInfo(IStatus.WARNING,
+		statusChanged(new StatusInfo(IStatus.ERROR,
 				NLS.bind(TypeScriptUIMessages.NPMInstallWidget_SearchingVersions_status, module.getName())));
 		if (validateVersionJob == null) {
 			validateVersionJob = new ValidateVersionJob();
@@ -297,7 +297,7 @@ public void setEnabled(boolean enabled) {
 
 	/**
 	 * Returns the npm install command.
-	 * 
+	 *
 	 * @return the npm install command.
 	 */
 	public String getNpmInstallCommand() {

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/wizards/AbstractWizardNewTypeScriptProjectCreationPage.java

@@ -11,12 +11,10 @@
 package ts.eclipse.ide.ui.wizards;
 
 import java.io.File;
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.resource.JFaceResources;
@@ -38,6 +36,7 @@
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 
@@ -98,6 +97,9 @@ public final void createControl(Composite parent) {
 		// initialize page with default values
 		initializeDefaultValues();
 
+		// Updates the state of the components
+		updateComponents(null);
+
 	}
 
 	/**
@@ -134,18 +136,12 @@ private void createNodejsBody(Composite parent) {
 		createNodePathInfo(group);
 	}
 
-	/** Creates the Filed for the embedded Node.js. */
+	/** Creates the field for the embedded Node.js. */
 	private void createEmbeddedNodejsField(Composite parent, IEmbeddedNodejs[] installs) {
 		useEmbeddedNodeJsButton = new Button(parent, SWT.RADIO);
 		useEmbeddedNodeJsButton
 				.setText(TypeScriptUIMessages.AbstractWizardNewTypeScriptProjectCreationPage_useEmbeddedNodeJs_label);
 		useEmbeddedNodeJsButton.addListener(SWT.Selection, this);
-		useEmbeddedNodeJsButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateNodeJsMode();
-			}
-		});
 
 		embeddedNodeJs = new Combo(parent, SWT.READ_ONLY);
 		embeddedNodeJs.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
@@ -236,7 +232,7 @@ public void widgetSelected(SelectionEvent e) {
 		});
 	}
 
-	/** Creates the Info part, wehre Node.js path and version is shown. */
+	/** Creates the Info part, where Node.js path and version is shown. */
 	private void createNodePathInfo(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		composite.setLayout(new GridLayout());
@@ -283,39 +279,22 @@ protected void initializeDefaultValues() {
 				installedNodeJs.select(0);
 			}
 		}
-		updateNodeJsMode();
-	}
-
-	/** Updates the Node.js mode and enables/disables the widgets accordingly. */
-	private void updateNodeJsMode() {
-		if (!hasEmbeddedNodeJs) {
-			return;
-		}
-		useEmbeddedNodeJs = useEmbeddedNodeJsButton.getSelection();
-		embeddedNodeJs.setEnabled(useEmbeddedNodeJs);
-		installedNodeJs.setEnabled(!useEmbeddedNodeJs);
-		browseFileSystemButton.setEnabled(!useEmbeddedNodeJs);
-		browseWorkspaceButton.setEnabled(!useEmbeddedNodeJs);
 	}
 
 	@Override
 	protected boolean validatePage() {
 		boolean valid = super.validatePage();
 		if (valid) {
-			ArrayList<IStatus> status = validatePageImpl();
-			IStatus currStatus;
-			if (status == null || (currStatus = StatusUtil.getMostSevere(status.toArray(new IStatus[] {}))) == null)
-				currStatus = Status.OK_STATUS;
-			statusChanged(currStatus);
-			valid = !currStatus.matches(IStatus.ERROR);
+			IStatus status = validatePageImpl();
+			statusChanged(status);
+			valid = !status.matches(IStatus.ERROR);
 		}
 		return valid;
 	}
 
-	protected ArrayList<IStatus> validatePageImpl() {
-		ArrayList<IStatus> status = new ArrayList<>();
-		status.add(validateAndUpdateNodejsPath());
-		return status;
+	/** Validates the Page and returns the most severe status. */
+	protected IStatus validatePageImpl() {
+		return validateAndUpdateNodejsPath();
 	}
 
 	/**
@@ -397,17 +376,36 @@ public void updateNodeJSPreferences(IEclipsePreferences preferences) {
 	}
 
 	@Override
-	public void statusChanged(IStatus status) {
-		if (isPageComplete())
-			setPageComplete(!status.matches(IStatus.ERROR));
+	public final void statusChanged(IStatus status) {
 		StatusUtil.applyToStatusLine(this, status);
 	}
 
 	@Override
 	public void handleEvent(Event event) {
-		validatePage();
+		setPageComplete(validatePage());
+		updateComponents(event);
+	}
+
+	/** Updates the state of the components. */
+	protected void updateComponents(Event event) {
+		Widget item = event != null ? event.item : null;
+		if (item == null || item == useEmbeddedNodeJsButton)
+			updateNodeJsMode();
+	}
+
+	/** Updates the Node.js mode and enables/disables the widgets accordingly. */
+	private void updateNodeJsMode() {
+		if (!hasEmbeddedNodeJs) {
+			return;
+		}
+		useEmbeddedNodeJs = useEmbeddedNodeJsButton.getSelection();
+		embeddedNodeJs.setEnabled(useEmbeddedNodeJs);
+		installedNodeJs.setEnabled(!useEmbeddedNodeJs);
+		browseFileSystemButton.setEnabled(!useEmbeddedNodeJs);
+		browseWorkspaceButton.setEnabled(!useEmbeddedNodeJs);
 	}
 
+	/** Updates the Commands, which should be executed after creating the Project. */
 	public void updateCommand(List<LineCommand> commands, final IEclipsePreferences preferences) {
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/wizards/WizardNewTypeScriptProjectCreationPage.java

@@ -1,6 +1,5 @@
 package ts.eclipse.ide.ui.wizards;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.IStatus;
@@ -17,7 +16,9 @@
 import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Widget;
 import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
 import org.osgi.service.prefs.BackingStoreException;
 
@@ -27,6 +28,7 @@
 import ts.eclipse.ide.internal.ui.wizards.TypeScriptRepositoryLabelProvider;
 import ts.eclipse.ide.terminal.interpreter.LineCommand;
 import ts.eclipse.ide.terminal.interpreter.TerminalCommandAdapter;
+import ts.eclipse.ide.ui.utils.StatusUtil;
 import ts.eclipse.ide.ui.widgets.NpmInstallWidget;
 import ts.repository.ITypeScriptRepository;
 
@@ -103,6 +105,25 @@ public void widgetSelected(SelectionEvent e) {
 		installTsRuntime.getVersionText().addListener(SWT.Modify, this);
 	}
 
+	@Override
+	protected void initializeDefaultValues() {
+		super.initializeDefaultValues();
+
+		// Default values for TypeScript runtime
+		if (hasEmbeddedTsRuntime) {
+			embeddedTsRuntime.select(0);
+			useEmbeddedTsRuntimeButton.setSelection(true);
+		}
+	}
+
+	@Override
+	protected void updateComponents(Event event) {
+		super.updateComponents(event);
+		Widget item = event != null ? event.item : null;
+		if (item == null || item == useEmbeddedTsRuntimeButton)
+			updateTsRuntimeMode();
+	}
+
 	private void updateTsRuntimeMode() {
 		if (!hasEmbeddedTsRuntime) {
 			return;
@@ -112,6 +133,12 @@ private void updateTsRuntimeMode() {
 		installTsRuntime.setEnabled(!useEmbeddedTsRuntime);
 	}
 
+	@Override
+	protected IStatus validatePageImpl() {
+		return StatusUtil.getMoreSevere(super.validatePageImpl(), validateTypeScriptRuntime());
+	}
+
+	/** Validates the selected TypeScript Runtime. */
 	private IStatus validateTypeScriptRuntime() {
 		if (hasEmbeddedTsRuntime && useEmbeddedTsRuntimeButton.getSelection()) {
 			return Status.OK_STATUS;
@@ -120,26 +147,6 @@ private IStatus validateTypeScriptRuntime() {
 	}
 
 	@Override
-	protected void initializeDefaultValues() {
-		super.initializeDefaultValues();
-
-		// Default values for TypeScript runtime
-		if (hasEmbeddedTsRuntime) {
-			embeddedTsRuntime.select(0);
-			useEmbeddedTsRuntimeButton.setSelection(true);
-		}
-		updateTsRuntimeMode();
-	}
-
-	@Override
-	protected ArrayList<IStatus> validatePageImpl() {
-		ArrayList<IStatus> status = super.validatePageImpl();
-		if (status == null)
-			status = new ArrayList<>();
-		status.add(validateTypeScriptRuntime());
-		return status;
-	}
-
 	public void updateCommand(List<LineCommand> commands, final IEclipsePreferences preferences) {
 		if (!useEmbeddedTsRuntime) {
 			// when TypeScript is installed when "npm install typescript"