[Bsf4oorexx-svn] SF.net SVN: bsf4oorexx:[84] trunk

[<or...@us...>]

Revision: 84
          http://bsf4oorexx.svn.sourceforge.net/bsf4oorexx/?rev=84&view=rev
Author:   orexx
Date:     2012-04-17 12:35:03 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------
20120417 Added protected set_rii_ID() to RexxAndJava (reverted rii_ID field to be private), such that Java4Rexx can still set the reference to the Rexx interpreter instance; this way the implementation is orthogonal to RexxEngine.

Modified Paths:
--------------
    trunk/bsf4oorexx.dev/source_java/Java4Rexx.class
    trunk/bsf4oorexx.dev/source_java/Java4Rexx.java
    trunk/bsf4oorexx.dev/source_java/RexxAndJava$1.class
    trunk/bsf4oorexx.dev/source_java/RexxAndJava$2.class
    trunk/bsf4oorexx.dev/source_java/RexxAndJava$ExitDelayed.class
    trunk/bsf4oorexx.dev/source_java/RexxAndJava$SyncPutGet.class
    trunk/bsf4oorexx.dev/source_java/RexxAndJava.class
    trunk/bsf4oorexx.dev/source_java/RexxAndJava.java
    trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.class
    trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.java
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$1.class
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$2.class
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$ExitDelayed.class
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$SyncPutGet.class
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.class
    trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.java

Modified: trunk/bsf4oorexx.dev/source_java/Java4Rexx.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/Java4Rexx.java
===================================================================
--- trunk/bsf4oorexx.dev/source_java/Java4Rexx.java	2012-04-17 10:29:39 UTC (rev 83)
+++ trunk/bsf4oorexx.dev/source_java/Java4Rexx.java	2012-04-17 12:35:03 UTC (rev 84)
@@ -91,12 +91,11 @@
     // the Java side
 
         // now call into the DLL ("BSF4ooRexx.dll") in order to initialize; will set JVM in BSF4ooRexx.cc
-    RexxAndJava raj=rxEngine.getRexxInterface();    // get the interface instance
+    RexxAndJava raj=rxEngine.getRexxInterface();    // get the RexxAndJava (i.e. interface) instance
+    raj.jniInitialize4Rexx();           // initialize BSF4ooRexx (will cache interface instance)
 
-    raj.jniInitialize4Rexx();           // initialize BSF4ooRexx
-
-    String root_rii_ID=raj.jniGetRexxInterpreterInstanceRoot(); // get primodal Rexx interpreter instance
-    raj.rii_ID=root_rii_ID;             // now tell engine instance which Rexx interpreter instance to use
+    String root_rii_ID=raj.jniGetRexxInterpreterInstanceRoot(); // get reference to Rexx interpreter instance
+    raj.set_rii_ID(root_rii_ID);        // now tell engine instance which Rexx interpreter instance to use
     rxEngine.set_rii_ID(root_rii_ID);   // now tell engine instance which Rexx interpreter instance to use
   }
 }

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava$1.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava$2.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava$ExitDelayed.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava$SyncPutGet.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava.class
===================================================================
(Binary files differ)

Modified: trunk/bsf4oorexx.dev/source_java/RexxAndJava.java
===================================================================
--- trunk/bsf4oorexx.dev/source_java/RexxAndJava.java	2012-04-17 10:29:39 UTC (rev 83)
+++ trunk/bsf4oorexx.dev/source_java/RexxAndJava.java	2012-04-17 12:35:03 UTC (rev 84)
@@ -43,8 +43,9 @@
  /*
      2012-04-17, ---rgf, - fixed a bug in createRexxInterpreterInstance() where the new RII was
                            not assigned to the RexxEngine if that had no RII assigned to it yet
-                         - changed visibility for rii_ID from private to protected, such that
-                           Java4Rexx is able to set it accordingly
+                         - added protected void set_rii_ID(String rii_ID) to allow Java4Rexx to
+                           set the reference to the Rexx interpreter instance that invoked it
+
      2012-03-12, ---rgf, - now loading BSF4ooRexx DLL/so after trying to fetch the netrexx.lang.Rexx class,
                            such that native library can access static field "nlR_class" and fetch the class object,
                            if Java found it
@@ -388,8 +389,7 @@
 
     /** Contains the RexxInterpreter instance ID this engine is associated with.
      */
