23 files changed, 120 insertions, 117 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
index 87960ad..2476c8e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: GLESv2DebuggerClient
 Bundle-SymbolicName: GLESv2DebuggerClient; singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: com.android.glesv2debugger.Activator
+Bundle-Activator: com.android.ide.eclipse.gldebugger.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.junit
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.gldebugger/plugin.xml
index f1512a5..7f384b6 100644
--- 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"

             icon="icons/sample.gif"

             category="org.eclipse.debug.ui"

-            class="com.android.glesv2debugger.SampleView"

+            class="com.android.ide.eclipse.gldebugger.SampleView"

             id="glesv2debuggerclient.views.SampleView">

       </view>

    </extension>

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/META-INF/MANIFEST.MF
deleted file mode 100644
index 212b27a..0000000
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0

-Created-By: 1.6.0_22 (Sun Microsystems Inc.)

-

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/Activator.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Activator.java
index 6083c0f..a809e74 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/Activator.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Activator.java
@@ -14,7 +14,7 @@
  ** limitations under the License.

  */

 

-package com.android.glesv2debugger;

+package com.android.ide.eclipse.gldebugger;

 

 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/BreakpointOption.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java
index d55dfb8..4d5ae54 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/BreakpointOption.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/BreakpointOption.java
@@ -14,12 +14,12 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Prop;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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.Prop;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type;
 
 import org.eclipse.jface.dialogs.InputDialog;
 import org.eclipse.jface.window.Window;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/CodeGen.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java
index 81fdc8c..f6d8476 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/CodeGen.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/CodeGen.java
@@ -14,10 +14,10 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
 import com.android.sdklib.util.SparseIntArray;
 
 import org.eclipse.core.runtime.IProgressMonitor;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/Context.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java
index d27df68..2d58300 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/Context.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/Context.java
@@ -14,12 +14,12 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.DataType;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Prop;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop;
 import com.android.sdklib.util.SparseArray;
 import com.android.sdklib.util.SparseIntArray;
 import com.google.protobuf.ByteString;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/DebuggerMessage.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java
