Issue #1782 fix merge problems related to graphics API.

Former-commit-id: 0aad550439 [formerly 2b898e58c7] [formerly 6edee13cdd [formerly 9689a020a25ffdbf8a13abb02506d6e3e4dcdbb8]]
Former-commit-id: 6edee13cdd
Former-commit-id: 76a6213807

cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java

@@ -47,40 +47,6 @@ import com.raytheon.uf.viz.core.exception.VizException;
 
 public interface IColorMapDataRetrievalCallback {
 
-        /**
-         * @param dataType
-         * @param dataBounds
-         */
-        public ColorMapData(ColorMapDataType dataType, int[] dimensions) {
-            this.buffer = getBuffer(dataType, dimensions);
-            this.dimensions = dimensions;
-            this.dataType = dataType;
-        }
-
-        }
-
-        private static Buffer getBuffer(ColorMapDataType dataType,
-                int[] dimensions) {
-            int size = 1;
-            for (int i : dimensions) {
-                size *= i;
-            }
-            switch (dataType) {
-            case BYTE:
-            case SIGNED_BYTE:
-                return ByteBuffer.allocate(size);
-            case SHORT:
-            case UNSIGNED_SHORT:
-                return ShortBuffer.allocate(size);
-            case FLOAT:
-                return FloatBuffer.allocate(size);
-            case INT:
-                return IntBuffer.allocate(size);
-            default:
-                throw new RuntimeException("Could not find Buffer for "
-                        + dataType);
-            }
-
     /**
      * Get the ColorMapData. IMPORTANT NOTE: This method should retrieve the
      * ColorMapData from wherever it lives. ColorMapData objects should not be

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java

@@ -20,7 +20,7 @@
 package com.raytheon.viz.core.gl.dataformat;
 
 import com.raytheon.uf.common.colormap.image.ColorMapData;
-import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback.ColorMapDataType;
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 
 /**
  * Factory class for getting GLColorMapDataFormat objects given the ColorMapData

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/GLOffscreenRenderingExtension.java

@@ -29,11 +29,11 @@ import java.util.Stack;
 import javax.media.opengl.GL;
 
 import com.raytheon.uf.common.colormap.image.ColorMapData;
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.viz.core.IExtent;
 import com.raytheon.uf.viz.core.IView;
 import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback;
-import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback.ColorMapDataType;
 import com.raytheon.uf.viz.core.data.IRenderedImageCallback;
 import com.raytheon.uf.viz.core.drawables.IImage;
 import com.raytheon.uf.viz.core.drawables.ext.GraphicsExtension;

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java

@@ -27,8 +27,8 @@ import javax.media.opengl.GL;
 import javax.media.opengl.glu.GLU;
 
 import com.raytheon.uf.common.colormap.image.ColorMapData;
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback;
-import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback.ColorMapDataType;
 import com.raytheon.uf.viz.core.exception.VizException;
 import com.raytheon.viz.core.gl.GLContextBridge;
 import com.raytheon.viz.core.gl.dataformat.GLColorMapData;

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java

@@ -21,9 +21,9 @@ package com.raytheon.viz.core.gl.images;
 
 import javax.media.opengl.GL;
 
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback;
-import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback.ColorMapDataType;
 import com.raytheon.uf.viz.core.drawables.IColormappedImage;
 import com.raytheon.uf.viz.core.drawables.ext.IImagingExtension;
 import com.raytheon.uf.viz.core.exception.VizException;

cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java

@@ -21,11 +21,11 @@ package com.raytheon.viz.core.gl.internal.ext.mosaic;
 
 import javax.media.opengl.GL;
 
+import com.raytheon.uf.common.colormap.image.ColorMapData.ColorMapDataType;
 import com.raytheon.uf.common.colormap.prefs.ColorMapParameters;
 import com.raytheon.uf.viz.core.DrawableImage;
 import com.raytheon.uf.viz.core.IExtent;
 import com.raytheon.uf.viz.core.PixelCoverage;
-import com.raytheon.uf.viz.core.data.IColorMapDataRetrievalCallback.ColorMapDataType;
 import com.raytheon.uf.viz.core.drawables.IImage;
 import com.raytheon.uf.viz.core.drawables.IImage.Status;
 import com.raytheon.uf.viz.core.drawables.ImagingSupport;

edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/ColorMapData.java

@@ -75,6 +75,16 @@ public class ColorMapData {
         this.dataType = dataType;
     }
 
+    /**
+     * @param dataType
+     * @param dataBounds
+     */
+    public ColorMapData(ColorMapDataType dataType, int[] dimensions) {
+        this.buffer = getBuffer(dataType, dimensions);
+        this.dimensions = dimensions;
+        this.dataType = dataType;
+    }
+
     public Buffer getBuffer() {
         return buffer;
     }
@@ -100,4 +110,25 @@ public class ColorMapData {
         throw new RuntimeException("Could not find ColorMapDataType for "
                 + buffer);
     }
+
+    private static Buffer getBuffer(ColorMapDataType dataType, int[] dimensions) {
+        int size = 1;
+        for (int i : dimensions) {
+            size *= i;
+        }
+        switch (dataType) {
+        case BYTE:
+        case SIGNED_BYTE:
+            return ByteBuffer.allocate(size);
+        case SHORT:
+        case UNSIGNED_SHORT:
+            return ShortBuffer.allocate(size);
+        case FLOAT:
+            return FloatBuffer.allocate(size);
+        case INT:
+            return IntBuffer.allocate(size);
+        default:
+            throw new RuntimeException("Could not find Buffer for " + dataType);
+        }
+    }
 }