Validate NPM module version field. See

angelozerr#147

Author: angelozerr

core/ts.core/src/ts/npm/NPMModule.java

@@ -7,20 +7,28 @@
 
 public class NPMModule {
 
-	private final String moduleName;
+	private final String name;
 	private final OS os;
 	private List<String> versions;
 
-	NPMModule(String moduleName, OS os) {
-		this.moduleName = moduleName;
+	NPMModule(String name, OS os) {
+		this.name = name;
 		this.os = os;
 	}
 
 	public List<String> getAvailableVersions() throws IOException {
-		if (versions == null) {
-			versions = NPMHelper.getVersions(moduleName, os);
+		if (!isLoaded()) {
+			versions = NPMHelper.getVersions(name, os);
 		}
 		return versions;
 	}
 
+	public boolean isLoaded() {
+		return versions != null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
 }

core/ts.core/src/ts/npm/NPMModulesManager.java

@@ -10,9 +10,7 @@
  */
 package ts.npm;
 
-import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import ts.OS;
@@ -31,13 +29,13 @@ public NPMModulesManager(OS os) {
 		this.modules = new HashMap<>();
 	}
 
-	public List<String> getAvailableVersions(String moduleName) throws IOException {
+	public NPMModule getNPMModule(String moduleName) {
 		NPMModule module = modules.get(moduleName);
 		if (module == null) {
 			module = new NPMModule(moduleName, os);
 			modules.put(moduleName, module);
 		}
-		return module.getAvailableVersions();
+		return module;
 	}
 
 	public void resetCache(String moduleName) {

eclipse/ts.eclipse.ide.ui/META-INF/MANIFEST.MF

@@ -47,4 +47,5 @@ Export-Package: ts.eclipse.ide.ui,
  ts.eclipse.ide.ui.preferences,
  ts.eclipse.ide.ui.search,
  ts.eclipse.ide.ui.utils,
+ ts.eclipse.ide.ui.widgets,
  ts.eclipse.ide.ui.wizards

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.java

@@ -15,7 +15,6 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -175,7 +174,7 @@ public class TypeScriptUIMessages extends NLS {
 	public static String NewTypeScriptProjectWizard_windowTitle;
 	public static String NewTypeScriptProjectWizard_newProjectTitle;
 	public static String NewTypeScriptProjectWizard_newProjectDescription;
-	
+
 	public static String TSConfigWizardPage_title;
 	public static String TSConfigWizardPage_description;
 	public static String TSConfigWizardPage_module;
@@ -198,12 +197,17 @@ public class TypeScriptUIMessages extends NLS {
 	public static String TypeScriptRuntimeAndNodejsWizardPage_typescript_group_label;
 	public static String TypeScriptRuntimeAndNodejsWizardPage_useEmbeddedTsRuntime_label;
 	public static String TypeScriptRuntimeAndNodejsWizardPage_useInstallTsRuntime_label;
-	
+
 	// NPM Module Versions
 	public static String NPMModuleVersionsSelectionDialog_title;
 	public static String NPMModuleVersionsSelectionDialog_message;
 	public static String NPMModuleVersionsSelectionDialog_searchJob_taskName;
-	
+
+	// NPM Install Widgets
+	public static String NPMInstallWidget_ValidateVersionJob_name;
+	public static String NPMInstallWidget_SearchingVersions_status;
+	public static String NPMInstallWidget_InvalidVersion_status;
+
 	public static ResourceBundle getResourceBundle() {
 		try {
 			if (fResourceBundle == null)

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/TypeScriptUIMessages.properties

@@ -176,4 +176,9 @@ TypeScriptRuntimeAndNodejsWizardPage_useInstallTsRuntime_label=Install TypeScrip
 # NPM Module widget
 NPMModuleVersionsSelectionDialog_title=Open NPM module version for ''{0}''
 NPMModuleVersionsSelectionDialog_message=&Enter NPM module version or pattern (?, * or camel case):
-NPMModuleVersionsSelectionDialog_searchJob_taskName=Searching
+NPMModuleVersionsSelectionDialog_searchJob_taskName=Searching
+
+# NPN Install Widgets
+NPMInstallWidget_ValidateVersionJob_name=Validate NPM module version job.
+NPMInstallWidget_SearchingVersions_status=Searching versions for ''{0}'' with 'npm show'
+NPMInstallWidget_InvalidVersion_status=Invalid version ''{0}'' for ''{1}''.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/dialogs/NPMModuleVersionsSelectionDialog.java

@@ -69,7 +69,7 @@ protected void fillContentProvider(AbstractContentProvider contentProvider, Item
 			try {
 				// execute "npm view $moduleName versions" to retrieve version
 				// list of the given module name.
-				IDENPMModulesManager.getInstance().getAvailableVersions(moduleName)
+				IDENPMModulesManager.getInstance().getNPMModule(moduleName).getAvailableVersions()
 						.forEach(version -> contentProvider.add(version, itemsFilter));
 			} catch (IOException e) {
 				e.printStackTrace();

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/ATAConfigurationBlock.java

@@ -23,9 +23,9 @@
 
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * Automatic Type Acquisition (ATA) configuration block.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/AbstractTypeScriptRepositoryConfigurationBlock.java

@@ -30,9 +30,9 @@
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
 import ts.eclipse.ide.ui.preferences.BrowseButtonsComposite;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 import ts.repository.ITypeScriptRepository;
 
 /**

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/FormatterConfigurationBlock.java

@@ -22,9 +22,9 @@
 
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * Formatter configuration block.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/NodejsConfigurationBlock.java

@@ -41,10 +41,10 @@
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
 import ts.eclipse.ide.internal.ui.dialogs.WorkspaceResourceSelectionDialog;
 import ts.eclipse.ide.internal.ui.dialogs.WorkspaceResourceSelectionDialog.Mode;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
 import ts.eclipse.ide.ui.preferences.StatusInfo;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 import ts.nodejs.NodejsProcessHelper;
 import ts.utils.FileUtils;
 import ts.utils.StringUtils;

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/SaveActionsConfigurationBlock.java

@@ -20,10 +20,10 @@
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
 import ts.eclipse.ide.ui.preferences.TypeScriptUIPreferenceConstants;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * Editor save actions configuration block.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/TextMateConfigurationBlock.java

@@ -21,10 +21,10 @@
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
 
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.OptionsConfigurationBlock;
 import ts.eclipse.ide.ui.preferences.ScrolledPageContent;
 import ts.eclipse.ide.ui.preferences.TypeScriptUIPreferenceConstants;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * TextMate configuration block.

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/TypeScriptRuntimeConfigurationBlock.java

@@ -27,8 +27,8 @@
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.core.utils.WorkbenchResourceUtil;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
 import ts.eclipse.ide.ui.preferences.StatusInfo;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 import ts.repository.ITypeScriptRepository;
 import ts.repository.TypeScriptRepositoryException;
 import ts.repository.TypeScriptRepositoryManager;

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/preferences/ValidationConfigurationBlock.java

@@ -26,7 +26,7 @@
 import ts.eclipse.ide.core.preferences.TypeScriptCorePreferenceConstants;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
 import ts.eclipse.ide.ui.preferences.BrowseButtonsComposite;
-import ts.eclipse.ide.ui.preferences.IStatusChangeListener;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 import ts.repository.ITypeScriptRepository;
 
 /**

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/TSConfigWizardPage.java

@@ -26,6 +26,7 @@
 
 import ts.cmd.tsc.CompilerOptions;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
+import ts.eclipse.ide.ui.wizards.AbstractWizardPage;
 import ts.resources.jsonconfig.TsconfigJson;
 import ts.utils.StringUtils;
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/internal/ui/wizards/TypeScriptRuntimeAndNodejsWizardPage.java

@@ -27,7 +27,8 @@
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.core.nodejs.IEmbeddedNodejs;
 import ts.eclipse.ide.internal.ui.TypeScriptUIMessages;
-import ts.eclipse.ide.ui.utils.NPMInstallWidget;
+import ts.eclipse.ide.ui.widgets.NPMInstallWidget;
+import ts.eclipse.ide.ui.wizards.AbstractWizardPage;
 import ts.repository.ITypeScriptRepository;
 
 public class TypeScriptRuntimeAndNodejsWizardPage extends AbstractWizardPage {
@@ -172,7 +173,7 @@ public void widgetSelected(SelectionEvent e) {
 			}
 		});
 
-		installTsRuntime = new NPMInstallWidget("typescript", parent, SWT.NONE);
+		installTsRuntime = new NPMInstallWidget("typescript", this, parent, SWT.NONE);
 		installTsRuntime.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 	}
 

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/preferences/OptionsConfigurationBlock.java

@@ -54,6 +54,7 @@
 
 import ts.eclipse.ide.core.TypeScriptCorePlugin;
 import ts.eclipse.ide.ui.TypeScriptUIPlugin;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * Abstract options configuration block providing a general implementation for

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/preferences/PropertyAndPreferencePage.java

@@ -41,6 +41,7 @@
 import ts.eclipse.ide.internal.ui.dialogs.fields.IDialogFieldListener;
 import ts.eclipse.ide.internal.ui.dialogs.fields.LayoutUtil;
 import ts.eclipse.ide.internal.ui.dialogs.fields.SelectionButtonDialogField;
+import ts.eclipse.ide.ui.widgets.IStatusChangeListener;
 
 /**
  * Base for project property and preference pages

eclipse/ts.eclipse.ide.ui/src/ts/eclipse/ide/ui/utils/NPMInstallWidget.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Angelo ZERR : copied from  org.eclipse.wst.jsdt.internal.ui.wizards.IStatusChangeListener     
  *******************************************************************************/
-package ts.eclipse.ide.ui.preferences;
+package ts.eclipse.ide.ui.widgets;
 
 import org.eclipse.core.runtime.IStatus;