From 1d1b3f92a7c8021198e44bc4b2d6494ab789ddd3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 29 Aug 2015 20:21:29 +0200
Subject: Bug 1202 (related): Fix SEMVER regressions mostly due to Bug 1202
 commits (adding dummy methods)

Commits deff49c901915e007f43a1df1a0d217a786e9f06 and 6ab634654f58afcf4549fcd1a796a0f9fd13298c
changed/removed a few protected methods of public classes ..

Re-added dummy methods .. shall be removed for next 2.4.* version
---
 src/jogl/classes/com/jogamp/opengl/GLContext.java     | 19 +++++++++++++++++--
 src/jogl/classes/com/jogamp/opengl/GLUniformData.java |  1 +
 .../classes/com/jogamp/opengl/math/FloatUtil.java     |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'src/jogl/classes/com/jogamp')

diff --git a/src/jogl/classes/com/jogamp/opengl/GLContext.java b/src/jogl/classes/com/jogamp/opengl/GLContext.java
index 258363e2e..45cc1c509 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLContext.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLContext.java
@@ -1265,7 +1265,14 @@ public abstract class GLContext {
    * @throws GLException if the context is not current.
    * @see #getSwapInterval()
    */
-  public abstract boolean setSwapInterval(final int interval) throws GLException;
+  public /* abstract */ boolean setSwapInterval(final int interval) throws GLException {
+      // FIXME: Make abstract for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
+  }
+  protected boolean setSwapIntervalImpl(final int interval) {
+      // FIXME: Remove for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
+  }
 
   /**
    * Return the current swap interval.
@@ -1279,7 +1286,15 @@ public abstract class GLContext {
    * </p>
    * @see #setSwapInterval(int)
    */
-  public abstract int getSwapInterval();
+  public /* abstract */ int getSwapInterval() {
+      // FIXME: Make abstract for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
+  }
+
+  protected void setDefaultSwapInterval() {
+      // FIXME: Remove for next version - just here to *not* break SEMVER!
+      throw new InternalError("Implemented in GLContextImpl");
+  }
 
   public final boolean queryMaxSwapGroups(final int[] maxGroups, final int maxGroups_offset,
                                           final int[] maxBarriers, final int maxBarriers_offset) {
diff --git a/src/jogl/classes/com/jogamp/opengl/GLUniformData.java b/src/jogl/classes/com/jogamp/opengl/GLUniformData.java
index 44f7f29c7..55a2e0cf1 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLUniformData.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLUniformData.java
@@ -84,6 +84,7 @@ public class GLUniformData {
     public IntBuffer intBufferValue()   { return (IntBuffer)data; };
     public FloatBuffer floatBufferValue() { return (FloatBuffer)data; };
 
+    @SuppressWarnings("deprecation")
     public StringBuilder toString(StringBuilder sb) {
       if(null == sb) {
           sb = new StringBuilder();
diff --git a/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java b/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java
index b24339569..7f630f9d5 100644
--- a/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java
+++ b/src/jogl/classes/com/jogamp/opengl/math/FloatUtil.java
@@ -1959,6 +1959,7 @@ public final class FloatUtil {
    * @param columns
    * @param rowMajorOrder if true floats are layed out in row-major-order, otherwise column-major-order (OpenGL)
    * @return matrix string representation
+   * @deprecated use on of the float[] variants
    */
   public static StringBuilder matrixToString(StringBuilder sb, final String rowPrefix, final String f,
                                              final FloatBuffer a, final int aOffset, final int rows, final int columns, final boolean rowMajorOrder) {
-- 
cgit v1.2.3