Fixed ambiguity in greendroid with getActionBar from Honeycomb-Activity

greendroid/GreenDroid/src/greendroid/app/ActionBarActivity.java

@@ -15,7 +15,7 @@
  */
 package greendroid.app;
 
-import greendroid.widget.ActionBar;
+import greendroid.widget.GDActionBar;
 import greendroid.widget.ActionBarItem;
 import android.app.Activity;
 import android.app.Application;
@@ -23,7 +23,7 @@ import android.view.View;
 import android.widget.FrameLayout;
 
 /**
- * Defines all methods related to Activities embedding an {@link ActionBar}
+ * Defines all methods related to Activities embedding an {@link GDActionBar}
  * 
  * @author Cyril Mottier
  */
@@ -63,14 +63,14 @@ public interface ActionBarActivity {
     /**
      * Returns the content view. Please note the content view is not the entire
      * view but a {@link FrameLayout} that contains everything but the
-     * {@link ActionBar}.
+     * {@link GDActionBar}.
      * 
      * @return The content view
      */
     FrameLayout getContentView();
 
     /**
-     * Returns the {@link ActionBar}. Listening to {@link ActionBar} events
+     * Returns the {@link GDActionBar}. Listening to {@link GDActionBar} events
      * should be done via the
      * {@link ActionBarActivity#onHandleActionBarItemClick(ActionBarItem, int)}
      * method. Most of the time, this method don't need to be used directly.
@@ -78,9 +78,9 @@ public interface ActionBarActivity {
      * @see {@link ActionBarActivity#onHandleActionBarItemClick(ActionBarItem, int)}
      * @see {@link ActionBarActivity#addActionBarItem(ActionBarItem)}
      * @see {@link ActionBarActivity#addActionBarItem(greendroid.widget.ActionBarItem.Type)}
-     * @return The {@link ActionBar} currently displayed on screen
+     * @return The {@link GDActionBar} currently displayed on screen
      */
-    ActionBar getActionBar();
+    GDActionBar getGDActionBar();
 
     /**
      * A simple utility method that casts the {@link Application} returned by
@@ -91,33 +91,33 @@ public interface ActionBarActivity {
     GDApplication getGDApplication();
 
     /**
-     * Add a new item to the {@link ActionBar}.
+     * Add a new item to the {@link GDActionBar}.
      * 
-     * @param item The item to add to the {@link ActionBar}
+     * @param item The item to add to the {@link GDActionBar}
      */
     ActionBarItem addActionBarItem(ActionBarItem item);
 
     /**
-     * Add a new item to the {@link ActionBar}.
+     * Add a new item to the {@link GDActionBar}.
      * 
-     * @param item The item to add to the {@link ActionBar}
+     * @param item The item to add to the {@link GDActionBar}
-     * @param itemId Unique item ID. Use {@link ActionBar#NONE} if you do not
+     * @param itemId Unique item ID. Use {@link GDActionBar#NONE} if you do not
      *            need a unique ID.
      */
     ActionBarItem addActionBarItem(ActionBarItem item, int itemId);
 
     /**
-     * Adds a new item of type <em>type</em> to the {@link ActionBar}.
+     * Adds a new item of type <em>type</em> to the {@link GDActionBar}.
      * 
-     * @param actionBarItemType The item to add to the {@link ActionBar}
+     * @param actionBarItemType The item to add to the {@link GDActionBar}
      */
     ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType);
 
     /**
-     * Adds a new item of type <em>type</em> to the {@link ActionBar}.
+     * Adds a new item of type <em>type</em> to the {@link GDActionBar}.
      * 
-     * @param actionBarItemType The item to add to the {@link ActionBar}
+     * @param actionBarItemType The item to add to the {@link GDActionBar}
-     * @param itemId Unique item ID. Use {@link ActionBar#NONE} if you do not
+     * @param itemId Unique item ID. Use {@link GDActionBar#NONE} if you do not
      *            need a unique ID.
      */
     ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType, int itemId);

