From f20e674318dea5ad87393265483aeb67a3a1520c Mon Sep 17 00:00:00 2001
From: Max Schenkelberg <max.schenkelberg@raytheon.com>
Date: Fri, 30 Mar 2012 10:51:31 -0500
Subject: [PATCH] Issue #358 Fixed merge errors when merging core_exp into
 ss_sync

Former-commit-id: 9b0d01f8b5eedfc587f50a2d932169080bace131 [formerly 9b0d01f8b5eedfc587f50a2d932169080bace131 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 07cf5069bad1784cdb664e787a384f856c5ca321
Former-commit-id: 993cac891e6f8b3d56947cbf8d209d0bb6cc76af
---
 .../src/com/raytheon/viz/core/gl/IGLTarget.java             | 6 ------
 .../com/raytheon/viz/core/gl/images/AbstractGLImage.java    | 3 +++
 .../com/raytheon/viz/core/gl/images/GLCMTextureData.java    | 3 ---
 .../src/com/raytheon/viz/core/gl/internal/GLTarget.java     | 1 -
 .../viz/radar/rsc/graphic/RadarGraphicFunctions.java        | 3 +--
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
index b959ee50a0..a2d2dea427 100644
--- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
+++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
@@ -50,12 +50,6 @@ public interface IGLTarget extends IGraphicsTarget {
      */
     public abstract void releaseContext();
 
-    /**
-     * 
-     * @return
-     */
-    public abstract void releaseContext();
-
     /**
      * Get the modle view matrix settings
      * 
diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
index 90ef3270f8..86b9a7d7d0 100644
--- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
+++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
@@ -219,6 +219,7 @@ public abstract class AbstractGLImage implements IImage {
                 rbuf = null;
             }
             throw new VizException(errorMessage);
+        }
     }
 
     /*
@@ -261,8 +262,10 @@ public abstract class AbstractGLImage implements IImage {
                         GL.GL_NEAREST);
             }
             return true;
+        }
         return false;
     }
+    
     /*
      * (non-Javadoc)
      * 
diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
index 79cdadb29d..4d7b046f17 100644
--- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
+++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
@@ -203,9 +203,6 @@ public class GLCMTextureData implements IImageCacheable {
     public double getValue(int x, int y) {
         if (!isStaged() && isLoaded()) {
             GL gl = GLU.getCurrentGL();
-            if (gl == null || data == null) {
-                return Double.NaN;
-            }
             int textureStorageType = getTextureStorageType();
             int copybackTextureType = data.getCopyBackTextureType();
             Buffer copybackBuffer = data.getCopybackBuffer();
diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
index 508750107a..800c55f07e 100644
--- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
+++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
@@ -552,7 +552,6 @@ public class GLTarget implements IGLTarget {
         theContext.destroyContext();
 
         if (theCanvas != null && theCanvas.isDisposed() == false) {
-
             theCanvas.removeListener(SWT.Resize, this.canvasResizeListener);
         }
         extensionManager.dispose();
diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
index 8a8cbc4148..6895ed1cb2 100644
--- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
+++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
@@ -846,8 +846,7 @@ public class RadarGraphicFunctions {
     }
 
     private static Document loadSVG(String plotModelFile) throws VizException {
-        Document document = null;
-        // document = docMap.get(plotModelFile);
+        Document document = docMap.get(plotModelFile);
         if (document == null) {
 
             String parser = XMLResourceDescriptor.getXMLParserClassName();