-    // private String rii_ID=null;
-    protected String rii_ID=null;
+    private String rii_ID=null;
 
     /** Getter method.
      *  @return the RexxInterpreter instance ID
@@ -400,7 +400,15 @@
         return rii_ID;
     }
 
+    /** Setter method. Only meant to be used by Java4Rexx.java.
+     */
+    protected void set_rii_ID(String rii_ID)
+    {
+        this.rii_ID=rii_ID;
+    }
 
+
+
     /** Load the DLL, which allows interfacing Java with Rexx or Object Rexx, determines
      *  whether setting accessibility rights is supported.
      */

Modified: trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.java
===================================================================
--- trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.java	2012-04-17 10:29:39 UTC (rev 83)
+++ trunk/org/rexxla/bsf/engines/rexx/Java4Rexx.java	2012-04-17 12:35:03 UTC (rev 84)
@@ -91,12 +91,11 @@
     // the Java side
 
         // now call into the DLL ("BSF4ooRexx.dll") in order to initialize; will set JVM in BSF4ooRexx.cc
-    RexxAndJava raj=rxEngine.getRexxInterface();    // get the interface instance
+    RexxAndJava raj=rxEngine.getRexxInterface();    // get the RexxAndJava (i.e. interface) instance
+    raj.jniInitialize4Rexx();           // initialize BSF4ooRexx (will cache interface instance)
 
-    raj.jniInitialize4Rexx();           // initialize BSF4ooRexx
-
-    String root_rii_ID=raj.jniGetRexxInterpreterInstanceRoot(); // get primodal Rexx interpreter instance
-    raj.rii_ID=root_rii_ID;             // now tell engine instance which Rexx interpreter instance to use
+    String root_rii_ID=raj.jniGetRexxInterpreterInstanceRoot(); // get reference to Rexx interpreter instance
+    raj.set_rii_ID(root_rii_ID);        // now tell engine instance which Rexx interpreter instance to use
     rxEngine.set_rii_ID(root_rii_ID);   // now tell engine instance which Rexx interpreter instance to use
   }
 }

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$1.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$2.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$ExitDelayed.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava$SyncPutGet.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.class
===================================================================
(Binary files differ)

Modified: trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.java
===================================================================
--- trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.java	2012-04-17 10:29:39 UTC (rev 83)
+++ trunk/org/rexxla/bsf/engines/rexx/RexxAndJava.java	2012-04-17 12:35:03 UTC (rev 84)
@@ -43,8 +43,8 @@
  /*
      2012-04-17, ---rgf, - fixed a bug in createRexxInterpreterInstance() where the new RII was
                            not assigned to the RexxEngine if that had no RII assigned to it yet
-                         - changed visibility for rii_ID from private to protected, such that
-                           Java4Rexx is able to set it accordingly
+                         - added protected void set_rii_ID(String rii_ID) to allow Java4Rexx to
+                           set the reference to the Rexx interpreter instance that invoked it
      2012-03-12, ---rgf, - now loading BSF4ooRexx DLL/so after trying to fetch the netrexx.lang.Rexx class,
                            such that native library can access static field "nlR_class" and fetch the class object,
                            if Java found it
@@ -388,8 +388,7 @@
 
     /** Contains the RexxInterpreter instance ID this engine is associated with.
      */
-    // private String rii_ID=null;
-    protected String rii_ID=null;
+    private String rii_ID=null;
 
     /** Getter method.
      *  @return the RexxInterpreter instance ID
@@ -400,7 +399,15 @@
         return rii_ID;
     }
 
+    /** Setter method. Only meant to be used by Java4Rexx.java.
+     */
+    protected void set_rii_ID(String rii_ID)
+    {
+        this.rii_ID=rii_ID;
+    }
 
+
+
     /** Load the DLL, which allows interfacing Java with Rexx or Object Rexx, determines
      *  whether setting accessibility rights is supported.
      */

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.