greendroid/GreenDroid/src/greendroid/app/GDActivity.java

@@ -18,11 +18,11 @@ package greendroid.app;
 import com.cyrilmottier.android.greendroid.R;
 
 import greendroid.util.Config;
-import greendroid.widget.ActionBar;
+import greendroid.widget.GDActionBar;
 import greendroid.widget.ActionBarHost;
 import greendroid.widget.ActionBarItem;
-import greendroid.widget.ActionBar.OnActionBarListener;
+import greendroid.widget.GDActionBar.OnActionBarListener;
-import greendroid.widget.ActionBar.Type;
+import greendroid.widget.GDActionBar.Type;
 import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -37,7 +37,7 @@ import android.widget.FrameLayout;
 /**
  * <p>
  * An {@link GDActivity} is a regular Activity that always hosts an
- * {@link ActionBar}. It is extremely simple to use as you have nothing
+ * {@link GDActionBar}. It is extremely simple to use as you have nothing
  * particular to do. Indeed, the ActionBar is automatically added to your own
  * layout when using the {@link #getContentView()} method. You can also use one
  * of the setActionBarContentView utility methods. As a result, a basic
@@ -102,7 +102,7 @@ public class GDActivity extends Activity implements ActionBarActivity {
         mDefaultConstructorUsed = true;
     }
 
-    public GDActivity(ActionBar.Type actionBarType) {
+    public GDActivity(GDActionBar.Type actionBarType) {
         super();
         mActionBarType = actionBarType;
     }
@@ -133,7 +133,7 @@ public class GDActivity extends Activity implements ActionBarActivity {
         ensureLayout();
     }
 
-    public ActionBar.Type getActionBarType() {
+    public GDActionBar.Type getActionBarType() {
         return mActionBarType;
     }
 
@@ -207,12 +207,12 @@ public class GDActivity extends Activity implements ActionBarActivity {
         }
 
         final int visibility = intent.getIntExtra(ActionBarActivity.GD_ACTION_BAR_VISIBILITY, View.VISIBLE);
-        getActionBar().setVisibility(visibility);
+        getGDActionBar().setVisibility(visibility);
     }
 
     @Override
     public void setTitle(CharSequence title) {
-        getActionBar().setTitle(title);
+        getGDActionBar().setTitle(title);
     }
 
     @Override
@@ -220,25 +220,25 @@ public class GDActivity extends Activity implements ActionBarActivity {
         setTitle(getString(titleId));
     }
 
-    public ActionBar getActionBar() {
+    public GDActionBar getGDActionBar() {
         ensureLayout();
         return mActionBarHost.getActionBar();
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem item) {
-        return getActionBar().addItem(item);
+        return getGDActionBar().addItem(item);
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem item, int itemId) {
-        return getActionBar().addItem(item, itemId);
+        return getGDActionBar().addItem(item, itemId);
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType) {
-        return getActionBar().addItem(actionBarItemType);
+        return getGDActionBar().addItem(actionBarItemType);
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType, int itemId) {
-        return getActionBar().addItem(actionBarItemType, itemId);
+        return getGDActionBar().addItem(actionBarItemType, itemId);
     }
 
     public FrameLayout getContentView() {
@@ -291,7 +291,7 @@ public class GDActivity extends Activity implements ActionBarActivity {
                 }
 
             } else {
-                if (!onHandleActionBarItemClick(getActionBar().getItem(position), position)) {
+                if (!onHandleActionBarItemClick(getGDActionBar().getItem(position), position)) {
                     if (Config.GD_WARNING_LOGS_ENABLED) {
                         Log.w(LOG_TAG, "Click on item at position " + position + " dropped down to the floor");
                     }

greendroid/GreenDroid/src/greendroid/app/GDListActivity.java

@@ -16,7 +16,7 @@
 package greendroid.app;
 
 import greendroid.util.Config;
-import greendroid.widget.ActionBar;
+import greendroid.widget.GDActionBar;
 import android.app.ListActivity;
 import android.os.Handler;
 import android.util.Log;
@@ -54,7 +54,7 @@ public class GDListActivity extends GDActivity {
         super();
     }
 
-    public GDListActivity(ActionBar.Type actionBarType) {
+    public GDListActivity(GDActionBar.Type actionBarType) {
         super(actionBarType);
     }
 

greendroid/GreenDroid/src/greendroid/app/GDTabActivity.java

@@ -16,8 +16,8 @@
 package greendroid.app;
 
 import greendroid.util.Config;
-import greendroid.widget.ActionBar;
+import greendroid.widget.GDActionBar;
-import greendroid.widget.ActionBar.OnActionBarListener;
+import greendroid.widget.GDActionBar.OnActionBarListener;
 import greendroid.widget.ActionBarHost;
 import greendroid.widget.ActionBarItem;
 import android.app.TabActivity;
@@ -102,7 +102,7 @@ public class GDTabActivity extends TabActivity implements ActionBarActivity {
         }
         
         final int visibility = intent.getIntExtra(ActionBarActivity.GD_ACTION_BAR_VISIBILITY, View.VISIBLE);
-        getActionBar().setVisibility(visibility);
+        getGDActionBar().setVisibility(visibility);
     }
 
     // @Override
@@ -112,7 +112,7 @@ public class GDTabActivity extends TabActivity implements ActionBarActivity {
 
     @Override
     public void setTitle(CharSequence title) {
-        getActionBar().setTitle(title);
+        getGDActionBar().setTitle(title);
     }
 
     @Override
@@ -120,24 +120,24 @@ public class GDTabActivity extends TabActivity implements ActionBarActivity {
         setTitle(getString(titleId));
     }
 
-    public ActionBar getActionBar() {
+    public GDActionBar getGDActionBar() {
         return mActionBarHost.getActionBar();
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem item) {
-        return getActionBar().addItem(item);
+        return getGDActionBar().addItem(item);
     }
     
     public ActionBarItem addActionBarItem(ActionBarItem item, int itemId) {
-        return getActionBar().addItem(item, itemId);
+        return getGDActionBar().addItem(item, itemId);
     }
 
     public ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType) {
-        return getActionBar().addItem(actionBarItemType);
+        return getGDActionBar().addItem(actionBarItemType);
     }
     
     public ActionBarItem addActionBarItem(ActionBarItem.Type actionBarItemType, int itemId) {
-        return getActionBar().addItem(actionBarItemType, itemId);
+        return getGDActionBar().addItem(actionBarItemType, itemId);
     }
 
     public FrameLayout getContentView() {
@@ -163,7 +163,7 @@ public class GDTabActivity extends TabActivity implements ActionBarActivity {
                 }
 
             } else {
-                if (!onHandleActionBarItemClick(getActionBar().getItem(position), position)) {
+                if (!onHandleActionBarItemClick(getGDActionBar().getItem(position), position)) {
                     if (Config.GD_WARNING_LOGS_ENABLED) {
                         Log.w(LOG_TAG, "Click on item at position " + position + " dropped down to the floor");
                     }

greendroid/GreenDroid/src/greendroid/graphics/drawable/ActionBarDrawable.java

@@ -15,7 +15,7 @@
  */
 package greendroid.graphics.drawable;
 
