Merge pull request #60 from dcampbell-macadamian/TIMOB-8996

TIMOB-8996: Complete remaining issues from code review

blackberry/tibb/NativeButtonObject.cpp

@@ -48,6 +48,7 @@ NAHANDLE NativeButtonObject::getNativeHandle() const
 int NativeButtonObject::setTitle(TiObject* obj)
 {
     QString str;
+
     int error = NativeControlObject::getString(obj, str);
     if (!N_SUCCEEDED(error))
     {

blackberry/tibb/NativeContainerObject.cpp

@@ -63,6 +63,10 @@ NAHANDLE NativeContainerObject::getNativeHandle() const
 
 int NativeContainerObject::initialize(TiEventContainerFactory* containerFactory)
 {
+    if (container_ != NULL)
+    {
+        return NATIVE_ERROR_OK;
+    }
     container_ = Container::create();
     if (container_ == NULL)
     {

blackberry/tibb/NativeControlObject.cpp

@@ -62,6 +62,19 @@ int NativeControlObject::setBackgroundColor(TiObject* obj)
     return NATIVE_ERROR_NOTSUPPORTED;
 }
 
+PROP_SETTER(setBottom)
+int NativeControlObject::setBottom(TiObject* obj)
+{
+    float bottom;
+    int error = getFloat(obj, &bottom);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+    ((bb::cascades::Control*)getNativeHandle())->setBottomMargin(bottom);
+    return NATIVE_ERROR_OK;
+}
+
 PROP_SETTER(setColor)
 int NativeControlObject::setColor(TiObject* obj)
 {
@@ -74,6 +87,19 @@ int NativeControlObject::setLabel(TiObject* obj)
     return NATIVE_ERROR_NOTSUPPORTED;
 }
 
+PROP_SETTER(setLeft)
+int NativeControlObject::setLeft(TiObject* obj)
+{
+    float left;
+    int error = getFloat(obj, &left);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+    ((bb::cascades::Control*)getNativeHandle())->setLeftMargin(left);
+    return NATIVE_ERROR_OK;
+}
+
 PROP_SETTER(setMax)
 int NativeControlObject::setMax(TiObject* obj)
 {
@@ -86,6 +112,19 @@ int NativeControlObject::setMin(TiObject* obj)
     return NATIVE_ERROR_NOTSUPPORTED;
 }
 
+PROP_SETTER(setRight)
+int NativeControlObject::setRight(TiObject* obj)
+{
+    float right;
+    int error = getFloat(obj, &right);
+    if (error != NATIVE_ERROR_OK)
+    {
+        return error;
+    }
+    ((bb::cascades::Control*)getNativeHandle())->setRightMargin(right);
+    return NATIVE_ERROR_OK;
+}
+
 PROP_SETTER(setText)
 int NativeControlObject::setText(TiObject* obj)
 {
@@ -121,12 +160,6 @@ int NativeControlObject::setTop(TiObject* obj)
     return NATIVE_ERROR_OK;
 }
 
-PROP_SETTER(setLeft)
-int NativeControlObject::setLeft(TiObject* obj)
-{
-    return NATIVE_ERROR_NOTSUPPORTED;
-}
-
 PROP_SETTER(setValue)
 int NativeControlObject::setValue(TiObject* obj)
 {
@@ -241,7 +274,7 @@ static vector<NATIVE_PROPSET_CALLBACK> initFunctionMap()
     vect[N_PROP_BORDER_COLOR]                      = NULL;
     vect[N_PROP_BORDER_RADIUS]                     = NULL;
     vect[N_PROP_BORDER_WIDTH]                      = NULL;
-    vect[N_PROP_BOTTOM]                            = NULL;
+    vect[N_PROP_BOTTOM]                            = PROP_SETTING_FUNCTION(setBottom);
     vect[N_PROP_CENTER]                            = NULL;
     vect[N_PROP_CHILDREN]                          = NULL;
     vect[N_PROP_COLOR]                             = PROP_SETTING_FUNCTION(setColor);

blackberry/tibb/NativeControlObject.h

@@ -26,14 +26,16 @@ class NativeControlObject : public NativeObject
     virtual int setPropertyValue(size_t propertyNumber, TiObject* obj);
 
     virtual int setBackgroundColor(TiObject* obj);
+    virtual int setBottom(TiObject* obj);
     virtual int setColor(TiObject* obj);
     virtual int setLabel(TiObject* obj);
+    virtual int setLeft(TiObject* obj);
     virtual int setMax(TiObject* obj);
     virtual int setMin(TiObject* obj);
+    virtual int setRight(TiObject* obj);
     virtual int setText(TiObject* obj);
     virtual int setTextAlign(TiObject* obj);
     virtual int setTop(TiObject* obj);
-    virtual int setLeft(TiObject* obj);
     virtual int setTitle(TiObject* obj);
     virtual int setValue(TiObject* obj);
     virtual int setVisible(TiObject* obj);

blackberry/tibb/TiObject.cpp

@@ -15,20 +15,36 @@ TiObject::TiObject()
 {
     isInitialized_ = false;
     parentObject_ = NULL;
+    name_ = "";
+#ifdef _TI_DEBUG_
+    cstrName_ = name_.c_str();
+    debugMembers_ = "";
+    cstrdebugMembers_ = debugMembers_.c_str();
+#endif // _TI_DEBUG_
 }
 
 TiObject::TiObject(const char* objectName)
     : isInitialized_(false)
     , parentObject_(NULL)
 {
     name_ = objectName;
+#ifdef _TI_DEBUG_
+    cstrName_ = name_.c_str();
+    debugMembers_ = "";
+    cstrdebugMembers_ = debugMembers_.c_str();
+#endif // _TI_DEBUG_
 }
 
 TiObject::TiObject(const char* objectName, Handle<Value> value)
 {
     name_ = objectName;
     value_ = Persistent<Value>::New(value);
     parentObject_ = NULL;
+#ifdef _TI_DEBUG_
+    cstrName_ = name_.c_str();
+    debugMembers_ = "";
+    cstrdebugMembers_ = debugMembers_.c_str();
+#endif // _TI_DEBUG_
 }
 
 TiObject::~TiObject()
@@ -153,6 +169,13 @@ void TiObject::addMember(TiObject* object, const char* name/*=NULL*/)
     }
     childObjectMap_[name] = entry;
     object->initializeTiObject(this);
+#ifdef _TI_DEBUG_
+    // This debug code will create a string containing a list of properties and
+    // functions. This may be required for Titanium debugging.
+    debugMembers_ += "\n";
+    debugMembers_ += name;
+    cstrdebugMembers_ = debugMembers_.c_str();
+#endif
 }
 
 Handle<Value> TiObject::getValue() const
@@ -284,7 +307,17 @@ Handle<Value> TiObject::propGetter_(Local<String> prop, const AccessorInfo& info
     TiObject* propObject = obj->onLookupMember(propString);
     if (propObject == NULL)
     {
-        // TODO: lookup
+        // TODO: Fix the following block of commented out code. Currently it breaks
+        // Titanium runtime.
+        /*
+        if(obj->canAddMembers())
+        {
+            // If we're allowed to add members, return an "empty" result
+            // so V8 will handle it. V8 will set the value internally so
+            // we can ignore non-Titanium objects.
+            return result;
+        }
+        */
         return Undefined();
     }
     Handle<Value> ret = propObject->getValue();
@@ -314,8 +347,9 @@ Handle<Value> TiObject::propSetter_(Local<String> prop, Local<Value> value, cons
     TiObject* obj = getTiObjectFromJsObject(info.Holder());
     if (obj == NULL)
     {
-        obj = new TiObject("", info.Holder());
-        setTiObjectToJsObject(info.Holder(), obj);
+        // We are not tracking this object so let V8 handle it.
+        info.Holder()->ForceSet(prop, value);
+        return value;
     }
     String::Utf8Value propName(prop);
     const char* propString = (const char*)(*propName);

blackberry/tibb/TiObject.h

@@ -138,6 +138,11 @@ class TiObject : public TiBase
     bool isInitialized_;
     TiObject* parentObject_;
     map<string, ObjectEntry> childObjectMap_;
+#ifdef _TI_DEBUG_
+    const char* cstrName_;
+    string debugMembers_;
+    const char* cstrdebugMembers_;
+#endif // _TI_DEBUG_
 };
 
 #endif /* TIOBJECT_H_ */

blackberry/tibb/TiUIActivityIndicator.cpp

@@ -17,7 +17,7 @@ TiUIActivityIndicator::~TiUIActivityIndicator()
 {
 }
 
-TiUIActivityIndicator* TiUIActivityIndicator::createActivityIndicator(NativeObjectFactory* nativeObjectFactory)
+TiUIBase* TiUIActivityIndicator::createActivityIndicator(NativeObjectFactory* nativeObjectFactory)
 {
     TiUIActivityIndicator* obj = new TiUIActivityIndicator(nativeObjectFactory);
     obj->initializeTiObject(NULL);

blackberry/tibb/TiUIActivityIndicator.h

@@ -20,7 +20,7 @@
 class TiUIActivityIndicator : public TiUIBase
 {
 public:
-    static TiUIActivityIndicator* createActivityIndicator(NativeObjectFactory* nativeObjectFactory);
+    static TiUIBase* createActivityIndicator(NativeObjectFactory* nativeObjectFactory);
 
 protected:
     virtual ~TiUIActivityIndicator();

blackberry/tibb/TiUIBase.cpp

@@ -36,6 +36,11 @@ const static TiProperty g_tiProperties[] =
         N_PROP_BACKGROUND_COLOR
     },
 
+    {
+        "bottom", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
+        N_PROP_BOTTOM
+    },
+
     {
         "color", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
         N_PROP_COLOR
@@ -71,6 +76,11 @@ const static TiProperty g_tiProperties[] =
         N_PROP_LABEL
     },
 
+    {
+        "left", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
+        N_PROP_LEFT
+    },
+
     {
         "max", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
         N_PROP_MAX
@@ -86,6 +96,11 @@ const static TiProperty g_tiProperties[] =
         N_PROP_OPTIONS
     },
 
+    {
+        "right", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
+        N_PROP_RIGHT
+    },
+
     {
         "selectedIndex", TI_PROP_PERMISSION_READ | TI_PROP_PERMISSION_WRITE,
         N_PROP_SELECTED_INDEX
@@ -250,16 +265,14 @@ void TiUIBase::setParametersFromObject(Local<Object> obj)
     Handle<Array> propNames = obj->GetPropertyNames();
     uint32_t props = propNames->Length();
     Local<Value> propValue;
-    Handle<String> propString;
-    TiObject* foundProp;
     for (uint32_t i = 0; i < props; i++)
     {
-        propString = Handle<String>::Cast(propNames->Get(Integer::New(i)));
+        Handle<String> propString = Handle<String>::Cast(propNames->Get(Integer::New(i)));
         String::Utf8Value propNameUTF(propString);
-        foundProp = onLookupMember(*propNameUTF);
+        TiObject* foundProp = onLookupMember(*propNameUTF);
         if (foundProp != NULL)
         {
-            propValue = obj->Get(propString);
+            Local<Value> propValue = obj->Get(propString);
             foundProp->setValue(propValue);
         }
     }

blackberry/tibb/TiUIBase.h

@@ -19,7 +19,7 @@
 class TiCascadesApp;
 
 /*
- * TiCascadesApp
+ * TiUIBase
  *
  * Titanium base class for all UI objects such as windows, labels, buttons, etc...
  */
@@ -30,7 +30,7 @@ class TiUIBase : public TiObject
     virtual bool isUIObject() const;
     virtual NativeObjectFactory* getNativeObjectFactory() const;
     virtual NativeObject* getNativeObject() const;
-    virtual void setTiMappingProperties(const TiProperty* prop, int propertyCount);
+    virtual void setTiMappingProperties(const TiProperty* props, int propertyCount);
 
 protected:
     TiUIBase(NativeObjectFactory* nativeObjectFactory, const char* name);

blackberry/tibb/TiUIButton.cpp

@@ -16,7 +16,7 @@ TiUIButton::~TiUIButton()
 {
 }
 
-TiUIButton* TiUIButton::createButton(NativeObjectFactory* nativeObjectFactory)
+TiUIBase* TiUIButton::createButton(NativeObjectFactory* nativeObjectFactory)
 {
     TiUIButton* obj = new TiUIButton(nativeObjectFactory);
     obj->initializeTiObject(NULL);

blackberry/tibb/TiUIButton.h

@@ -20,7 +20,7 @@
 class TiUIButton : public TiUIBase
 {
 public:
-    static TiUIButton* createButton(NativeObjectFactory* nativeObjectFactory);
+    static TiUIBase* createButton(NativeObjectFactory* nativeObjectFactory);
 
 protected:
     virtual ~TiUIButton();

blackberry/tibb/TiUIImageView.cpp

@@ -16,7 +16,7 @@ TiUIImageView::~TiUIImageView()
 {
 }
 
-TiUIImageView* TiUIImageView::createImageView(NativeObjectFactory* nativeObjectFactory)
+TiUIBase* TiUIImageView::createImageView(NativeObjectFactory* nativeObjectFactory)
 {
     TiUIImageView* obj = new TiUIImageView(nativeObjectFactory);
     obj->initializeTiObject(NULL);

blackberry/tibb/TiUIImageView.h

@@ -21,7 +21,7 @@
 class TiUIImageView : public TiUIBase
 {
 public:
-    static TiUIImageView* createImageView(NativeObjectFactory* nativeObjectFactory);
+    static TiUIBase* createImageView(NativeObjectFactory* nativeObjectFactory);
 
 protected:
     virtual ~TiUIImageView();

blackberry/tibb/TiUILabel.cpp

@@ -17,7 +17,7 @@ TiUILabel::~TiUILabel()
 {
 }
 
-TiUILabel* TiUILabel::createLabel(NativeObjectFactory* nativeObjectFactory)
+TiUIBase* TiUILabel::createLabel(NativeObjectFactory* nativeObjectFactory)
 {
     TiUILabel* obj = new TiUILabel(nativeObjectFactory);
     obj->initializeTiObject(NULL);

blackberry/tibb/TiUILabel.h

@@ -21,7 +21,7 @@
 class TiUILabel : public TiUIBase
 {
 public:
-    static TiUILabel* createLabel(NativeObjectFactory* nativeObjectFactory);
+    static TiUIBase* createLabel(NativeObjectFactory* nativeObjectFactory);
 
 protected:
     virtual ~TiUILabel();