index 94133f5..c9d09b9 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/DebuggerMessage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/DebuggerMessage.java
@@ -1,7 +1,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: debugger_message.proto
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 public final class DebuggerMessage {
   private DebuggerMessage() {}
@@ -581,16 +581,16 @@ public final class DebuggerMessage {
     // required .com.android.glesv2debugger.Message.Function function = 2 [default = NEG];
     public static final int FUNCTION_FIELD_NUMBER = 2;
     private boolean hasFunction;
-    private com.android.glesv2debugger.DebuggerMessage.Message.Function function_;
+    private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function function_;
     public boolean hasFunction() { return hasFunction; }
-    public com.android.glesv2debugger.DebuggerMessage.Message.Function getFunction() { return function_; }
+    public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function getFunction() { return function_; }
     
     // required .com.android.glesv2debugger.Message.Type type = 3;
     public static final int TYPE_FIELD_NUMBER = 3;
     private boolean hasType;
-    private com.android.glesv2debugger.DebuggerMessage.Message.Type type_;
+    private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type type_;
     public boolean hasType() { return hasType; }
-    public com.android.glesv2debugger.DebuggerMessage.Message.Type getType() { return type_; }
+    public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type getType() { return type_; }
     
     // required bool expect_response = 4;
     public static final int EXPECT_RESPONSE_FIELD_NUMBER = 4;
@@ -679,9 +679,9 @@ public final class DebuggerMessage {
     // optional .com.android.glesv2debugger.Message.DataType data_type = 23;
     public static final int DATA_TYPE_FIELD_NUMBER = 23;
     private boolean hasDataType;
-    private com.android.glesv2debugger.DebuggerMessage.Message.DataType dataType_;
+    private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType dataType_;
     public boolean hasDataType() { return hasDataType; }
-    public com.android.glesv2debugger.DebuggerMessage.Message.DataType getDataType() { return dataType_; }
+    public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType getDataType() { return dataType_; }
     
     // optional int32 pixel_format = 24;
     public static final int PIXEL_FORMAT_FIELD_NUMBER = 24;
@@ -721,9 +721,9 @@ public final class DebuggerMessage {
     // optional .com.android.glesv2debugger.Message.Prop prop = 21;
     public static final int PROP_FIELD_NUMBER = 21;
     private boolean hasProp;
-    private com.android.glesv2debugger.DebuggerMessage.Message.Prop prop_;
+    private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop prop_;
     public boolean hasProp() { return hasProp; }
-    public com.android.glesv2debugger.DebuggerMessage.Message.Prop getProp() { return prop_; }
+    public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop getProp() { return prop_; }
     
     // optional float clock = 22;
     public static final int CLOCK_FIELD_NUMBER = 22;
@@ -733,10 +733,10 @@ public final class DebuggerMessage {
     public float getClock() { return clock_; }
     
     private void initFields() {
-      function_ = com.android.glesv2debugger.DebuggerMessage.Message.Function.NEG;
-      type_ = com.android.glesv2debugger.DebuggerMessage.Message.Type.BeforeCall;
-      dataType_ = com.android.glesv2debugger.DebuggerMessage.Message.DataType.ReferencedImage;
-      prop_ = com.android.glesv2debugger.DebuggerMessage.Message.Prop.CaptureDraw;
+      function_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function.NEG;
+      type_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type.BeforeCall;
+      dataType_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType.ReferencedImage;
+      prop_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop.CaptureDraw;
     }
     public final boolean isInitialized() {
       if (!hasContextId) return false;
@@ -922,41 +922,41 @@ public final class DebuggerMessage {
       return size;
     }
     
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         com.google.protobuf.ByteString data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         com.google.protobuf.ByteString data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(byte[] data)
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(byte[] data)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data).buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         byte[] data,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       return newBuilder().mergeFrom(data, extensionRegistry)
                .buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(java.io.InputStream input)
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(java.io.InputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input, extensionRegistry)
                .buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseDelimitedFrom(java.io.InputStream input)
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseDelimitedFrom(java.io.InputStream input)
         throws java.io.IOException {
       Builder builder = newBuilder();
       if (builder.mergeDelimitedFrom(input)) {
@@ -965,7 +965,7 @@ public final class DebuggerMessage {
         return null;
       }
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseDelimitedFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseDelimitedFrom(
         java.io.InputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -976,12 +976,12 @@ public final class DebuggerMessage {
         return null;
       }
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         com.google.protobuf.CodedInputStream input)
         throws java.io.IOException {
       return newBuilder().mergeFrom(input).buildParsed();
     }
-    public static com.android.glesv2debugger.DebuggerMessage.Message parseFrom(
+    public static com.android.ide.eclipse.gldebugger.DebuggerMessage.Message parseFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws java.io.IOException {
@@ -991,26 +991,26 @@ public final class DebuggerMessage {
     
     public static Builder newBuilder() { return Builder.create(); }
     public Builder newBuilderForType() { return newBuilder(); }
-    public static Builder newBuilder(com.android.glesv2debugger.DebuggerMessage.Message prototype) {
+    public static Builder newBuilder(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message prototype) {
       return newBuilder().mergeFrom(prototype);
     }
     public Builder toBuilder() { return newBuilder(this); }
     
     public static final class Builder extends
         com.google.protobuf.GeneratedMessageLite.Builder<
-          com.android.glesv2debugger.DebuggerMessage.Message, Builder> {
-      private com.android.glesv2debugger.DebuggerMessage.Message result;
+          com.android.ide.eclipse.gldebugger.DebuggerMessage.Message, Builder> {
+      private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message result;
       
       // Construct using com.android.glesv2debugger.DebuggerMessage.Message.newBuilder()
       private Builder() {}
       
       private static Builder create() {
         Builder builder = new Builder();
-        builder.result = new com.android.glesv2debugger.DebuggerMessage.Message();
+        builder.result = new com.android.ide.eclipse.gldebugger.DebuggerMessage.Message();
         return builder;
       }
       
-      protected com.android.glesv2debugger.DebuggerMessage.Message internalGetResult() {
+      protected com.android.ide.eclipse.gldebugger.DebuggerMessage.Message internalGetResult() {
         return result;
       }
       
@@ -1019,7 +1019,7 @@ public final class DebuggerMessage {
           throw new IllegalStateException(
             "Cannot call clear() after build().");
         }
-        result = new com.android.glesv2debugger.DebuggerMessage.Message();
+        result = new com.android.ide.eclipse.gldebugger.DebuggerMessage.Message();
         return this;
       }
       
@@ -1027,21 +1027,21 @@ public final class DebuggerMessage {
         return create().mergeFrom(result);
       }
       
-      public com.android.glesv2debugger.DebuggerMessage.Message getDefaultInstanceForType() {
-        return com.android.glesv2debugger.DebuggerMessage.Message.getDefaultInstance();
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message getDefaultInstanceForType() {
+        return com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance();
       }
       
       public boolean isInitialized() {
         return result.isInitialized();
       }
-      public com.android.glesv2debugger.DebuggerMessage.Message build() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message build() {
         if (result != null && !isInitialized()) {
           throw newUninitializedMessageException(result);
         }
         return buildPartial();
       }
       
-      private com.android.glesv2debugger.DebuggerMessage.Message buildParsed()
+      private com.android.ide.eclipse.gldebugger.DebuggerMessage.Message buildParsed()
           throws com.google.protobuf.InvalidProtocolBufferException {
         if (!isInitialized()) {
           throw newUninitializedMessageException(
@@ -1050,18 +1050,18 @@ public final class DebuggerMessage {
         return buildPartial();
       }
       
-      public com.android.glesv2debugger.DebuggerMessage.Message buildPartial() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message buildPartial() {
         if (result == null) {
           throw new IllegalStateException(
             "build() has already been called on this Builder.");
         }
-        com.android.glesv2debugger.DebuggerMessage.Message returnMe = result;
+        com.android.ide.eclipse.gldebugger.DebuggerMessage.Message returnMe = result;
         result = null;
         return returnMe;
       }
       
-      public Builder mergeFrom(com.android.glesv2debugger.DebuggerMessage.Message other) {
-        if (other == com.android.glesv2debugger.DebuggerMessage.Message.getDefaultInstance()) return this;
+      public Builder mergeFrom(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message other) {
+        if (other == com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.getDefaultInstance()) return this;
         if (other.hasContextId()) {
           setContextId(other.getContextId());
         }
@@ -1155,7 +1155,7 @@ public final class DebuggerMessage {
             }
             case 16: {
               int rawValue = input.readEnum();
-              com.android.glesv2debugger.DebuggerMessage.Message.Function value = com.android.glesv2debugger.DebuggerMessage.Message.Function.valueOf(rawValue);
+              com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function value = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function.valueOf(rawValue);
               if (value != null) {
                 setFunction(value);
               }
@@ -1163,7 +1163,7 @@ public final class DebuggerMessage {
             }
             case 24: {
               int rawValue = input.readEnum();
-              com.android.glesv2debugger.DebuggerMessage.Message.Type value = com.android.glesv2debugger.DebuggerMessage.Message.Type.valueOf(rawValue);
+              com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type value = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type.valueOf(rawValue);
               if (value != null) {
                 setType(value);
               }
@@ -1223,7 +1223,7 @@ public final class DebuggerMessage {
             }
             case 168: {
               int rawValue = input.readEnum();
-              com.android.glesv2debugger.DebuggerMessage.Message.Prop value = com.android.glesv2debugger.DebuggerMessage.Message.Prop.valueOf(rawValue);
+              com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop value = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop.valueOf(rawValue);
               if (value != null) {
                 setProp(value);
               }
@@ -1235,7 +1235,7 @@ public final class DebuggerMessage {
             }
             case 184: {
               int rawValue = input.readEnum();
-              com.android.glesv2debugger.DebuggerMessage.Message.DataType value = com.android.glesv2debugger.DebuggerMessage.Message.DataType.valueOf(rawValue);
+              com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType value = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType.valueOf(rawValue);
               if (value != null) {
                 setDataType(value);
               }
@@ -1284,10 +1284,10 @@ public final class DebuggerMessage {
       public boolean hasFunction() {
         return result.hasFunction();
       }
-      public com.android.glesv2debugger.DebuggerMessage.Message.Function getFunction() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function getFunction() {
         return result.getFunction();
       }
-      public Builder setFunction(com.android.glesv2debugger.DebuggerMessage.Message.Function value) {
+      public Builder setFunction(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1297,7 +1297,7 @@ public final class DebuggerMessage {
       }
       public Builder clearFunction() {
         result.hasFunction = false;
-        result.function_ = com.android.glesv2debugger.DebuggerMessage.Message.Function.NEG;
+        result.function_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function.NEG;
         return this;
       }
       
@@ -1305,10 +1305,10 @@ public final class DebuggerMessage {
       public boolean hasType() {
         return result.hasType();
       }
-      public com.android.glesv2debugger.DebuggerMessage.Message.Type getType() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type getType() {
         return result.getType();
       }
-      public Builder setType(com.android.glesv2debugger.DebuggerMessage.Message.Type value) {
+      public Builder setType(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1318,7 +1318,7 @@ public final class DebuggerMessage {
       }
       public Builder clearType() {
         result.hasType = false;
-        result.type_ = com.android.glesv2debugger.DebuggerMessage.Message.Type.BeforeCall;
+        result.type_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type.BeforeCall;
         return this;
       }
       
@@ -1545,10 +1545,10 @@ public final class DebuggerMessage {
       public boolean hasDataType() {
         return result.hasDataType();
       }
-      public com.android.glesv2debugger.DebuggerMessage.Message.DataType getDataType() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType getDataType() {
         return result.getDataType();
       }
-      public Builder setDataType(com.android.glesv2debugger.DebuggerMessage.Message.DataType value) {
+      public Builder setDataType(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1558,7 +1558,7 @@ public final class DebuggerMessage {
       }
       public Builder clearDataType() {
         result.hasDataType = false;
-        result.dataType_ = com.android.glesv2debugger.DebuggerMessage.Message.DataType.ReferencedImage;
+        result.dataType_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.DataType.ReferencedImage;
         return this;
       }
       
@@ -1656,10 +1656,10 @@ public final class DebuggerMessage {
       public boolean hasProp() {
         return result.hasProp();
       }
-      public com.android.glesv2debugger.DebuggerMessage.Message.Prop getProp() {
+      public com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop getProp() {
         return result.getProp();
       }
-      public Builder setProp(com.android.glesv2debugger.DebuggerMessage.Message.Prop value) {
+      public Builder setProp(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop value) {
         if (value == null) {
           throw new NullPointerException();
         }
@@ -1669,7 +1669,7 @@ public final class DebuggerMessage {
       }
       public Builder clearProp() {
         result.hasProp = false;
-        result.prop_ = com.android.glesv2debugger.DebuggerMessage.Message.Prop.CaptureDraw;
+        result.prop_ = com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Prop.CaptureDraw;
         return this;
       }
       
@@ -1696,7 +1696,7 @@ public final class DebuggerMessage {
     
     static {
       defaultInstance = new Message(true);
-      com.android.glesv2debugger.DebuggerMessage.internalForceInit();
+      com.android.ide.eclipse.gldebugger.DebuggerMessage.internalForceInit();
       defaultInstance.initFields();
     }
     
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLEnum.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLEnum.java
index 898c6e9..3d53798 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLEnum.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLEnum.java
@@ -16,7 +16,7 @@
 
 // auto generated by generate_GLEnum_java.py"
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 public enum GLEnum {
     GL_POINTS(0x0000),
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerShader.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerShader.java
index f13c465..a88613c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerShader.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerShader.java
@@ -14,9 +14,9 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
 import com.android.sdklib.util.SparseArray;
 
 import java.util.ArrayList;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerState.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerState.java
index addf277..f722f50 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerState.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerState.java
@@ -14,10 +14,10 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
 import com.android.sdklib.util.SparseArray;
 import com.android.sdklib.util.SparseIntArray;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerTexture.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java
index 27676dd..bb18e7a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerTexture.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerTexture.java
@@ -14,9 +14,9 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
 import com.android.sdklib.util.SparseArray;
 
 import java.nio.ByteBuffer;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerVertex.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java
index 5f9d513..aeac839 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/GLServerVertex.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/GLServerVertex.java
@@ -14,9 +14,9 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
 import com.android.sdklib.util.SparseArray;
 
 import java.nio.ByteBuffer;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageData.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageData.java
index 321c538..c2f0038 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageData.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageData.java
@@ -14,11 +14,11 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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;
 
 import org.eclipse.swt.graphics.Device;
 import org.eclipse.swt.graphics.Image;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageFormatter.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java
index b9fa681..a26f791 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageFormatter.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageFormatter.java
@@ -16,7 +16,7 @@
 
 // auto generated by generate_MessageFormatter_java.py"
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 import java.nio.ByteBuffer;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageParser.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java
index 8536728..53b0202 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageParser.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParser.java
@@ -17,10 +17,10 @@
 // auto generated by generate_MessageParser_java.py,
 //  which also prints skeleton code for MessageParserEx.java
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
 import com.google.protobuf.ByteString;
 
 import java.nio.ByteBuffer;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageParserEx.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParserEx.java
index 5099146..6fd8cf6 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageParserEx.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageParserEx.java
@@ -16,9 +16,9 @@
 
 // skeleton from stdout of generate_MessageParser_java.py
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message;
 
 public class MessageParserEx extends MessageParser {
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageProcessor.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java
index bdd53d1..55297d8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageProcessor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageProcessor.java
@@ -14,7 +14,7 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 import com.google.protobuf.ByteString;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageQueue.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java
index 7378361..6d32c4d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/MessageQueue.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/MessageQueue.java
@@ -14,11 +14,11 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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;
 import com.android.sdklib.util.SparseArray;
 
 import java.io.DataInputStream;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/SampleView.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/SampleView.java
index 32ca32b..507b15c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/SampleView.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/SampleView.java
@@ -14,12 +14,12 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Prop;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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.Prop;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type;
 import com.android.sdklib.util.SparseArray;
 
 import org.eclipse.jface.action.Action;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/ShaderEditor.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java
index a358ba0..8e21d4d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/glesv2debugger/ShaderEditor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/src/com/android/ide/eclipse/gldebugger/ShaderEditor.java
@@ -14,11 +14,11 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/glesv2debugger/MessageParserExTest.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/ide/eclipse/gldebugger/MessageParserExTest.java
index d2a9a7e..3ff3759 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/glesv2debugger/MessageParserExTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/ide/eclipse/gldebugger/MessageParserExTest.java
@@ -14,14 +14,18 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+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.DebuggerMessage.Message;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Function;
+import com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Type;
 import com.google.protobuf.ByteString;
 
 import org.junit.Before;
@@ -60,7 +64,7 @@ public class MessageParserExTest {
 
     /**
      * Test method for
-     * {@link com.android.glesv2debugger.MessageParserEx#parse_glShaderSource(com.android.glesv2debugger.DebuggerMessage.Message.Builder)}
+     * {@link com.android.ide.eclipse.gldebugger.MessageParserEx#parse_glShaderSource(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message.Builder)}
      * .
      */
     @Test
diff --git a/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/glesv2debugger/MessageQueueTest.java b/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/ide/eclipse/gldebugger/MessageQueueTest.java
index 5f8e93d..360ebfc 100644
--- a/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/glesv2debugger/MessageQueueTest.java
+++ b/eclipse/plugins/com.android.ide.eclipse.gldebugger/test/com/android/ide/eclipse/gldebugger/MessageQueueTest.java
@@ -14,15 +14,17 @@
  ** limitations under the License.
  */
 
-package com.android.glesv2debugger;
+package com.android.ide.eclipse.gldebugger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import com.android.glesv2debugger.DebuggerMessage.Message;
-import com.android.glesv2debugger.DebuggerMessage.Message.Function;
-import com.android.glesv2debugger.DebuggerMessage.Message.Type;
+import com.android.ide.eclipse.gldebugger.MessageQueue;
+import com.android.ide.eclipse.gldebugger.ProcessMessage;
+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;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -48,7 +50,7 @@ public class MessageQueueTest {
 
     /**
      * Test method for
-     * {@link com.android.glesv2debugger.MessageQueue#defaultProcessMessage(com.android.glesv2debugger.DebuggerMessage.Message, boolean, boolean)}
+     * {@link com.android.ide.eclipse.gldebugger.MessageQueue#defaultProcessMessage(com.android.ide.eclipse.gldebugger.DebuggerMessage.Message, boolean, boolean)}
      * .
      * 
      * @throws IOException