Merge pull request #364 from NativeScript/slavchev/refactor-application-activity

refactor Application and Activity instantiation

Author: Mihail Slavchev

src/jni/Android.mk

@@ -64,7 +64,7 @@ LOCAL_CPPFLAGS += -std=c++11
 LOCAL_MODULE    := NativeScript
 LOCAL_SRC_FILES :=	com_tns_AssetExtractor.cpp AssetExtractor.cpp\
 					com_tns_Platform.cpp NativePlatform.cpp \
-					com_tns_JsDebugger.cpp com_tns_NativeScriptActity.cpp \
+					com_tns_JsDebugger.cpp \
 					JEnv.cpp DirectBuffer.cpp NativeScriptException.cpp \
 					JsDebugger.cpp SimpleAllocator.cpp \
 					NativeScriptRuntime.cpp MetadataNode.cpp MetadataTreeNode.cpp MetadataReader.cpp \

src/jni/MetadataNode.cpp

@@ -1027,13 +1027,6 @@ void MetadataNode::MethodCallback(const v8::FunctionCallbackInfo<v8::Value>& inf
 			isSuper = !superValue.IsEmpty() && superValue->IsTrue();
 		}
 
-		//	// TODO: refactor this
-		if (isSuper && (*className == "com/tns/NativeScriptActivity"))
-		{
-			string activityBaseClassName("android/app/Activity");
-			className = &activityBaseClassName;
-		}
-
 		if ((argLength == 0) && (methodName == V8StringConstants::VALUE_OF))
 		{
 			info.GetReturnValue().Set(thiz);
@@ -1350,17 +1343,55 @@ void MetadataNode::ExtendCallMethodCallback(const v8::FunctionCallbackInfo<v8::V
 		Local<Object> implementationObject;
 		Local<String> extendName;
 		string extendLocation;
-		auto validArgs = ValidateExtendArguments(info, extendLocation, extendName, implementationObject);
 
-		if (!validArgs)
-			return;
+		auto hasDot = false;
+		if (info.Length() == 2)
+		{
+			if (info[0].IsEmpty() || !info[0]->IsString())
+			{
+				stringstream ss;
+				ss << "Invalid extend() call. No name for extend specified at location: " << extendLocation.c_str();
+				string exceptionMessage = ss.str();
+
+				throw NativeScriptException(exceptionMessage);
+			}
+			if (info[1].IsEmpty() || !info[1]->IsObject())
+			{
+				stringstream ss;
+				ss << "Invalid extend() call. Named extend should be called with second object parameter containing overridden methods at location: " << extendLocation.c_str();
+				string exceptionMessage = ss.str();
+
+				throw NativeScriptException(exceptionMessage);
+			}
+			string strName = ConvertToString(info[0].As<String>());
+			hasDot = strName.find('.') != string::npos;
+		}
+		if (hasDot)
+		{
+			extendName = info[0].As<String>();
+			implementationObject = info[1].As<Object>();
+		}
+		else
+		{
+			auto validArgs = ValidateExtendArguments(info, extendLocation, extendName, implementationObject);
 
+			if (!validArgs)
+				return;
+		}
 		auto node = reinterpret_cast<MetadataNode*>(info.Data().As<External>()->Value());
 
 		DEBUG_WRITE("ExtendsCallMethodHandler: called with %s", ConvertToString(extendName).c_str());
 
 		string extendNameAndLocation = extendLocation + ConvertToString(extendName);
-		auto fullClassName = TNS_PREFIX + CreateFullClassName(node->m_name, extendNameAndLocation);
+		string fullClassName;
+		if (!hasDot)
+		{
+			fullClassName = TNS_PREFIX + CreateFullClassName(node->m_name, extendNameAndLocation);
+		}
+		else
+		{
+			fullClassName = ConvertToString(info[0].As<String>());
+		}
 
 		//
 		//resolve class (pre-generated or generated runtime from dex generator)

src/jni/NativePlatform.cpp

@@ -203,12 +203,6 @@ void NativePlatform::CreateJSInstanceNative(JNIEnv *_env, jobject obj, jobject j
 	Local<Object> implementationObject;
 
 	auto proxyClassName = g_objectManager->GetClassName(javaObject);
-	//
-	if (proxyClassName == "com/tns/NativeScriptActivity")
-	{
-		return;
-	}
-	//
 	DEBUG_WRITE("createJSInstanceNative class %s", proxyClassName.c_str());
 	jsInstance = MetadataNode::CreateExtendedJSWrapper(isolate, proxyClassName);
 	if (jsInstance.IsEmpty())

src/jni/com_tns_NativeScriptActity.cpp

@@ -2,8 +2,6 @@
 
 import java.io.File;
 
-import com.tns.internal.ExtractPolicy;
-import com.tns.internal.FileExtractor;
 
 import android.content.Context;
 

src/src/com/tns/AssetExtractor.java

@@ -64,12 +64,6 @@ public DexFactory(Logger logger, ClassLoader classLoader, File dexBaseDir, Strin
 
 	public Class<?> resolveClass(String name, String className, String[] methodOverrides) throws ClassNotFoundException, IOException
 	{
-		if (className.contains("NativeScriptActivity"))
-		{
-			// Do not extend NativeScriptActivity - it is already extended
-			return NativeScriptActivity.class;
-		}
-
 		String fullClassName = className.replace("$", "_") + CLASS_NAME_LOCATION_SEPARATOR + name;
 
 		// try to get pre-generated binding classes

src/src/com/tns/DexFactory.java

@@ -1,4 +1,5 @@
-package com.tns.internal;
+package com.tns;
+
 
 public interface ExtractPolicy
 {

…/src/com/tns/internal/ExtractPolicy.java src/src/com/tns/ExtractPolicy.javasrc/src/com/tns/internal/ExtractPolicy.java renamed to src/src/com/tns/ExtractPolicy.java src/src/com/tns/internal/ExtractPolicy.java renamed to src/src/com/tns/ExtractPolicy.java

@@ -1,4 +1,4 @@
-package com.tns.internal;
+package com.tns;
 
 public interface FileExtractor
 {

…/src/com/tns/internal/FileExtractor.java src/src/com/tns/FileExtractor.javasrc/src/com/tns/internal/FileExtractor.java renamed to src/src/com/tns/FileExtractor.java src/src/com/tns/internal/FileExtractor.java renamed to src/src/com/tns/FileExtractor.java

@@ -0,0 +1,10 @@
+package com.tns;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Retention(RetentionPolicy.RUNTIME)
+public @interface JavaScriptImplementation
+{
+	String javaScriptFile();
+}