gl debugger: Rename SamplesView to GLFramesView

No change in functionality, only rename.

Change-Id: I43d134c9e9acca1761712bfe1a9fc6f4143131af

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gldebugger/MessageParserExTest.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gldebugger/MessageParserExTest.java
index 9d2f9ee..8220cc7 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gldebugger/MessageParserExTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger.tests/src/com/android/ide/eclipse/gldebugger/MessageParserExTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 import com.android.ide.eclipse.gldebugger.GLEnum;
 import com.android.ide.eclipse.gldebugger.MessageFormatter;
 import com.android.ide.eclipse.gldebugger.MessageParserEx;
-import com.android.ide.eclipse.gldebugger.SampleView;
+import com.android.ide.eclipse.gldebugger.GLFramesView;
 import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
 import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
 import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type;
@@ -47,7 +47,7 @@ public class MessageParserExTest {
         final String args = "{0, 1    ,2,3  }";
         parser.args = args;
         final ByteBuffer data = parser.parseFloats(4).asReadOnlyByteBuffer();
-        data.order(SampleView.TARGET_BYTE_ORDER);
+        data.order(GLFramesView.TARGET_BYTE_ORDER);
         for (int i = 0; i < 4; i++)
             assertEquals(i, data.getFloat(), 0);
     }
