diff options
8 files changed, 17 insertions, 14 deletions
diff --git a/src/jogl/classes/jogamp/opengl/util/jpeg/JPEGDecoder.java b/src/jogl/classes/jogamp/opengl/util/jpeg/JPEGDecoder.java index 8254f164c..24bb995dd 100644 --- a/src/jogl/classes/jogamp/opengl/util/jpeg/JPEGDecoder.java +++ b/src/jogl/classes/jogamp/opengl/util/jpeg/JPEGDecoder.java @@ -317,7 +317,7 @@ public class JPEGDecoder { this.precision = precision; this.scanLines = scanLines; this.samplesPerLine = samplesPerLine; - compIDs = new ArrayHashSet<Integer>(componentsCount); + compIDs = new ArrayHashSet<Integer>(false, componentsCount, ArrayHashSet.DEFAULT_LOAD_FACTOR); comps = new ComponentIn[componentsCount]; this.compCount = componentsCount; this.qtt = qtt; diff --git a/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java index 83e4ae472..342b4a750 100644 --- a/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java +++ b/src/jogl/classes/jogamp/opengl/windows/wgl/awt/WindowsAWTWGLGraphicsConfigurationFactory.java @@ -152,7 +152,8 @@ public class WindowsAWTWGLGraphicsConfigurationFactory extends GLGraphicsConfigu // collect all available PFD IDs final GraphicsConfiguration[] configs = device.getConfigurations(); final int[] pfdIDs = new int[configs.length]; - final ArrayHashSet<Integer> pfdIDOSet = new ArrayHashSet<Integer>(); + final ArrayHashSet<Integer> pfdIDOSet = + new ArrayHashSet<Integer>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); for (int i = 0; i < configs.length; i++) { final GraphicsConfiguration gc = configs[i]; pfdIDs[i] = Win32SunJDKReflection.graphicsConfigurationGetPixelFormatID(gc); diff --git a/src/newt/classes/jogamp/newt/MonitorModeProps.java b/src/newt/classes/jogamp/newt/MonitorModeProps.java index 4e2806118..eabb6be01 100644 --- a/src/newt/classes/jogamp/newt/MonitorModeProps.java +++ b/src/newt/classes/jogamp/newt/MonitorModeProps.java @@ -158,11 +158,11 @@ public class MonitorModeProps { ; public static class Cache { - public final ArrayHashSet<DimensionImmutable> resolutions = new ArrayHashSet<DimensionImmutable>(); - public final ArrayHashSet<SurfaceSize> surfaceSizes = new ArrayHashSet<SurfaceSize>(); - public final ArrayHashSet<MonitorMode.SizeAndRRate> sizeAndRates = new ArrayHashSet<MonitorMode.SizeAndRRate>(); - public final ArrayHashSet<MonitorMode> monitorModes = new ArrayHashSet<MonitorMode>(); - public final ArrayHashSet<MonitorDevice> monitorDevices = new ArrayHashSet<MonitorDevice>(); + public final ArrayHashSet<DimensionImmutable> resolutions = new ArrayHashSet<DimensionImmutable>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); + public final ArrayHashSet<SurfaceSize> surfaceSizes = new ArrayHashSet<SurfaceSize>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); + public final ArrayHashSet<MonitorMode.SizeAndRRate> sizeAndRates = new ArrayHashSet<MonitorMode.SizeAndRRate>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); + public final ArrayHashSet<MonitorMode> monitorModes = new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); + public final ArrayHashSet<MonitorDevice> monitorDevices = new ArrayHashSet<MonitorDevice>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); public final void setPrimary(final MonitorDevice p) { primary = p; } public final MonitorDevice getPrimary() { return primary;} @@ -308,7 +308,7 @@ public class MonitorModeProps { final int rotation = monitorProperties[offset++]; currentMode = getByNativeIdAndRotation(allMonitorModes, modeId, rotation); } - final ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(); + final ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); while( offset < limit ) { final int modeId = monitorProperties[offset++]; for (int i=0; i<allMonitorModes.size(); i++) { diff --git a/src/newt/classes/jogamp/newt/WindowImpl.java b/src/newt/classes/jogamp/newt/WindowImpl.java index 49fa1da4b..8e31d1d21 100644 --- a/src/newt/classes/jogamp/newt/WindowImpl.java +++ b/src/newt/classes/jogamp/newt/WindowImpl.java @@ -257,7 +257,7 @@ public abstract class WindowImpl implements Window, NEWTEventConsumer private final PointerState1 pState1 = new PointerState1(); /** Pointer names -> pointer ID (consecutive index, starting w/ 0) */ - private final ArrayHashSet<Integer> pName2pID = new ArrayHashSet<Integer>(); + private final ArrayHashSet<Integer> pName2pID = new ArrayHashSet<Integer>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); private boolean defaultGestureHandlerEnabled = true; private DoubleTapScrollGesture gesture2PtrTouchScroll = null; diff --git a/src/newt/classes/jogamp/newt/driver/macosx/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/macosx/ScreenDriver.java index 1389692fc..ddeea265a 100644 --- a/src/newt/classes/jogamp/newt/driver/macosx/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/macosx/ScreenDriver.java @@ -155,7 +155,8 @@ public class ScreenDriver extends ScreenImpl { // for(int crtIdx=0; crtIdx<crtProps.count; crtIdx++) { final int crt_id = crtProps.crtIDs[crtIdx]; - final ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(); + final ArrayHashSet<MonitorMode> supportedModes = + new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); int modeIdx = 0; { // Get all supported modes for this monitorDevice diff --git a/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java index ea3e76eb3..dfdb8b155 100644 --- a/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/windows/ScreenDriver.java @@ -101,7 +101,8 @@ public class ScreenDriver extends ScreenImpl { @Override protected void collectNativeMonitorModesAndDevicesImpl(final MonitorModeProps.Cache cache) { - ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(); + ArrayHashSet<MonitorMode> supportedModes = + new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); String adapterName; for(int adapterIdx=0; null != ( adapterName = getAdapterName(adapterIdx) ); adapterIdx++ ) { for(int monitorIdx=0; null != getMonitorName(adapterName, monitorIdx, true); monitorIdx++ ) { @@ -124,7 +125,7 @@ public class ScreenDriver extends ScreenImpl { MonitorModeProps.streamInMonitorDevice(cache, this, currentMode, null, supportedModes, monitorProps, 0, null); // next monitor, 1st mode - supportedModes = new ArrayHashSet<MonitorMode>(); + supportedModes = new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); } } } diff --git a/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java b/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java index 2dc416063..517d229b7 100644 --- a/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java +++ b/src/newt/classes/jogamp/newt/driver/x11/ScreenDriver.java @@ -124,7 +124,7 @@ public class ScreenDriver extends ScreenImpl { final int crtCount = crt_ids.length; // Gather all available rotations - final ArrayHashSet<Integer> availableRotations = new ArrayHashSet<Integer>(); + final ArrayHashSet<Integer> availableRotations = new ArrayHashSet<Integer>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); for(int i = 0; i < crtCount; i++) { final int[] rotations = rAndR.getAvailableRotations(device.getHandle(), this, crt_ids[i]); if( null != rotations ) { diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java index 43206bbae..5e7ac8644 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java @@ -110,7 +110,7 @@ public class TestScreenMode00aNEWT extends UITestCase { final DimensionImmutable sizeMM = new Dimension(50, 50); final Rectangle viewport = new Rectangle(0, 0, 1920, 1080); - final ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(); + final ArrayHashSet<MonitorMode> supportedModes = new ArrayHashSet<MonitorMode>(false, ArrayHashSet.DEFAULT_INITIAL_CAPACITY, ArrayHashSet.DEFAULT_LOAD_FACTOR); supportedModes.add(modeOut); final MonitorDevice monOut = new MonitorDeviceImpl(null, -1, false, true, sizeMM, modeOut, null, viewport, viewport, supportedModes); System.err.println("01 out : "+monOut); |