summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-08-02 01:17:04 +0200
committerSven Gothel <[email protected]>2015-08-02 01:17:04 +0200
commit87f29ea276d70171bbf227c0800991349ccf4873 (patch)
tree33f889c2156cbbc7db7d749e67c51a5f330cde29
parent1a8b5c63c2f5328724a84ced2fa16a04ee6e8ac5 (diff)
Adapt to GlueGen's Bitfield Changes (commit 047e9adaf2a5f51f7acfa194a744c99b6bfadaea)
-rw-r--r--src/nativewindow/classes/com/jogamp/nativewindow/util/PixelFormat.java2
-rw-r--r--src/newt/classes/com/jogamp/newt/event/InputEvent.java6
-rw-r--r--src/newt/classes/com/jogamp/newt/event/KeyEvent.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/nativewindow/classes/com/jogamp/nativewindow/util/PixelFormat.java b/src/nativewindow/classes/com/jogamp/nativewindow/util/PixelFormat.java
index 609699a6f..6824867e3 100644
--- a/src/nativewindow/classes/com/jogamp/nativewindow/util/PixelFormat.java
+++ b/src/nativewindow/classes/com/jogamp/nativewindow/util/PixelFormat.java
@@ -575,7 +575,7 @@ public enum PixelFormat {
boolean uniform = true;
for(int i = componentMask.length-1; i>=0; i--) {
final int cmask = componentMask[i];
- final int bitCount = Bitfield.Util.getBitCount(cmask);
+ final int bitCount = Bitfield.Util.bitCount(cmask);
bpp += bitCount;
this.compBitCount[i] = bitCount;
if( i > 0 && uniform ) {
diff --git a/src/newt/classes/com/jogamp/newt/event/InputEvent.java b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
index ca9d4c2a3..3a73671f1 100644
--- a/src/newt/classes/com/jogamp/newt/event/InputEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/InputEvent.java
@@ -188,11 +188,11 @@ public abstract class InputEvent extends NEWTEvent
* <p>
* See also {@link MouseEvent}'s section about <i>Multiple-Pointer Events</i>.
* </p>
- * @see Bitfield.Util#getBitCount(int)
+ * @see Bitfield.Util#bitCount(int)
* @see #BUTTONALL_MASK
*/
public final int getButtonDownCount() {
- return Bitfield.Util.getBitCount(modifiers & BUTTONALL_MASK);
+ return Bitfield.Util.bitCount(modifiers & BUTTONALL_MASK);
}
/**
@@ -203,7 +203,7 @@ public abstract class InputEvent extends NEWTEvent
* <p>
* See also {@link MouseEvent}'s section about <i>Multiple-Pointer Events</i>.
* </p>
- * @see Bitfield.Util#getBitCount(int)
+ * @see Bitfield.Util#bitCount(int)
* @see #BUTTONALL_MASK
*/
public final boolean isAnyButtonDown() {
diff --git a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
index 9e69d76fa..70e264685 100644
--- a/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
+++ b/src/newt/classes/com/jogamp/newt/event/KeyEvent.java
@@ -141,7 +141,7 @@ public class KeyEvent extends InputEvent
// Validate flags
//
final int pma_bits = flags & ( F_PRINTABLE_MASK | F_MODIFIER_MASK | F_ACTION_MASK ) ;
- final int pma_count = Bitfield.Util.getBitCount(pma_bits);
+ final int pma_count = Bitfield.Util.bitCount(pma_bits);
if ( 1 != pma_count ) {
throw new InternalError("Key must be either of type printable, modifier or action - but it is of "+pma_count+" types: "+this);
}