@@ -94,7 +94,7 @@ public class MessageParserExTest {
     @Test
     public void testParseFormatterMessage() {
         final ByteBuffer srcData = ByteBuffer.allocate(4 * 2 * 4);
-        srcData.order(SampleView.TARGET_BYTE_ORDER);
+        srcData.order(GLFramesView.TARGET_BYTE_ORDER);
         for (int i = 0; i < 4 * 2; i++)
             srcData.putFloat(i);
         srcData.rewind();

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml
index 7f384b6..17504f1 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml
@@ -8,7 +8,7 @@
             name="OpenGL ES 2.0 Debugger"\r
             icon="icons/sample.gif"\r
             category="org.eclipse.debug.ui"\r
-            class="com.android.ide.eclipse.gldebugger.SampleView"\r
+            class="com.android.ide.eclipse.gldebugger.GLFramesView"\r
             id="glesv2debuggerclient.views.SampleView">\r
       </view>\r
    </extension>\r

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java
index 4d5ae54..c3e1c53 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java
@@ -41,14 +41,14 @@ import java.io.IOException;
 public class BreakpointOption extends ScrolledComposite implements SelectionListener,
         ProcessMessage {
 
-    SampleView sampleView;
+    GLFramesView mGLFramesView;
     Button[] buttonsBreak = new Button[Function.values().length];
     /** cache of buttonsBreak[Function.getNumber()].getSelection */
     boolean[] breakpoints = new boolean[Function.values().length];
 
-    BreakpointOption(SampleView sampleView, Composite parent) {
+    BreakpointOption(GLFramesView view, Composite parent) {
         super(parent, SWT.NO_BACKGROUND | SWT.V_SCROLL | SWT.H_SCROLL);
-        this.sampleView = sampleView;
+        mGLFramesView = view;
 
         Composite composite = new Composite(this, 0);
         GridLayout layout = new GridLayout();
@@ -86,7 +86,7 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
         builder.setProp(Prop.ExpectResponse);
         builder.setArg0(function.getNumber());
         builder.setArg1(enabled ? 1 : 0);
-        sampleView.messageQueue.addCommand(builder.build());
+        mGLFramesView.messageQueue.addCommand(builder.build());
         breakpoints[function.getNumber()] = enabled;
     }
 
@@ -94,8 +94,8 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
         Button btn = (Button) e.widget;
         Group group = (Group) btn.getParent();
         int contextId = 0;
-        if (sampleView.current != null)
-            contextId = sampleView.current.contextId;
+        if (mGLFramesView.current != null)
+            contextId = mGLFramesView.current.contextId;
         setBreakpoint(contextId, Function.valueOf(group.getText()), btn.getSelection());
     }
 
@@ -116,7 +116,7 @@ public class BreakpointOption extends ScrolledComposite implements SelectionList
         builder.setContextId(contextId);
         builder.setType(Type.Response);
         builder.setExpectResponse(true);
-        final Shell shell = sampleView.getViewSite().getShell();
+        final Shell shell = mGLFramesView.getViewSite().getShell();
         final boolean send[] = new boolean[1];
         shell.getDisplay().syncExec(new Runnable() {
             public void run() {

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java
index 836875a..3bbb1e1 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java
@@ -316,7 +316,7 @@ public class CodeGen implements IRunnableWithProgress {
 
     private void codeGenGenNames(final Message msg) {
         final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
-        names.order(SampleView.TARGET_BYTE_ORDER);
+        names.order(GLFramesView.TARGET_BYTE_ORDER);
         SparseIntArray namesArray = null;
         for (int i = 0; i < msg.getArg0(); i++) {
             String id = "";
@@ -354,7 +354,7 @@ public class CodeGen implements IRunnableWithProgress {
 
     private void codeGenDeleteNames(final Message msg) {
         final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
-        names.order(SampleView.TARGET_BYTE_ORDER);
+        names.order(GLFramesView.TARGET_BYTE_ORDER);
         SparseIntArray namesArray = null;
         for (int i = 0; i < msg.getArg0(); i++) {
             String id = null;
@@ -505,18 +505,18 @@ public class CodeGen implements IRunnableWithProgress {
             // need to load user pointer indices and/or attributes
             final byte[] element = new byte[attribDataStride];
             final ByteBuffer data = msgData.msg.getData().asReadOnlyByteBuffer();
-            data.order(SampleView.TARGET_BYTE_ORDER);
+            data.order(GLFramesView.TARGET_BYTE_ORDER);
             final ByteBuffer indexData = ByteBuffer.allocate(count * GLServerVertex.typeSize(type));
-            indexData.order(SampleView.TARGET_BYTE_ORDER);
+            indexData.order(GLFramesView.TARGET_BYTE_ORDER);
             final ByteBuffer attribData = ByteBuffer.allocate(count * attribDataStride);
-            attribData.order(SampleView.TARGET_BYTE_ORDER);
+            attribData.order(GLFramesView.TARGET_BYTE_ORDER);
             int maxIndex = -1;
             ByteBuffer indexSrc = data;
             if (v.indexBuffer != null) {
                 indexSrc = v.indexBuffer.data;
                 indexSrc.position(msgData.msg.getArg3());
             }
-            indexSrc.order(SampleView.TARGET_BYTE_ORDER);
+            indexSrc.order(GLFramesView.TARGET_BYTE_ORDER);
             for (int i = 0; i < count; i++) {
                 int index = -1;
                 if (type == GLEnum.GL_UNSIGNED_BYTE) {
@@ -606,7 +606,7 @@ public class CodeGen implements IRunnableWithProgress {
         final int count = msgData.attribs[0].length / 4;
         final GLEnum mode = GLEnum.valueOf(msgData.msg.getArg0());
         final ByteBuffer attribData = ByteBuffer.allocate(maxAttrib * count * 16);
-        attribData.order(SampleView.TARGET_BYTE_ORDER);
+        attribData.order(GLFramesView.TARGET_BYTE_ORDER);
         for (int i = 0; i < count; i++)
             for (int j = 0; j < maxAttrib; j++)
                 for (int k = 0; k < 4; k++)

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java
index 9763661..26e7360 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java
@@ -105,7 +105,7 @@ class Frame {
             file.seek(filePosition);
             for (int i = 0; i < callsCount; i++) {
                 int len = file.readInt();
-                if (SampleView.TARGET_BYTE_ORDER == ByteOrder.LITTLE_ENDIAN)
+                if (GLFramesView.TARGET_BYTE_ORDER == ByteOrder.LITTLE_ENDIAN)
                     len = Integer.reverseBytes(len);
                 final byte[] data = new byte[len];
                 file.read(data);
@@ -150,10 +150,10 @@ class DebugContext {
                 frame.increaseCallsCount();
             final byte[] data = msg.toByteArray();
             final ByteBuffer len = ByteBuffer.allocate(4);
-            len.order(SampleView.TARGET_BYTE_ORDER);
+            len.order(GLFramesView.TARGET_BYTE_ORDER);
             len.putInt(data.length);
             try {
-                if (SampleView.TARGET_BYTE_ORDER == ByteOrder.BIG_ENDIAN)
+                if (GLFramesView.TARGET_BYTE_ORDER == ByteOrder.BIG_ENDIAN)
                     file.writeInt(data.length);
                 else
                     file.writeInt(Integer.reverseBytes(data.length));
@@ -320,9 +320,9 @@ public class Context implements Cloneable {
 class ContextViewProvider extends LabelProvider implements ITreeContentProvider,
         ISelectionChangedListener {
     Context context;
-    final SampleView sampleView;
+    final GLFramesView sampleView;
 
-    ContextViewProvider(final SampleView sampleView) {
+    ContextViewProvider(final GLFramesView sampleView) {
         this.sampleView = sampleView;
     }
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/SampleView.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLFramesView.java
similarity index 99%
rename from eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/SampleView.java
rename to eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLFramesView.java
index 552fc7c..3518c5b 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/SampleView.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLFramesView.java
@@ -43,7 +43,6 @@ import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
@@ -61,7 +60,6 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.Scale;
 import org.eclipse.swt.widgets.ScrollBar;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Slider;
 import org.eclipse.swt.widgets.Spinner;
 import org.eclipse.swt.widgets.TabFolder;
 import org.eclipse.swt.widgets.TabItem;
@@ -74,7 +72,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.nio.ByteOrder;
 
-public class SampleView extends ViewPart implements Runnable {
+public class GLFramesView extends ViewPart implements Runnable {
     public static final ByteOrder TARGET_BYTE_ORDER = ByteOrder.LITTLE_ENDIAN;
 
     private boolean mRunning = false;
@@ -346,7 +344,7 @@ public class SampleView extends ViewPart implements Runnable {
         menuMgr.setRemoveAllWhenShown(true);
         menuMgr.addMenuListener(new IMenuListener() {
             public void menuAboutToShow(IMenuManager manager) {
-                SampleView.this.fillContextMenu(manager);
+                GLFramesView.this.fillContextMenu(manager);
             }
         });
         Menu menu = menuMgr.createContextMenu(mViewer.getControl());

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java
index 73783d5..3418a91 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java
@@ -156,7 +156,7 @@ public class GLServerTexture implements Cloneable {
                 }
             case glDeleteTextures: {
                 final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
-                names.order(SampleView.TARGET_BYTE_ORDER);
+                names.order(GLFramesView.TARGET_BYTE_ORDER);
                 for (int i = 0; i < msg.getArg0(); i++) {
                     final int name = names.getInt();
                     if (tex2D != null && tex2D.name == name)

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java
index 4f89a85..bff0359 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java
@@ -39,7 +39,7 @@ class GLBuffer implements Cloneable {
             GLBuffer copy = (GLBuffer) super.clone();
             if (data != null) {
                 copy.data = ByteBuffer.allocate(data.capacity());
-                copy.data.order(SampleView.TARGET_BYTE_ORDER);
+                copy.data.order(GLFramesView.TARGET_BYTE_ORDER);
                 data.position(0);
                 copy.data.put(data);
             }
@@ -214,11 +214,11 @@ public class GLServerVertex implements Cloneable {
         if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_ARRAY_BUFFER) {
             attribBuffer.usage = GLEnum.valueOf(msg.getArg3());
             attribBuffer.data = msg.getData().asReadOnlyByteBuffer();
-            attribBuffer.data.order(SampleView.TARGET_BYTE_ORDER);
+            attribBuffer.data.order(GLFramesView.TARGET_BYTE_ORDER);
         } else if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_ELEMENT_ARRAY_BUFFER) {
             indexBuffer.usage = GLEnum.valueOf(msg.getArg3());
             indexBuffer.data = msg.getData().asReadOnlyByteBuffer();
-            indexBuffer.data.order(SampleView.TARGET_BYTE_ORDER);
+            indexBuffer.data.order(GLFramesView.TARGET_BYTE_ORDER);
         } else
             assert false;
     }
@@ -229,7 +229,7 @@ public class GLServerVertex implements Cloneable {
         if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_ARRAY_BUFFER) {
             if (attribBuffer.data.isReadOnly()) {
                 ByteBuffer buffer = ByteBuffer.allocate(attribBuffer.data.capacity());
-                buffer.order(SampleView.TARGET_BYTE_ORDER);
+                buffer.order(GLFramesView.TARGET_BYTE_ORDER);
                 buffer.put(attribBuffer.data);
                 attribBuffer.data = buffer;
             }
@@ -238,7 +238,7 @@ public class GLServerVertex implements Cloneable {
         } else if (GLEnum.valueOf(msg.getArg0()) == GLEnum.GL_ELEMENT_ARRAY_BUFFER) {
             if (indexBuffer.data.isReadOnly()) {
                 ByteBuffer buffer = ByteBuffer.allocate(indexBuffer.data.capacity());
-                buffer.order(SampleView.TARGET_BYTE_ORDER);
+                buffer.order(GLFramesView.TARGET_BYTE_ORDER);
                 buffer.put(indexBuffer.data);
                 indexBuffer.data = buffer;
             }
@@ -252,7 +252,7 @@ public class GLServerVertex implements Cloneable {
     public void glDeleteBuffers(Message msg) {
         final int n = msg.getArg0();
         final ByteBuffer names = msg.getData().asReadOnlyByteBuffer();
-        names.order(SampleView.TARGET_BYTE_ORDER);
+        names.order(GLFramesView.TARGET_BYTE_ORDER);
         for (int i = 0; i < n; i++) {
             final int name = names.getInt();
             final GLBuffer buffer = buffers.get(name);
@@ -381,7 +381,7 @@ public class GLServerVertex implements Cloneable {
         if (msg.hasData()) // server sends user pointer attribs
         {
             arrays = msg.getData().asReadOnlyByteBuffer();
-            arrays.order(SampleView.TARGET_BYTE_ORDER);
+            arrays.order(GLFramesView.TARGET_BYTE_ORDER);
         }
         for (int i = 0; i < count; i++)
             fetch(maxAttrib, first + i, i, arrays, msgData.attribs);
@@ -407,7 +407,7 @@ public class GLServerVertex implements Cloneable {
         if (msg.hasData()) // server sends user pointer attribs
         {
             arrays = msg.getData().asReadOnlyByteBuffer();
-            arrays.order(SampleView.TARGET_BYTE_ORDER);
+            arrays.order(GLFramesView.TARGET_BYTE_ORDER);
         }
         if (null == indexBuffer)
             index = arrays; // server also interleaves user pointer indices
@@ -440,7 +440,7 @@ public class GLServerVertex implements Cloneable {
     public void glGenBuffers(Message msg) {
         final int n = msg.getArg0();
         final ByteBuffer buffer = msg.getData().asReadOnlyByteBuffer();
-        buffer.order(SampleView.TARGET_BYTE_ORDER);
+        buffer.order(GLFramesView.TARGET_BYTE_ORDER);
         for (int i = 0; i < n; i++) {
             final int name = buffer.getInt();
             final int index = buffers.indexOfKey(name);
@@ -475,7 +475,7 @@ public class GLServerVertex implements Cloneable {
     // void glVertexAttrib1fv(GLuint indx, const GLfloat* values)
     public void glVertexAttrib1fv(Message msg) {
         final ByteBuffer values = msg.getData().asReadOnlyByteBuffer();
-        values.order(SampleView.TARGET_BYTE_ORDER);
+        values.order(GLFramesView.TARGET_BYTE_ORDER);
         glVertexAttrib4f(msg.getArg0(),
                 Float.intBitsToFloat(values.getInt()),
                 0, 0, 1);
@@ -490,7 +490,7 @@ public class GLServerVertex implements Cloneable {
     // void glVertexAttrib2fv(GLuint indx, const GLfloat* values)
     public void glVertexAttrib2fv(Message msg) {
         final ByteBuffer values = msg.getData().asReadOnlyByteBuffer();
-        values.order(SampleView.TARGET_BYTE_ORDER);
+        values.order(GLFramesView.TARGET_BYTE_ORDER);
         glVertexAttrib4f(msg.getArg0(),
                 Float.intBitsToFloat(values.getInt()),
                 Float.intBitsToFloat(values.getInt()), 0, 1);
@@ -506,7 +506,7 @@ public class GLServerVertex implements Cloneable {
     // void glVertexAttrib3fv(GLuint indx, const GLfloat* values)
     public void glVertexAttrib3fv(Message msg) {
         final ByteBuffer values = msg.getData().asReadOnlyByteBuffer();
-        values.order(SampleView.TARGET_BYTE_ORDER);
+        values.order(GLFramesView.TARGET_BYTE_ORDER);
         glVertexAttrib4f(msg.getArg0(),
                 Float.intBitsToFloat(values.getInt()),
                 Float.intBitsToFloat(values.getInt()),
@@ -532,7 +532,7 @@ public class GLServerVertex implements Cloneable {
     // void glVertexAttrib4fv(GLuint indx, const GLfloat* values)
     public void glVertexAttrib4fv(Message msg) {
         final ByteBuffer values = msg.getData().asReadOnlyByteBuffer();
-        values.order(SampleView.TARGET_BYTE_ORDER);
+        values.order(GLFramesView.TARGET_BYTE_ORDER);
         glVertexAttrib4f(msg.getArg0(),
                 Float.intBitsToFloat(values.getInt()),
                 Float.intBitsToFloat(values.getInt()),

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java
index 0914ac5..14c7a5a 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java
@@ -25,7 +25,7 @@ public class MessageFormatter {
     static String formatFloats(int count, final ByteBuffer data) {
         if (data.remaining() == 0)
             return "{}";
-        data.order(SampleView.TARGET_BYTE_ORDER);
+        data.order(GLFramesView.TARGET_BYTE_ORDER);
         String ret = "{";
         for (int i = 0; i < count; i++) {
             ret += Float.intBitsToFloat(data.getInt());
@@ -38,7 +38,7 @@ public class MessageFormatter {
     static String formatInts(int count, final ByteBuffer data) {
         if (data.remaining() == 0)
             return "{}";
-        data.order(SampleView.TARGET_BYTE_ORDER);
+        data.order(GLFramesView.TARGET_BYTE_ORDER);
         String ret = "{";
         for (int i = 0; i < count; i++) {
             ret += data.getInt();
@@ -51,7 +51,7 @@ public class MessageFormatter {
     static String formatUInts(int count, final ByteBuffer data) {
         if (data.remaining() == 0)
             return "{}";
-        data.order(SampleView.TARGET_BYTE_ORDER);
+        data.order(GLFramesView.TARGET_BYTE_ORDER);
         String ret = "{";
         for (int i = 0; i < count; i++) {
             long bits = data.getInt() & 0xffffffff;
@@ -65,7 +65,7 @@ public class MessageFormatter {
     static String formatMatrix(int columns, int count, final ByteBuffer data) {
         if (data.remaining() == 0)
             return "{}";
-        data.order(SampleView.TARGET_BYTE_ORDER);
+        data.order(GLFramesView.TARGET_BYTE_ORDER);
         String ret = "{";
         for (int i = 0; i < count; i++) {
             ret += Float.intBitsToFloat(data.getInt());

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java
index 2293a6b..a78503a 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java
@@ -50,7 +50,7 @@ public abstract class MessageParser {
 
     ByteString parseFloats(int count) {
         ByteBuffer buffer = ByteBuffer.allocate(count * 4);
-        buffer.order(SampleView.TARGET_BYTE_ORDER);
+        buffer.order(GLFramesView.TARGET_BYTE_ORDER);
         String [] arg = getList();
         for (int i = 0; i < count; i++)
             buffer.putFloat(Float.parseFloat(arg[i].trim()));
@@ -60,7 +60,7 @@ public abstract class MessageParser {
 
     ByteString parseInts(int count) {
         ByteBuffer buffer = ByteBuffer.allocate(count * 4);
-        buffer.order(SampleView.TARGET_BYTE_ORDER);
+        buffer.order(GLFramesView.TARGET_BYTE_ORDER);
         String [] arg = getList();
         for (int i = 0; i < count; i++)
             buffer.putInt(Integer.parseInt(arg[i].trim()));
@@ -70,7 +70,7 @@ public abstract class MessageParser {
 
     ByteString parseUInts(int count) {
         ByteBuffer buffer = ByteBuffer.allocate(count * 4);
-        buffer.order(SampleView.TARGET_BYTE_ORDER);
+        buffer.order(GLFramesView.TARGET_BYTE_ORDER);
         String [] arg = getList();
         for (int i = 0; i < count; i++)
             buffer.putInt((int)(Long.parseLong(arg[i].trim()) & 0xffffffff));

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java
index f260655..22196d9 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java
@@ -38,7 +38,7 @@ public class MessageProcessor {
      */
     public static byte[] lzfDecompressChunks(final ByteString data) {
         ByteBuffer in = data.asReadOnlyByteBuffer();
-        in.order(SampleView.TARGET_BYTE_ORDER);
+        in.order(GLFramesView.TARGET_BYTE_ORDER);
         ByteBuffer out = ByteBuffer.allocate(in.getInt());
         byte[] inChunk = new byte[0];
         byte[] outChunk = new byte[0];
@@ -69,7 +69,7 @@ public class MessageProcessor {
         byte[] chunk = new byte[256 * 1024]; // chunk size is arbitrary
         final ByteBuffer out = ByteBuffer.allocate(4 + (inSize + chunk.length - 1)
                 / chunk.length * (chunk.length + 4 * 2));
-        out.order(SampleView.TARGET_BYTE_ORDER);
+        out.order(GLFramesView.TARGET_BYTE_ORDER);
         out.putInt(inSize);
         for (int i = 0; i < inSize; i += chunk.length) {
             int chunkIn = chunk.length;

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java
index 6d32c4d..6f895b5 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java
@@ -44,9 +44,9 @@ public class MessageQueue implements Runnable {
     private final ProcessMessage[] processes;
     private ArrayList<Message> complete = new ArrayList<Message>(); // synchronized
     private ArrayList<Message> commands = new ArrayList<Message>(); // synchronized
-    private SampleView sampleView;
+    private GLFramesView sampleView;
 
-    public MessageQueue(SampleView sampleView, final ProcessMessage[] processes) {
+    public MessageQueue(GLFramesView sampleView, final ProcessMessage[] processes) {
         this.sampleView = sampleView;
         this.processes = processes;
     }

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java
index 8e21d4d..057ced6 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java
@@ -48,7 +48,7 @@ import java.util.ArrayList;
 
 public class ShaderEditor extends Composite implements SelectionListener, ExtendedModifyListener,
         ProcessMessage {
-    SampleView sampleView;
+    GLFramesView mGLFramesView;
 
     ToolBar toolbar;
     ToolItem uploadShader, restoreShader, currentPrograms;
@@ -59,9 +59,9 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
 
     ArrayList<GLShader> shadersToUpload = new ArrayList<GLShader>();
 
-    ShaderEditor(SampleView sampleView, Composite parent) {
+    ShaderEditor(GLFramesView view, Composite parent) {
         super(parent, 0);
-        this.sampleView = sampleView;
+        mGLFramesView = view;
 
         GridLayout gridLayout = new GridLayout();
         gridLayout.numColumns = 1;
@@ -104,8 +104,8 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
     public void updateUI() {
         list.removeAll();
         String progs = "Current Programs: ";
-        for (int j = 0; j < sampleView.debugContexts.size(); j++) {
-            final Context context = sampleView.debugContexts.valueAt(j).currentContext;
+        for (int j = 0; j < mGLFramesView.debugContexts.size(); j++) {
+            final Context context = mGLFramesView.debugContexts.valueAt(j).currentContext;
 
             if (context.serverShader.current != null) {
                 progs += context.serverShader.current.name + "(0x";
@@ -183,7 +183,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
                         return;
                 }
             } catch (IOException e) {
-                sampleView.showError(e);
+                mGLFramesView.showError(e);
             }
 
         // add the initial command, which when read by server will set
@@ -202,7 +202,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
             Message.Builder builder = getBuilder(contextId);
             MessageParserEx.instance.parse(builder,
                     String.format("glShaderSource(%d,1,\"%s\",0)", current.name, current.source));
-            sampleView.messageQueue.addCommand(builder.build());
+            mGLFramesView.messageQueue.addCommand(builder.build());
         }
     }
 
@@ -269,7 +269,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
             final String title = String.format("Shader %d in 0x%s failed to compile",
                     shader.name, Integer.toHexString(shader.context.context.contextId));
             final String message = rcv.getData().toStringUtf8();
-            sampleView.getSite().getShell().getDisplay().syncExec(new Runnable() {
+            mGLFramesView.getSite().getShell().getDisplay().syncExec(new Runnable() {
                 public void run()
                 {
                     MessageDialog.openWarning(getShell(), title, message);
@@ -290,7 +290,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
                 final String title = String.format("Program %d in 0x%s failed to link",
                         program.name, Integer.toHexString(program.context.context.contextId));
                 final String message = rcv.getData().toStringUtf8();
-                sampleView.getSite().getShell().getDisplay().syncExec(new Runnable() {
+                mGLFramesView.getSite().getShell().getDisplay().syncExec(new Runnable() {
                     public void run()
                     {
                         MessageDialog.openWarning(getShell(), title, message);
@@ -341,7 +341,7 @@ public class ShaderEditor extends Composite implements SelectionListener, Extend
         String[] details = list.getSelection()[0].split("\\s+");
         final int contextId = Integer.parseInt(details[0], 16);
         int name = Integer.parseInt(details[2]);
-        current = sampleView.debugContexts.get(contextId).currentContext.serverShader.shaders
+        current = mGLFramesView.debugContexts.get(contextId).currentContext.serverShader.shaders
                 .get(name);
         styledText.setText(current.source);
     }