-import greendroid.widget.ActionBar;
+import greendroid.widget.GDActionBar;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
@@ -30,7 +30,7 @@ import android.util.StateSet;
  * It automatically adapts its color depending on its current state (black when
  * pressed or focused and white otherwise). As a result, the
  * {@link AutoColorDrawable} is a replacement {@link StateListDrawable} that
- * should be used in {@link ActionBar}s.
+ * should be used in {@link GDActionBar}s.
  * 
  * @author Cyril Mottier
  */

greendroid/GreenDroid/src/greendroid/widget/ActionBarHost.java

@@ -24,7 +24,7 @@ import com.cyrilmottier.android.greendroid.R;
 
 public class ActionBarHost extends LinearLayout {
 
-    private ActionBar mActionBar;
+    private GDActionBar mActionBar;
     private FrameLayout mContentView;
 
     public ActionBarHost(Context context) {
@@ -40,8 +40,8 @@ public class ActionBarHost extends LinearLayout {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
-        mActionBar = (ActionBar) findViewById(R.id.gd_action_bar);
+        mActionBar = (GDActionBar) findViewById(R.id.gd_action_bar);
-        if (mActionBar == null || !(mActionBar instanceof ActionBar)) {
+        if (mActionBar == null || !(mActionBar instanceof GDActionBar)) {
             throw new IllegalArgumentException("No ActionBar with the id R.id.gd_action_bar found in the layout.");
         }
 
@@ -51,7 +51,7 @@ public class ActionBarHost extends LinearLayout {
         }
     }
 
-    public ActionBar getActionBar() {
+    public GDActionBar getActionBar() {
         return mActionBar;
     }
 

greendroid/GreenDroid/src/greendroid/widget/ActionBarItem.java

@@ -23,7 +23,7 @@ import android.view.View;
 import com.cyrilmottier.android.greendroid.R;
 
 /**
- * Base class representing an {@link ActionBarItem} used in {@link ActionBar}s.
+ * Base class representing an {@link ActionBarItem} used in {@link GDActionBar}s.
  * The base implementation exposes a single Drawable as well as a content
  * description.
  * 
@@ -67,11 +67,11 @@ public abstract class ActionBarItem {
     protected View mItemView;
 
     protected Context mContext;
-    protected ActionBar mActionBar;
+    protected GDActionBar mActionBar;
 
     private int mItemId;
 
-    void setActionBar(ActionBar actionBar) {
+    void setActionBar(GDActionBar actionBar) {
         mContext = actionBar.getContext();
         mActionBar = actionBar;
     }
@@ -142,7 +142,7 @@ public abstract class ActionBarItem {
         return mItemId;
     }
 
-    static ActionBarItem createWithType(ActionBar actionBar, ActionBarItem.Type type) {
+    static ActionBarItem createWithType(GDActionBar actionBar, ActionBarItem.Type type) {
 
         int drawableId = 0;
         int descriptionId = 0;

greendroid/GreenDroid/src/greendroid/widget/GDActionBar.java

@@ -32,7 +32,7 @@ import android.widget.TextView;
 
 import com.cyrilmottier.android.greendroid.R;
 
-public class ActionBar extends LinearLayout {
+public class GDActionBar extends LinearLayout {
 
     public static final int NONE = 0;
     private static final int MAX_ITEMS_COUNT = 3;
@@ -63,7 +63,7 @@ public class ActionBar extends LinearLayout {
     private boolean mMerging = false;
 
     private CharSequence mTitle;
-    private ActionBar.Type mType;
+    private GDActionBar.Type mType;
     private OnActionBarListener mOnActionBarListener;
     private LinkedList<ActionBarItem> mItems;
 
@@ -71,15 +71,15 @@ public class ActionBar extends LinearLayout {
     private Drawable mHomeDrawable;
     private int mDividerWidth;
 
-    public ActionBar(Context context) {
+    public GDActionBar(Context context) {
         this(context, null);
     }
 
-    public ActionBar(Context context, AttributeSet attrs) {
+    public GDActionBar(Context context, AttributeSet attrs) {
         this(context, attrs, R.attr.gdActionBarStyle);
     }
 
-    public ActionBar(Context context, AttributeSet attrs, int defStyle) {
+    public GDActionBar(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs);
 
         initActionBar();