IDE-2477 Refactor names and clean up

Author: Quang Tran

plugins/eu.numberfour.n4js.ui/src/eu/numberfour/n4js/ui/handler/GeneratedJsFileLocator.java

@@ -25,20 +25,13 @@
 import eu.numberfour.n4js.generator.common.GeneratorException;
 import eu.numberfour.n4js.projectModel.IN4JSCore;
 import eu.numberfour.n4js.projectModel.IN4JSProject;
-import eu.numberfour.n4js.resource.AllowedFileExtensionsForGeneratedSourceProvider;
+import eu.numberfour.n4js.resource.TranspilableFileExtensionsProvider;
 import eu.numberfour.n4js.validation.helper.N4JSLanguageConstants;
 
 /**
  * Service class for locating generated JS files for N4JS files.
  */
 public class GeneratedJsFileLocator {
-
-	/**
-	 * An iterable of allowed file extensions when looking up the corresponding generated source.
-	 */
-	// public static final Iterable<String> ALLOWED_FILE_EXTENSIONS = unmodifiableCollection(newHashSet(
-	// N4JS_FILE_EXTENSION, JS_FILE_EXTENSION, "n4jsx", "jsx"));
-
 	@Inject
 	private IN4JSCore core;
 
@@ -49,7 +42,7 @@ public class GeneratedJsFileLocator {
 	private FileExtensionBasedPropertTester tester;
 
 	@Inject
-	private AllowedFileExtensionsForGeneratedSourceProvider allowedFileExtensionProvider;
+	private TranspilableFileExtensionsProvider allowedFileExtensionProvider;
 
 	/**
 	 * Tries to locates the generated {@link IFile file} of an N4JS or pure JS file give with the argument and returns
@@ -65,7 +58,7 @@ public Optional<IFile> tryGetGeneratedSourceForN4jsFile(final IFile file) {
 			return absent();
 		}
 
-		if (tester.test(file, null, null, allowedFileExtensionProvider.getAllowedFileExtensions())) {
+		if (tester.test(file, null, null, allowedFileExtensionProvider.getTranspilableFileExtensions())) {
 			final IFile generatedFile = tryLocateGeneratedFile(file,
 					N4JSLanguageConstants.TRANSPILER_SUBFOLDER_FOR_TESTS);
 			if (null != generatedFile && generatedFile.exists()) {

plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/N4JSRuntimeModule.java

@@ -72,9 +72,9 @@
 import eu.numberfour.n4js.preferences.FileBasedExternalLibraryPreferenceStore;
 import eu.numberfour.n4js.projectModel.IN4JSCore;
 import eu.numberfour.n4js.resource.AccessibleSerializer;
-import eu.numberfour.n4js.resource.AllowedFileExtensionsForGeneratedSourceProvider;
+import eu.numberfour.n4js.resource.TranspilableFileExtensionsProvider;
 import eu.numberfour.n4js.resource.ErrorAwareLinkingService;
-import eu.numberfour.n4js.resource.N4JSAllowedFileExtensionsForGeneratedSourceProvider;
+import eu.numberfour.n4js.resource.N4JSTranspilableFileExtensionsProvider;
 import eu.numberfour.n4js.resource.N4JSCache;
 import eu.numberfour.n4js.resource.N4JSDerivedStateComputer;
 import eu.numberfour.n4js.resource.N4JSDescriptionUtils;
@@ -560,7 +560,7 @@ public Class<? extends XpectAwareFileExtensionCalculator> bindXpectAwareFileExte
 	/**
 	 * Bind file extension calculator
 	 */
-	public Class<? extends AllowedFileExtensionsForGeneratedSourceProvider> bindAllowedFileExtensionsForGeneratedSourceProvider() {
-		return N4JSAllowedFileExtensionsForGeneratedSourceProvider.class;
+	public Class<? extends TranspilableFileExtensionsProvider> bindAllowedFileExtensionsForGeneratedSourceProvider() {
+		return N4JSTranspilableFileExtensionsProvider.class;
 	}
 }

plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/resource/N4JSAllowedFileExtensionsForGeneratedSourceProvider.java renamed to plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/resource/N4JSTranspilableFileExtensionsProvider.java

@@ -18,11 +18,11 @@
 /**
  * This provider enables .n4js and .js for generated source
  */
-public class N4JSAllowedFileExtensionsForGeneratedSourceProvider
-		implements AllowedFileExtensionsForGeneratedSourceProvider {
+public class N4JSTranspilableFileExtensionsProvider
+		implements TranspilableFileExtensionsProvider {
 
 	@Override
-	public Iterable<String> getAllowedFileExtensions() {
+	public Iterable<String> getTranspilableFileExtensions() {
 		return unmodifiableCollection(newHashSet(
 				N4JS_FILE_EXTENSION, JS_FILE_EXTENSION));
 	}

plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/resource/AllowedFileExtensionsForGeneratedSourceProvider.java renamed to plugins/eu.numberfour.n4js/src/eu/numberfour/n4js/resource/TranspilableFileExtensionsProvider.java

@@ -14,9 +14,9 @@
  * This interface defines a method for retrieving file extensions that should be allowed for showing generated JS
  * source. This should be implemented for a language or sub-language
  */
-public interface AllowedFileExtensionsForGeneratedSourceProvider {
+public interface TranspilableFileExtensionsProvider {
 	/**
-	 * Return file extensions that are allowed for showing generated JS source
+	 * Return transpilable file extensions
 	 */
-	Iterable<String> getAllowedFileExtensions();
+	Iterable<String> getTranspilableFileExtensions();
 }

plugins/eu.numberfour.n4jsx.ui/META-INF/MANIFEST.MF

@@ -45,7 +45,6 @@ Require-Bundle: eu.numberfour.n4js;visibility:=reexport,
 Import-Package: com.ibm.icu.text,
  org.apache.log4j
 Export-Package: eu.numberfour.n4jsx.ui.contentassist,
- eu.numberfour.n4jsx.ui.handler,
  eu.numberfour.n4jsx.ui.quickfix
 Bundle-Activator: eu.numberfour.n4jsx.ui.internal.N4JSXActivator
 Bundle-ActivationPolicy: lazy

plugins/eu.numberfour.n4jsx.ui/src/eu/numberfour/n4jsx/ui/handler/FileExtensionBasedPropertTester.java

@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2016 NumberFour AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   NumberFour AG - Initial API and implementation
+ */
+package eu.numberfour.n4jsx;
+
+/**
+ * Global hook for static information about the current setup.
+ *
+ * Start up code must initialize static attributes here.
+ *
+ */
+public class N4JSXGlobals {
+
+	/**
+	 * Files extension of JSX source files (<b>not</b> including the separator dot).
+	 */
+	public static final String JSX_FILE_EXTENSION = "jsx";
+
+	/**
+	 * Files extension of N4JSX source files (<b>not</b> including the separator dot).
+	 */
+	public static final String N4JSX_FILE_EXTENSION = "n4jsx";
+}

plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/N4JSXGlobals.java

@@ -63,7 +63,7 @@
 import eu.numberfour.n4js.preferences.FileBasedExternalLibraryPreferenceStore;
 import eu.numberfour.n4js.projectModel.IN4JSCore;
 import eu.numberfour.n4js.resource.AccessibleSerializer;
-import eu.numberfour.n4js.resource.AllowedFileExtensionsForGeneratedSourceProvider;
+import eu.numberfour.n4js.resource.TranspilableFileExtensionsProvider;
 import eu.numberfour.n4js.resource.ErrorAwareLinkingService;
 import eu.numberfour.n4js.resource.N4JSCache;
 import eu.numberfour.n4js.resource.N4JSDerivedStateComputer;
@@ -104,7 +104,7 @@
 import eu.numberfour.n4jsx.parser.N4JSXSemicolonInjectingParser;
 import eu.numberfour.n4jsx.parser.RegExLiteralAwareLexer;
 import eu.numberfour.n4jsx.parser.antlr.lexer.InternalN4JSXLexer;
-import eu.numberfour.n4jsx.resource.N4JSXAllowedFileExtensionsForGeneratedSourceProvider;
+import eu.numberfour.n4jsx.resource.N4JSXTranspilableFileExtensionsForGeneratedSourceProvider;
 import eu.numberfour.n4jsx.resource.N4JSXLinker;
 import eu.numberfour.n4jsx.scoping.N4JSXScopeProvider;
 import eu.numberfour.n4jsx.typesystem.N4JSXUnsupportedExpressionTypeHelper;
@@ -554,7 +554,7 @@ public Class<? extends XpectAwareFileExtensionCalculator> bindXpectAwareFileExte
 	/**
 	 * Bind allowed file extensions for open generated source
 	 */
-	public Class<? extends AllowedFileExtensionsForGeneratedSourceProvider> bindAllowedFileExtensionsForGeneratedSourceProvider() {
-		return N4JSXAllowedFileExtensionsForGeneratedSourceProvider.class;
+	public Class<? extends TranspilableFileExtensionsProvider> bindAllowedFileExtensionsForGeneratedSourceProvider() {
+		return N4JSXTranspilableFileExtensionsForGeneratedSourceProvider.class;
 	}
 }

plugins/eu.numberfour.n4jsx/src/eu/numberfour/n4jsx/N4JSXRuntimeModule.java

@@ -0,0 +1,21 @@
+package eu.numberfour.n4jsx.resource;
+
+import static com.google.common.collect.Sets.newHashSet;
+import static java.util.Collections.unmodifiableCollection;
+
+import eu.numberfour.n4js.resource.TranspilableFileExtensionsProvider;
+import eu.numberfour.n4jsx.N4JSXGlobals;
+
+/**
+ * This provider enables .n4js and .js for generated source
+ */
+public class N4JSXTranspilableFileExtensionsForGeneratedSourceProvider
+		implements TranspilableFileExtensionsProvider {
+
+	@Override
+	public Iterable<String> getTranspilableFileExtensions() {
+		return unmodifiableCollection(newHashSet(
+				N4JSXGlobals.N4JSX_FILE_EXTENSION, N4JSXGlobals.JSX_FILE_EXTENSION));
+	}
+
+}