From 947bf9c45261013d81cc7199cb71c89b88b18fdf Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Tue, 8 Jul 2014 23:16:10 +0200
Subject: Findbugs: Use static fields where possible
---
src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java | 2 +-
src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java | 4 ++--
src/jogl/classes/javax/media/opengl/GLBufferStorage.java | 2 +-
src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java | 2 +-
src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java | 2 +-
src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'src/jogl')
diff --git a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
index 763b13954..fc0861eaa 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/awt/TextRenderer.java
@@ -1581,7 +1581,7 @@ public class TextRenderer {
}
class GlyphProducer {
- final int undefined = -2;
+ static final int undefined = -2;
final FontRenderContext fontRenderContext = null; // FIXME: Never initialized!
List<Glyph> glyphsOutput = new ArrayList<Glyph>();
HashMap<String, GlyphVector> fullGlyphVectorCache = new HashMap<String, GlyphVector>();
diff --git a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
index 65f59ba53..794ae4493 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/packrect/RectanglePacker.java
@@ -51,8 +51,8 @@ public class RectanglePacker {
private final BackingStoreManager manager;
private Object backingStore;
private LevelSet levels;
- private final float EXPANSION_FACTOR = 0.5f;
- private final float SHRINK_FACTOR = 0.3f;
+ private static final float EXPANSION_FACTOR = 0.5f;
+ private static final float SHRINK_FACTOR = 0.3f;
private final int initialWidth;
private final int initialHeight;
diff --git a/src/jogl/classes/javax/media/opengl/GLBufferStorage.java b/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
index b36e87101..1101ed31b 100644
--- a/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
+++ b/src/jogl/classes/javax/media/opengl/GLBufferStorage.java
@@ -156,5 +156,5 @@ public abstract class GLBufferStorage {
return s0+", mapped "+mappedBuffer+"]";
}
}
- private final String msgClazzName = "GLBufferStorage";
+ private static final String msgClazzName = "GLBufferStorage";
}
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
index b9b61e704..fa81e2a3f 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PMSAAES2.java
@@ -293,7 +293,7 @@ public class VBORegion2PMSAAES2 extends GLRegion {
private final float[] drawVec4Tmp2 = new float[4];
private final float[] drawMat4PMv = new float[16];
- private final int border = 2; // surrounding border, i.e. width += 2*border, height +=2*border
+ private static final int border = 2; // surrounding border, i.e. width += 2*border, height +=2*border
@Override
protected void drawImpl(final GL2ES2 gl, final RegionRenderer renderer, final int[/*1*/] sampleCount) {
diff --git a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
index 4da8684cf..090623444 100644
--- a/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
+++ b/src/jogl/classes/jogamp/graph/curve/opengl/VBORegion2PVBAAES2.java
@@ -333,7 +333,7 @@ public class VBORegion2PVBAAES2 extends GLRegion {
private final float[] drawVec4Tmp1 = new float[4];
private final float[] drawVec4Tmp2 = new float[4];
private final float[] drawMat4PMv = new float[16];
- private final int border = 2; // surrounding border, i.e. width += 2*border, height +=2*border
+ private static final int border = 2; // surrounding border, i.e. width += 2*border, height +=2*border
@Override
protected void drawImpl(final GL2ES2 gl, final RegionRenderer renderer, final int[/*1*/] sampleCount) {
diff --git a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
index 9231804be..825ad0554 100644
--- a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
@@ -92,7 +92,7 @@ public class GLBufferStateTracker {
// OpenGL specifications.
// http://www.opengl.org/sdk/docs/man/xhtml/glBindBuffer.xml
private final IntIntHashMap bindingMap;
- private final int bindingNotFound = 0xFFFFFFFF;
+ private static final int bindingNotFound = 0xFFFFFFFF;
private final int[] bufTmp = new int[1];
--
cgit v1.2.3