Resolved conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/java/com/sun/gluegen/JavaConfiguration.java b/src/java/com/sun/gluegen/JavaConfiguration.java
index 9f5686b..e0a0eb6 100644
--- a/src/java/com/sun/gluegen/JavaConfiguration.java
+++ b/src/java/com/sun/gluegen/JavaConfiguration.java
@@ -104,7 +104,7 @@ public class JavaConfiguration {
 
     /**
      * The package in which the generated glue code expects to find its
-     * run-time helper classes (BufferFactory, Platform,
+     * run-time helper classes (Buffers, Platform,
      * StructAccessor). Defaults to "com.jogamp.gluegen.runtime".
      */
     private String gluegenRuntimePackage = "com.jogamp.gluegen.runtime";
@@ -308,7 +308,7 @@ public class JavaConfiguration {
   }
 
     /** Returns the package in which the generated glue code expects to
-    find its run-time helper classes (BufferFactory, Platform,
+    find its run-time helper classes (Buffers, Platform,
     StructAccessor). Defaults to "com.jogamp.gluegen.runtime". */
     public String gluegenRuntimePackage() {
         return gluegenRuntimePackage;
@@ -1500,7 +1500,7 @@ public class JavaConfiguration {
       restOfLine = restOfLine.trim();
       // Construct a JavaPrologue for this
       addJavaPrologueOrEpilogue(functionName,
-                                "BufferFactory.rangeCheck" +
+                                "Buffers.rangeCheck" +
                                 (inBytes ? "Bytes" : "") +
                                 "({" + argNum + "}, " + restOfLine + ");",
                                 true);