Updated Angular-CLI Pojos

ts.eclipse.ide.angular2.cli/src/ts/eclipse/ide/angular2/internal/cli/AngularCLIMessages.java

@@ -38,7 +38,7 @@ public class AngularCLIMessages extends NLS {
 	public static String AngularCLIConfigurationBlock_ngCustomFile_invalid_error;
 	public static String AngularCLIConfigurationBlock_ngCustomFile_notDir_error;
 	public static String AngularCLIConfigurationBlock_ValidatingNgCli_jobName;
-	
+
 	// Interpreter
 	public static String NgServeJob_jobName;
 	public static String NgServeJob_error;
@@ -54,7 +54,7 @@ public class AngularCLIMessages extends NLS {
 	public static String NewAngular2ProjectWizard_windowTitle;
 	public static String NewAngular2ProjectWizard_newProjectTitle;
 	public static String NewAngular2ProjectWizard_newProjectDescription;
-	
+
 	public static String NewAngular2ProjectParamsWizardPage_title;
 	public static String NewAngular2ProjectParamsWizardPage_prefix;
 	public static String NewAngular2ProjectParamsWizardPage_sourceDir;

ts.eclipse.ide.angular2.cli/src/ts/eclipse/ide/angular2/internal/cli/AngularCLIMessages.properties

@@ -69,7 +69,7 @@ NgGenerateBlueprintWizardPage_invalid_apps_location_error=Location must be inclu
 NgGenerateBlueprintWizardPage_file_already_exist=File ''{0}'' already exists.
 
 NgGenerateBlueprintWizardPage_generate_spec=Generate &spec file
-NgGenerateBlueprintWizardPage_prefix=&Prefix
+NgGenerateBlueprintWizardPage_prefix=&Prefix:
 NgGenerateBlueprintWizardPage_flat=&Flat
 NgGenerateBlueprintWizardPage_skipImport=Skip &import
 NgGenerateBlueprintWizardPage_export=&Export
@@ -84,8 +84,8 @@ NewNgComponentWizardPage_title=Angular2 Component
 NewNgComponentWizardPage_description=Create a new Angular2 Component with @angular/cli 'ng g component $name'.
 NewNgComponentWizardPage_inlineTemplate=Inline &template
 NewNgComponentWizardPage_inlineStyle=&Inline style
-NewNgComponentWizardPage_viewEncapsulation=&View encapsulation
-NewNgComponentWizardPage_changeDetection=&Change detection
+NewNgComponentWizardPage_viewEncapsulation=&View encapsulation:
+NewNgComponentWizardPage_changeDetection=&Change detection:
 
 NewNgDirectiveWizard_windowTitle=New Angular2 Directive
 NewNgDirectiveWizardPage_title=Angular2 Directive

ts.eclipse.ide.angular2.cli/src/ts/eclipse/ide/angular2/internal/cli/json/AngularCLIJson.java

@@ -72,13 +72,8 @@ public IPath getRootPath(IProject project) {
 		// Search root from the angular-cli.json apps[0].root
 		String root = getRootFromApps();
 		if (StringUtils.isEmpty(root)) {
-			// Not found, search root from the angular-cli.json
-			// defaults.sourceDir
-			root = getSourceDirFromDefaults();
-			if (StringUtils.isEmpty(root)) {
-				// Not found, use default "src" value
-				root = DEFAULT_ROOT;
-			}
+			// Not found, use default "src" value
+			root = DEFAULT_ROOT;
 		}
 		return new Path("/").append(project.getName()).append(root).append(APP);
 	}
@@ -91,21 +86,12 @@ private String getRootFromApps() {
 		return apps.get(0).getRoot();
 	}
 
-	private String getSourceDirFromDefaults() {
-		Defaults defaults = getDefaults();
-		if (defaults == null) {
-			return null;
-		}
-		return defaults.getSourceDir();
-	}
-
-	public String getPrefix() {
-		// Search prefix from the angular-cli.json apps[0].prefix
-		String prefix = getPrefixFromApps();
-		if (StringUtils.isEmpty(prefix)) {
-			// Not found, search prefix from the angular-cli.json
-			// defaults.prefix
-			prefix = getPrefixFromDefaults();
+	public String getPrefix(NgBlueprint blueprint) {
+		GenerateDefaults gDefaults = getGenerateDefaults(blueprint);
+		String prefix = gDefaults != null ? gDefaults.getPrefix() : null;
+		if (StringUtils.isEmpty(prefix) && blueprint != NgBlueprint.INTERFACE) {
+			// Search prefix from the angular-cli.json apps[0].prefix
+			prefix = getPrefixFromApps();
 			if (StringUtils.isEmpty(prefix)) {
 				// Not found, use default "app" value
 				prefix = APP;
@@ -114,6 +100,43 @@ public String getPrefix() {
 		return prefix;
 	}
 
+	public GenerateDefaults getGenerateDefaults(NgBlueprint blueprint) {
+		Defaults defaults = getDefaults();
+		GenerateDefaults gDefaults = null;
+		if (defaults != null) {
+			switch(blueprint) {
+			case CLASS:
+				gDefaults = defaults.getCliClass();
+				break;
+			case COMPONENT:
+				gDefaults = defaults.getComponent();
+				break;
+			case DIRECTIVE:
+				gDefaults = defaults.getDirective();
+				break;
+			case ENUM:
+				gDefaults = defaults.getCliEnum();
+				break;
+			case GUARD:
+				gDefaults = defaults.getGuard();
+				break;
+			case INTERFACE:
+				gDefaults = defaults.getCliInterface();
+				break;
+			case MODULE:
+				gDefaults = defaults.getModule();
+				break;
+			case PIPE:
+				gDefaults = defaults.getPipe();
+				break;
+			case SERVICE:
+				gDefaults = defaults.getService();
+				break;
+			}
+		}
+		return gDefaults;
+	}
+
 	private String getPrefixFromApps() {
 		List<App> apps = getApps();
 		if (apps == null || apps.size() < 1) {
@@ -122,66 +145,11 @@ private String getPrefixFromApps() {
 		return apps.get(0).getPrefix();
 	}
 
-	public String getPrefixFromDefaults() {
-		Defaults defaults = getDefaults();
-		if (defaults == null)
-			return null;
-		else
-			return defaults.getPrefix();
-	}
-
 	public String getStylesExt() {
 		Defaults defaults = getDefaults();
 		return defaults != null ? defaults.getStyleExt() : null;
 	}
 
-	public boolean isInlineTempalte() {
-		Defaults defaults = getDefaults();
-		Inline inline = defaults != null ? defaults.getInline() : null;
-		if (inline == null)
-			return false;
-		else
-			return inline.isTemplate();
-	}
-
-	public boolean isInlineStyle() {
-		Defaults defaults = getDefaults();
-		Inline inline = defaults != null ? defaults.getInline() : null;
-		if (inline == null)
-			return false;
-		else
-			return inline.isStyle();
-	}
-
-	public boolean isSpec(NgBlueprint blueprint) {
-		Defaults defaults = getDefaults();
-		Spec spec = defaults != null ? defaults.getSpec() : null;
-		if (spec == null)
-			return false;
-		else {
-			switch (blueprint) {
-			case MODULE:
-				return spec.isModule();
-			case COMPONENT:
-				return spec.isComponent();
-			case DIRECTIVE:
-				return spec.isDirective();
-			case PIPE:
-				return spec.isPipe();
-			case SERVICE:
-				return spec.isService();
-			case GUARD:
-				return spec.isGuard();
-			case CLASS:
-				return spec.isClass();
-			// case INTERFACE:
-			// case ENUM:
-			default:
-				return false;
-			}
-		}
-	}
-
 	public static String decamelize(String str) {
 		return str.replaceAll(STRING_DECAMELIZE_REGEXP, "$1_$2").toLowerCase();
 	}
@@ -230,6 +198,14 @@ public String getEnumFileName(String name) {
 		return normalize(name).concat(".enum.ts");
 	}
 
+	public String getInterfaceFileName(String name, String prefix) {
+		String fileName = normalize(name);
+		if (prefix != null && prefix.length() > 0)
+			fileName = fileName.concat(".").concat(prefix);
+		fileName = fileName.concat(".ts");
+		return fileName;
+	}
+
 	public String getModuleFileName(String name) {
 		return normalize(name).concat(".module.ts");
 	}

ts.eclipse.ide.angular2.cli/src/ts/eclipse/ide/angular2/internal/cli/json/Defaults.java

@@ -11,51 +11,74 @@
  */
 package ts.eclipse.ide.angular2.internal.cli.json;
 
+import com.google.gson.annotations.SerializedName;
+
 /**
  * Pojo for "defaults" of angular-cli.json
  *
  */
 public class Defaults {
 
-	private String prefix;
+	private String styleExt;
 
-	private String sourceDir;
+	@SerializedName("class")
+	private GenerateDefaults cliClass;
 
-	private String styleExt;
+	private GenerateDefaults component;
 
-	private boolean prefixInterfaces;
+	private GenerateDefaults directive;
 
-	private String lazyRoutePrefix;
+	@SerializedName("enum")
+	private GenerateDefaults cliEnum;
 
-	private Spec spec;
+	private GenerateDefaults guard;
 
-	private Inline inline;
+	@SerializedName("interface")
+	private GenerateDefaults cliInterface;
 
-	public String getPrefix() {
-		return prefix;
-	}
+	private GenerateDefaults module;
 
-	public String getSourceDir() {
-		return sourceDir;
-	}
+	private GenerateDefaults pipe;
+
+	private GenerateDefaults service;
 
 	public String getStyleExt() {
 		return styleExt;
 	}
 
-	public boolean isPrefixInterfaces() {
-		return prefixInterfaces;
+	public GenerateDefaults getCliClass() {
+		return cliClass;
+	}
+
+	public GenerateDefaults getComponent() {
+		return component;
+	}
+
+	public GenerateDefaults getDirective() {
+		return directive;
+	}
+
+	public GenerateDefaults getCliEnum() {
+		return cliEnum;
+	}
+
+	public GenerateDefaults getGuard() {
+		return guard;
+	}
+
+	public GenerateDefaults getCliInterface() {
+		return cliInterface;
 	}
 
-	public String getLazyRoutePrefix() {
-		return lazyRoutePrefix;
+	public GenerateDefaults getModule() {
+		return module;
 	}
 
-	public Spec getSpec() {
-		return spec;
+	public GenerateDefaults getPipe() {
+		return pipe;
 	}
 
-	public Inline getInline() {
-		return inline;
+	public GenerateDefaults getService() {
+		return service;
 	}
 }