--- a/src/jdk.jpackage/share/native/library/common/JavaTypes.cpp	Fri Nov 23 09:12:00 2018 -0500
+++ b/src/jdk.jpackage/share/native/library/common/JavaTypes.cpp	Mon Dec 03 08:13:19 2018 -0500
@@ -159,164 +159,3 @@
 void JavaException::Rethrow() {
     FEnv->Throw(FException);
 }
-
-//----------------------------------------------------------------------------
-
-JavaStaticMethod::JavaStaticMethod(JNIEnv *Env, jclass Class, jmethodID Method) {
-    FEnv = Env;
-    FClass = Class;
-    FMethod = Method;
-}
-
-void JavaStaticMethod::CallVoidMethod(int Count, ...) {
-    va_list args;
-    va_start(args, Count);
-    FEnv->CallStaticVoidMethodV(FClass, FMethod, args);
-    va_end(args);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        Messages& messages = Messages::GetInstance();
-        throw JavaException(FEnv, messages.GetMessage(ERROR_INVOKING_METHOD));
-    }
-}
-
-JavaStaticMethod::operator jmethodID () {
-    return FMethod;
-}
-
-//----------------------------------------------------------------------------
-
-JavaMethod::JavaMethod(JNIEnv *Env, jobject Obj, jmethodID Method) {
-    FEnv = Env;
-    FObj = Obj;
-    FMethod = Method;
-}
-
-void JavaMethod::CallVoidMethod(int Count, ...) {
-    va_list args;
-    va_start(args, Count);
-    FEnv->CallVoidMethodV(FObj, FMethod, args);
-    va_end(args);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        Messages& messages = Messages::GetInstance();
-        throw JavaException(FEnv, messages.GetMessage(ERROR_INVOKING_METHOD));
-    }
-}
-
-JavaMethod::operator jmethodID () {
-    return FMethod;
-}
-
-//----------------------------------------------------------------------------
-
-JavaClass::JavaClass(JNIEnv *Env, TString Name) {
-    FEnv = Env;
-    FClassName = Name;
-    FClass = FEnv->FindClass(PlatformString(FClassName));
-
-    if (FClass == NULL || FEnv->ExceptionCheck() == JNI_TRUE) {
-        Messages& messages = Messages::GetInstance();
-        TString message = messages.GetMessage(CLASS_NOT_FOUND);
-        message = PlatformString::Format(message, FClassName.data());
-        throw JavaException(FEnv, message);
-    }
-}
-
-JavaClass::~JavaClass() {
-    FEnv->DeleteLocalRef(FClass);
-}
-
-JavaStaticMethod JavaClass::GetStaticMethod(TString Name, TString Signature) {
-    jmethodID method = FEnv->GetStaticMethodID(FClass, PlatformString(Name),
-            PlatformString(Signature));
-
-    if (method == NULL || FEnv->ExceptionCheck() == JNI_TRUE) {
-        Messages& messages = Messages::GetInstance();
-        TString message = messages.GetMessage(METHOD_NOT_FOUND);
-        message = PlatformString::Format(message, Name.data(),
-                FClassName.data());
-        throw JavaException(FEnv, message);
-    }
-
-    return JavaStaticMethod(FEnv, FClass, method);
-}
-
-JavaClass::operator jclass () {
-    return FClass;
-}
-
-//----------------------------------------------------------------------------
-
-void JavaStringArray::Initialize(size_t Size) {
-    JavaClass jstringClass(FEnv, _T("java/lang/String"));
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        Messages& messages = Messages::GetInstance();
-        TString message = messages.GetMessage(CLASS_NOT_FOUND);
-        message = PlatformString::Format(message, _T("String"));
-        throw JavaException(FEnv, message.data());
-    }
-
-    jstring str = PlatformString("").toJString(FEnv);
-    FData = (jobjectArray)FEnv->NewObjectArray((jsize)Size, jstringClass, str);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        throw JavaException(FEnv, _T("Error"));
-    }
-}
-
-JavaStringArray::JavaStringArray(JNIEnv *Env, size_t Size) {
-    FEnv = Env;
-    Initialize(Size);
-}
-
-JavaStringArray::JavaStringArray(JNIEnv *Env, jobjectArray Data) {
-    FEnv = Env;
-    FData = Data;
-}
-
-JavaStringArray::JavaStringArray(JNIEnv *Env, std::list<TString> Items) {
-    FEnv = Env;
-    Initialize(Items.size());
-    unsigned int index = 0;
-
-    for (std::list<TString>::const_iterator iterator = Items.begin();
-            iterator != Items.end(); iterator++) {
-        TString item = *iterator;
-        SetValue(index, PlatformString(item).toJString(FEnv));
-        index++;
-    }
-}
-
-jobjectArray JavaStringArray::GetData() {
-    return FData;
-}
-
-void JavaStringArray::SetValue(jsize Index, jstring Item) {
-    FEnv->SetObjectArrayElement(FData, Index, Item);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        throw JavaException(FEnv, _T("Error"));
-    }
-}
-
-jstring JavaStringArray::GetValue(jsize Index) {
-    jstring result = (jstring)FEnv->GetObjectArrayElement(FData, Index);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        throw JavaException(FEnv, _T("Error"));
-    }
-
-    return result;
-}
-
-unsigned int JavaStringArray::Count() {
-    unsigned int result = FEnv->GetArrayLength(FData);
-
-    if (FEnv->ExceptionCheck() == JNI_TRUE) {
-        throw JavaException(FEnv, _T("Error"));
-    }
-
-    return result;
-}