huge fml update

application/core/FML/Controls/Frame.php

@@ -4,9 +4,11 @@ namespace FML\Controls;
 
 use FML\Types\Container;
 use FML\Types\Renderable;
+use FML\Elements\Format;
+use FML\Elements\FrameModel;
 
 /**
- * Frame Element
+ * Frame Control
  * (CMlFrame)
  *
  * @author steeffeen
@@ -16,6 +18,18 @@ class Frame extends Control implements Container {
 	 * Protected Properties
 	 */
 	protected $children = array();
+	protected $format = null;
+
+	/**
+	 * Create a new Frame Control
+	 *
+	 * @param string $id (optional) Control Id
+	 * @return \FML\Controls\Frame
+	 */
+	public static function create($id = null) {
+		$frame = new Frame($id);
+		return $frame;
+	}
 
 	/**
 	 * Construct a new Frame Control
@@ -32,7 +46,7 @@ class Frame extends Control implements Container {
 	 * @see \FML\Types\Container::add()
 	 * @return \FML\Controls\Frame
 	 */
-	public function add(Renderable $child) {
+	public function add(Control $child) {
 		if (!in_array($child, $this->children, true)) {
 			array_push($this->children, $child);
 		}
@@ -49,12 +63,37 @@ class Frame extends Control implements Container {
 		return $this;
 	}
 
+	/**
+	 *
+	 * @see \FML\Types\Container::setFormat()
+	 * @return \FML\Controls\Frame
+	 */
+	public function setFormat(Format $format) {
+		$this->format = $format;
+		return $this;
+	}
+
+	/**
+	 *
+	 * @see \FML\Types\Container::getFormat()
+	 */
+	public function getFormat($createIfEmpty = true) {
+		if (!$this->format && $createIfEmpty) {
+			$this->format = new Format();
+		}
+		return $this->format;
+	}
+
 	/**
 	 *
 	 * @see \FML\Renderable::render()
 	 */
 	public function render(\DOMDocument $domDocument) {
 		$xmlElement = parent::render($domDocument);
+		if ($this->format) {
+			$formatXml = $this->format->render($domDocument);
+			$xmlElement->appendChild($formatXml);
+		}
 		foreach ($this->children as $child) {
 			$childXmlElement = $child->render($domDocument);
 			$xmlElement->appendChild($childXmlElement);