From c718423ca3fe2f540580634f07db4c9ae8343204 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 20 Dec 2016 16:13:31 -0200
Subject: [PATCH] Implementando plugin e extensão java como projeto separado.

---
 src/plugin/Makefile.in  |  8 +++++++-
 src/plugin/call.cc      |  2 +-
 src/plugin/plugin.cc    | 38 +++++++++++++++++---------------------
 src/plugin/private.h    |  4 ++--
 src/plugin/startstop.cc |  6 ++----
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/plugin/Makefile.in b/src/plugin/Makefile.in
index 3cfe370..737cb75 100644
--- a/src/plugin/Makefile.in
+++ b/src/plugin/Makefile.in
@@ -39,6 +39,8 @@ bindir=@bindir@
 sbindir=@sbindir@
 libdir=@libdir@
 datarootdir=@datarootdir@
+jardir=@jvmjardir@
+jnidir=@jnidir@
 
 BASEDIR=@BASEDIR@
 SRCDIR=$(BASEDIR)/.src/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)
@@ -68,7 +70,11 @@ CC=@CC@
 LD=@CXX@
 
 LIBS=-lpw3270cpp @LIBS@ @GTK_LIBS@
-CXXFLAGS=@CXXFLAGS@ @GTK_CFLAGS@ -I../include
+CXXFLAGS=@CXXFLAGS@ @GTK_CFLAGS@ \
+			-I../include \
+			-DJARDIR="\"${jardir}\"" \
+			-DJNIDIR="\"${jnidir}\""
+
 LDFLAGS=@LDFLAGS@
 
 #---[ Rules ]----------------------------------------------------------------------------
diff --git a/src/plugin/call.cc b/src/plugin/call.cc
index 90900c8..c5e2799 100644
--- a/src/plugin/call.cc
+++ b/src/plugin/call.cc
@@ -34,7 +34,7 @@
  #include <lib3270/log.h>
  #include <pw3270/v3270.h>
 
- using j3270::exception;
+ using PW3270_NAMESPACE::exception;
 
 /*---[ Implement ]----------------------------------------------------------------------------------*/
 
diff --git a/src/plugin/plugin.cc b/src/plugin/plugin.cc
index 24b1023..d2cf908 100644
--- a/src/plugin/plugin.cc
+++ b/src/plugin/plugin.cc
@@ -72,35 +72,31 @@
 
 /*---[ Implement ]----------------------------------------------------------------------------------*/
 
-namespace PW3270_NAMESPACE {
-
-	void lock() {
+void lock() {
 #if GTK_CHECK_VERSION(2,32,0)
-		g_mutex_lock(&mutex);
+	g_mutex_lock(&mutex);
 #else
-		g_static_mutex_lock(&mutex);
+	g_static_mutex_lock(&mutex);
 #endif // GTK_CHECK_VERSION
-	}
+}
 
-	void unlock() {
+void unlock() {
 #if GTK_CHECK_VERSION(2,32,0)
-		g_mutex_unlock(&mutex);
+	g_mutex_unlock(&mutex);
 #else
-		g_static_mutex_unlock(&mutex);
+	g_static_mutex_unlock(&mutex);
 #endif // GTK_CHECK_VERSION
-	}
+}
 
-	bool trylock() {
+bool trylock() {
 #if GTK_CHECK_VERSION(2,32,0)
-		return g_mutex_trylock(&mutex);
+	return g_mutex_trylock(&mutex);
 #else
-		return g_static_mutex_trylock(&mutex);
+	return g_static_mutex_trylock(&mutex);
 #endif // GTK_CHECK_VERSION
-	}
-
 }
 
-using namespace PW3270_NAMESPACE;
+using PW3270_NAMESPACE::exception;
 
 extern "C" {
 
@@ -119,14 +115,14 @@ extern "C" {
 
 	LIB3270_EXPORT int pw3270_plugin_stop(GtkWidget *window, GtkWidget *terminal) {
 
-		java::lock();
+		lock();
 
-		if(java::jvm) {
-			java::jvm->DestroyJavaVM();
-			java::jvm = NULL;
+		if(jvm) {
+			jvm->DestroyJavaVM();
+			jvm = NULL;
 		}
 
-		java::unlock();
+		unlock();
 
 		#if GTK_CHECK_VERSION(2,32,0)
 			g_mutex_clear(&mutex);
diff --git a/src/plugin/private.h b/src/plugin/private.h
index 5c3dfdd..2407863 100644
--- a/src/plugin/private.h
+++ b/src/plugin/private.h
@@ -44,8 +44,8 @@
 	#include <glib/gi18n.h>
 	#include <gtk/gtk.h>
 
-	G_GNUC_INTERNAL JavaVM   * jvm;
-	G_GNUC_INTERNAL JNIEnv   * env;
+	extern JavaVM   * jvm;
+	extern JNIEnv   * env;
 
 	G_GNUC_INTERNAL bool load_jvm(GtkWidget *widget);
 	G_GNUC_INTERNAL void call(GtkWidget *widget, const char *classname);
diff --git a/src/plugin/startstop.cc b/src/plugin/startstop.cc
index 40df1ea..b71b5b4 100644
--- a/src/plugin/startstop.cc
+++ b/src/plugin/startstop.cc
@@ -50,7 +50,7 @@
 
  #include <pw3270.h>
  #include <pw3270/plugin.h>
- #include <v3270.h>
+ #include <pw3270/v3270.h>
  #include <lib3270/actions.h>
  #include <lib3270/log.h>
  #include <lib3270/trace.h>
@@ -60,8 +60,6 @@
 
 /*---[ Implement ]----------------------------------------------------------------------------------*/
 
-using namespace PW3270_NAMESPACE::java;
-
 extern "C" {
 
 	static void trace_cleanup(GtkWidget *widget, GtkWidget **window) {
@@ -106,7 +104,7 @@ extern "C" {
 
 		gchar *classname = (gchar *) g_object_get_data(G_OBJECT(action),"src");
 
-		lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p\n",gtk_action_get_name(action),widget);
+//		lib3270_trace_event(v3270_get_session(widget),"Action %s activated on widget %p\n",gtk_action_get_name(action),widget);
 
 		if(classname)
 		{
--
libgit2 0.21.2