phpMv / phpMv-UI

Ajax/bootstrap/html/base/HtmlNavElement.php

Doc Comments +4 added lines, -1 removed lines

@@ -19,6 +19,10 @@ 
 	protected $attr;
 
 
+	/**
+	 * @param string $identifier
+	 * @param string $tagName
+	 */
 	public function __construct($identifier,$tagName){
 		parent::__construct($identifier,$tagName);
 		$this->root="";
@@ -29,7 +33,6 @@ 
 	 * Associate an ajax get to the elements, displayed in $targetSelector
 	 * $attr member is used to build each element url
 	 * @param string $targetSelector the target of the get
-	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlNavElement
 	 */
 	public function autoGetOnClick($targetSelector){

Spacing +11 added lines, -11 removed lines

@@ -19,8 +19,8 @@ 
 	protected $attr;
 
 
-	public function __construct($identifier,$tagName){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName) {
+		parent::__construct($identifier, $tagName);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -32,11 +32,11 @@ 
 	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlNavElement
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 
-	public function contentAsString(){
+	public function contentAsString() {
 		return implode("", $this->content);
 	}
 
@@ -44,15 +44,15 @@ 
 	 * Generate the jquery script to set the elements to the HtmlNavElement
 	 * @param JsUtils $jsUtils
 	 */
-	public function jsSetContent(JsUtils $jsUtils){
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
+	public function jsSetContent(JsUtils $jsUtils) {
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
 	}
 
 	public function getRoot() {
 		return $this->root;
 	}
 	public function setRoot($root) {
-		$this->root = $root;
+		$this->root=$root;
 		return $this;
 	}
 	public function getAttr() {
@@ -65,12 +65,12 @@ 
 	 * @return HtmlNavElement
 	 */
 	public function setAttr($attr) {
-		$this->attr = $attr;
+		$this->attr=$attr;
 		return $this;
 	}
 
 	public function __call($method, $args) {
-		if(isset($this->$method) && is_callable($this->$method)) {
+		if (isset($this->$method) && is_callable($this->$method)) {
 			return call_user_func_array(
 					$this->$method,
 					$args
@@ -78,6 +78,6 @@ 
 		}
 	}
 
-	abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0);
+	abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0);
 
 }
\ No newline at end of file

Ajax/bootstrap/html/HtmlButtongroups.php

Doc Comments +3 added lines

@@ -49,6 +49,9 @@
 			$element->setStyle($value);
 	}
 
+	/**
+	 * @param HtmlDropdown $bt
+	 */
 	private function dropdownAsButton($bt) {
 		$this->addExistingDropDown($bt);
 		$bt->setTagName("button");

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
 	 * @return HtmlButtongroups default : ""
 	 */
 	public function setSize($size) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->setSize($size);
 		}
 		if (is_int($size)) {
@@ -45,7 +45,7 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
+		foreach ($this->elements as $element)
 			$element->setStyle($value);
 	}
 
@@ -65,7 +65,7 @@ 
 	public function addElement($element) {
 		$result=$element;
 		$iid=sizeof($this->elements)+1;
-		if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) {
+		if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) {
 			$this->addExistingDropDown($element);
 			$this->elements[]=$element;
 		} elseif ($element instanceof HtmlButton) {
@@ -94,7 +94,7 @@ 
 	}
 
 	public function addElements($elements) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
@@ -114,7 +114,7 @@ 
 		} else
 			$value="btn-group-".$value;
 		if (strstr($value, "justified")) {
-			foreach ( $this->elements as $element ) {
+			foreach ($this->elements as $element) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
 			}
 		}
@@ -145,7 +145,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->elements as $element ) {
+		foreach ($this->elements as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;

Braces +20 added lines, -16 removed lines

@@ -45,8 +45,9 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
-			$element->setStyle($value);
+		foreach ( $this->elements as $element ) {
+					$element->setStyle($value);
+		}
 	}
 
 	private function dropdownAsButton($bt) {
@@ -71,16 +72,18 @@ 
 		} elseif ($element instanceof HtmlButton) {
 			$this->elements[]=$element;
 		} elseif (is_array($element)) {
-			if (array_key_exists("glyph", $element))
-				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
-			elseif (array_key_exists("btnCaption", $element)) {
-				if (array_key_exists("split", $element))
-					$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-				else
-					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+			if (array_key_exists("glyph", $element)) {
+							$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
+			} elseif (array_key_exists("btnCaption", $element)) {
+				if (array_key_exists("split", $element)) {
+									$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
+				} else {
+									$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+				}
 				$this->dropdownAsButton($bt);
-			} else
-				$bt=new HtmlButton($this->identifier."-button-".$iid);
+			} else {
+							$bt=new HtmlButton($this->identifier."-button-".$iid);
+			}
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
 			$result=$bt;
@@ -111,8 +114,9 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
-			$value="btn-group-".$value;
+		} else {
+					$value="btn-group-".$value;
+		}
 		if (strstr($value, "justified")) {
 			foreach ( $this->elements as $element ) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -127,9 +131,9 @@ 
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
-		if (is_int($index))
-			return $this->elements[$index];
-		else {
+		if (is_int($index)) {
+					return $this->elements[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->elements);
 			return $elm;
 		}

Ajax/bootstrap/html/HtmlButtontoolbar.php

Doc Comments +6 added lines, -1 removed lines

@@ -12,6 +12,11 @@ 
 
 class HtmlButtontoolbar extends HtmlButtongroups {
 
+	/**
+	 * @param string $identifier
+	 * @param string $cssStyle
+	 * @param string $size
+	 */
 	public function __construct($identifier, $elements=array(), $cssStyle=NULL, $size=NULL, $tagName="div") {
 		parent::__construct($identifier, $elements, $cssStyle, $size, $tagName);
 		$this->setClass("btn-toolbar");
@@ -57,7 +62,7 @@ 
 
 	/**
 	 * return the Buttongroups at position $index
-	 * @return \Ajax\bootstrap\html\HtmlButtongroups
+	 * @return HtmlButton
 	 */
 	public function getGroup($index) {
 		return parent::getElement($index);

Spacing +3 added lines, -3 removed lines

@@ -79,15 +79,15 @@
 		$element=null;
 		$i=0;
 		if (is_int($index)) {
-			$elements=array ();
-			foreach ( $this->elements as $group ) {
+			$elements=array();
+			foreach ($this->elements as $group) {
 				$elements=array_merge($elements, $group->getElements());
 			}
 			if ($index<sizeof($elements)) {
 				$element=$elements [$index];
 			}
 		} else {
-			while ( $element==null&&$i<sizeof($this->elements) ) {
+			while ($element==null && $i<sizeof($this->elements)) {
 				$element=$this->elements [$i]->getElement($index);
 				$i++;
 			}

Braces +6 added lines, -5 removed lines

@@ -46,9 +46,9 @@ 
 	 */
 	private function getLastButtonGroup() {
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
-		else {
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		} else {
 			$bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb);
 			$this->elements []=$bg;
 		}
@@ -66,8 +66,9 @@ 
 	public function getLastGroup() {
 		$bg=null;
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		}
 		return $bg;
 	}
 

Ajax/bootstrap/html/HtmlForm.php

Doc Comments +3 added lines

@@ -87,6 +87,9 @@
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	private function getPrefix($element) {
 		$result="input_text";
 		foreach ( $this->formElementsPrefix as $k => $v ) {

Braces +3 added lines, -2 removed lines

@@ -99,8 +99,9 @@
 	}
 
 	public function addGroup($identifier="") {
-		if ($identifier==="")
-			$identifier="form-".$this->identifier;
+		if ($identifier==="") {
+					$identifier="form-".$this->identifier;
+		}
 		$group=new HtmlBsDoubleElement($identifier);
 		$group->setTagName("div");
 		$group->setClass("form-group");

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\JsUtils;
 use Ajax\service\JArray;
-
 use Ajax\semantic\html\base\constants\State;
 
 class HtmlProgress extends HtmlSemDoubleElement {

Spacing +9 added lines, -9 removed lines

@@ -15,8 +15,8 @@ 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "form");
 		$this->_template='<form id="%identifier%" name="%identifier%" %properties%>%content%</form>';
-		$this->futureElements=array ();
-		$this->formGroups=array ();
+		$this->futureElements=array();
+		$this->formGroups=array();
 	}
 
 	/*
@@ -26,10 +26,10 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		if (isset($js)) {
 			$this->formElementsPrefix=$js->config()->getVar("formElementsPrefix");
-			foreach ( $this->futureElements as $futureElement ) {
+			foreach ($this->futureElements as $futureElement) {
 				$futureElementValue=$this->getPrefix($futureElement);
 				$futureElementValues=explode("_", $futureElementValue);
-				switch($futureElementValues [0]) {
+				switch ($futureElementValues [0]) {
 					case "input":
 						$control=new HtmlInput($futureElement);
 						$control->setClass("form-control");
@@ -47,7 +47,7 @@ 
 						$control->setLabel($label, false);
 						break;
 					case "select":
-						$control=new HtmlSelect($futureElement,"");
+						$control=new HtmlSelect($futureElement, "");
 						$control->setProperty("size", $futureElementValues [1]);
 						$control->setClass("form-control");
 						//$control->setLabel($this->getPart($futureElement));
@@ -62,7 +62,7 @@ 
 				$this->addElement($control);
 			}
 		}
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 			$this->addContent($group);
 		}
 		return parent::compile($js, $view);
@@ -90,7 +90,7 @@ 
 
 	private function getPrefix($element) {
 		$result="input_text";
-		foreach ( $this->formElementsPrefix as $k => $v ) {
+		foreach ($this->formElementsPrefix as $k => $v) {
 			if (Text::startsWith($element, $k)) {
 				$result=$v;
 				break;
@@ -120,7 +120,7 @@ 
 
 	public function getElement($name) {
 		$element=null;
-		foreach ( $this->formGroups as $group ) {
+		foreach ($this->formGroups as $group) {
 		}
 		return $element;
 	}
@@ -130,7 +130,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\HtmlSingleElement::fromArray()
 	 */
 	public function fromArray($array) {
-		foreach ( $array as $value ) {
+		foreach ($array as $value) {
 			if (is_string($value)) {
 				$this->futureElements []=$value;
 			}

Ajax/bootstrap/html/HtmlGridsystem.php

Doc Comments +4 added lines

@@ -16,6 +16,10 @@
 class HtmlGridSystem extends HtmlBsDoubleElement {
 	private $rows;
 	
+	/**
+	 * @param string $identifier
+	 * @param integer $numCols
+	 */
 	public function __construct($identifier,$numRows=1,$numCols=NULL){
 		parent::__construct($identifier,"div");
 		$this->setProperty("class", "container-fluid");

Spacing +22 added lines, -22 removed lines

@@ -16,11 +16,11 @@ 
 class HtmlGridSystem extends HtmlBsDoubleElement {
 	private $rows;
 	
-	public function __construct($identifier,$numRows=1,$numCols=NULL){
-		parent::__construct($identifier,"div");
+	public function __construct($identifier, $numRows=1, $numCols=NULL) {
+		parent::__construct($identifier, "div");
 		$this->setProperty("class", "container-fluid");
 		$this->rows=array();
-		$this->setNumRows($numRows,$numCols);
+		$this->setNumRows($numRows, $numCols);
 	}
 	
 	/**
@@ -28,8 +28,8 @@ 
 	 * @param int $numCols 
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function addRow($numCols=NULL){
-		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1),$numCols);
+	public function addRow($numCols=NULL) {
+		$row=new HtmlGridRow($this->identifier."-row-".(sizeof($this->rows)+1), $numCols);
 		$this->rows[]=$row;
 		return $row;
 	}
@@ -40,10 +40,10 @@ 
 	 * @param boolean $force add the row at $index if true
 	 * @return \Ajax\bootstrap\html\content\HtmlGridRow
 	 */
-	public function getRow($index,$force=true){
-		if($index<sizeof($this->rows)){
+	public function getRow($index, $force=true) {
+		if ($index<sizeof($this->rows)) {
 			$result=$this->rows[$index-1];
-		}else if ($force){
+		} else if ($force) {
 			$this->setNumRows($index);
 			$result=$this->rows[$index-1];
 		}
@@ -56,8 +56,8 @@ 
 	 * @param int $numCols
 	 * @return \Ajax\bootstrap\html\HtmlGridSystem
 	 */
-	public function setNumRows($numRows,$numCols=NULL){
-		for($i=sizeof($this->rows);$i<$numRows;$i++){
+	public function setNumRows($numRows, $numCols=NULL) {
+		for ($i=sizeof($this->rows); $i<$numRows; $i++) {
 			$this->addRow($numCols);
 		}
 		return $this;
@@ -69,10 +69,10 @@ 
 	 * @param $force add the cell at $row,$col if true
 	 * @return HtmlGridCol
 	 */
-	public function getCell($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getCol($col,$force);
+	public function getCell($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getCol($col, $force);
 		}
 		return $col;
 	}
@@ -82,22 +82,22 @@ 
 	 * @param int $col
 	 * @return HtmlGridCol
 	 */
-	public function getCellAt($row,$col,$force=true){
-		$row=$this->getRow($row,$force);
-		if(isset($row)){
-			$col=$row->getColAt($col,$force);
+	public function getCellAt($row, $col, $force=true) {
+		$row=$this->getRow($row, $force);
+		if (isset($row)) {
+			$col=$row->getColAt($col, $force);
 		}
 		return $col;
 	}
 	
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		foreach ($this->rows as $row){
+		foreach ($this->rows as $row) {
 			$this->addContent($row);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
-	public function setContentForAll($content){
-		foreach ($this->rows as $row){
+	public function setContentForAll($content) {
+		foreach ($this->rows as $row) {
 			$row->setContentForAll($content);
 		}
 	}

Braces +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 	public function getRow($index,$force=true){
 		if($index<sizeof($this->rows)){
 			$result=$this->rows[$index-1];
-		}else if ($force){
+		} else if ($force){
 			$this->setNumRows($index);
 			$result=$this->rows[$index-1];
 		}

Ajax/bootstrap/html/HtmlModal.php

Doc Comments +1 added lines, -2 removed lines

@@ -121,7 +121,6 @@ 
 	/**
 	 * render the content of $controller::$action and set the response to the modal content
 	 * @param JsUtils $js
-	 * @param string $title The panel title
 	 * @param Controller $initialControllerInstance
 	 * @param string $controllerName the controller name
 	 * @param string $actionName the action name
@@ -198,7 +197,7 @@ 
 	 * Includes a modal-backdrop element.
 	 * Alternatively, specify static for a backdrop which doesn't close the modal on click.
 	 * @param Boolean $value default : true
-	 * @return HtmlModal
+	 * @return boolean
 	 */
 	public function setBackdrop($value) {
 		return $this->backdrop=$value;

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
 class HtmlModal extends BaseHtml {
 	protected $title="Titre de ma boîte";
 	protected $content="";
-	protected $buttons=array ();
+	protected $buttons=array();
 	protected $showOnStartup=false;
 	protected $draggable=false;
 	protected $validCondition=NULL;
@@ -27,10 +27,10 @@ 
 	public function __construct($identifier, $title="", $content="", $buttonCaptions=array()) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplModal.php';
-		$this->buttons=array ();
+		$this->buttons=array();
 		$this->title=$title;
 		$this->content=$content;
-		foreach ( $buttonCaptions as $button ) {
+		foreach ($buttonCaptions as $button) {
 			$this->addButton($button);
 		}
 	}
@@ -65,7 +65,7 @@ 
 	 * @param string $value
 	 * @return HtmlButton
 	 */
-	public function addOkayButton($value="Okay",$jsCode="") {
+	public function addOkayButton($value="Okay", $jsCode="") {
 		$btn=$this->addButton($value, "btn-primary");
 		$btn->onClick("if(".$this->getValidCondition()."){ ".$jsCode."$('#".$this->identifier."').modal('hide');}");
 		return $btn;
@@ -114,8 +114,8 @@ 
 	 * @param string $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		$this->content=$js->renderContent($initialController, $viewName,$params);
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		$this->content=$js->renderContent($initialController, $viewName, $params);
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 * @param string $controllerName the controller name
 	 * @param string $actionName the action name
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		$this->content=$js->forward($initialControllerInstance, $controllerName, $actionName,$params);
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		$this->content=$js->forward($initialControllerInstance, $controllerName, $actionName, $params);
 	}
 
 	/*
@@ -135,10 +135,10 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->content instanceof BaseHtml){
+		if ($this->content instanceof BaseHtml) {
 			$this->content->run($js);
 		}
-		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
+		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array(
 				"show" => $this->showOnStartup
 		));
 		if ($this->draggable)

Braces +11 added lines, -8 removed lines

@@ -141,18 +141,20 @@ 
 		$this->_bsComponent=$js->bootstrap()->modal("#".$this->identifier, array (
 				"show" => $this->showOnStartup
 		));
-		if ($this->draggable)
-			$this->_bsComponent->setDraggable(true);
+		if ($this->draggable) {
+					$this->_bsComponent->setDraggable(true);
+		}
 		$this->_bsComponent->setBackdrop($this->backdrop);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function getButton($index) {
-		if (is_int($index))
-			return $this->buttons [$index];
-		else
-			return $this->getElementById($index, $this->buttons);
+		if (is_int($index)) {
+					return $this->buttons [$index];
+		} else {
+					return $this->getElementById($index, $this->buttons);
+		}
 	}
 
 	public function showOnCreate() {
@@ -178,8 +180,9 @@ 
 
 	public function jsHideButton($index) {
 		$btn=$this->getButton($index);
-		if ($btn)
-			return "$('#".$btn->getIdentifier()."').hide();";
+		if ($btn) {
+					return "$('#".$btn->getIdentifier()."').hide();";
+		}
 	}
 
 	/**

Ajax/bootstrap/html/HtmlProgressbar.php

Doc Comments +16 added lines, -1 removed lines

@@ -19,6 +19,9 @@ 
 	protected $style="";
 	protected $styleLimits=null;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $style="info", $value=0, $max=100, $min=0) {
 		parent::__construct($identifier);
 		$this->_template=include 'templates/tplProgressbar.php';
@@ -28,6 +31,9 @@ 
 		$this->setStyle($style);
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setActive($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -42,6 +48,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function setStriped($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -56,6 +65,9 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param boolean $value
+	 */
 	public function showCaption($value) {
 		if(is_array($this->content)){
 			foreach ($this->content as $pb){
@@ -113,6 +125,9 @@ 
 		return $this->isStacked;
 	}
 
+	/**
+	 * @param boolean $isStacked
+	 */
 	public function setIsStacked($isStacked) {
 		$this->isStacked=$isStacked;
 		return $this;
@@ -121,7 +136,7 @@ 
 	/**
 	 * define the progressbar style
 	 * avaible values : "success","info","warning","danger"
-	 * @param string|int $cssStyle
+	 * @param string $cssStyle
 	 * @return \Ajax\bootstrap\html\HtmlProgressbar default : ""
 	 */
 	public function setStyle($cssStyle) {

Spacing +14 added lines, -14 removed lines

@@ -29,11 +29,11 @@ 
 	}
 
 	public function setActive($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->setActive($value);
 			}
-		}else{
+		} else {
 			if ($value===true)
 				$this->active="active";
 			else
@@ -43,11 +43,11 @@ 
 	}
 
 	public function setStriped($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->setStriped($value);
 			}
-		}else{
+		} else {
 			if ($value===true)
 				$this->striped="progress-bar-striped";
 			else
@@ -57,11 +57,11 @@ 
 	}
 
 	public function showCaption($value) {
-		if(is_array($this->content)){
-			foreach ($this->content as $pb){
+		if (is_array($this->content)) {
+			foreach ($this->content as $pb) {
 				$pb->showCaption($value);
 			}
-		}else{
+		} else {
 			if ($value===true)
 				$this->caption="%value%%";
 			else
@@ -81,7 +81,7 @@ 
 		$progressBar->setStriped($this->striped!=="" || $progressBar->isStriped());
 		$progressBar->setActive($this->active==="active" || $progressBar->isActive());
 		if (is_array($this->content)===false) {
-			$this->content=array ();
+			$this->content=array();
 		}
 		$this->content []=$progressBar;
 	}
@@ -125,7 +125,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlProgressbar default : ""
 	 */
 	public function setStyle($cssStyle) {
-		return $this->setMemberCtrl($this->style,CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar"));
+		return $this->setMemberCtrl($this->style, CssRef::getStyle($cssStyle, "progress-bar"), CssRef::Styles("progress-bar"));
 	}
 
 	/*
@@ -134,10 +134,10 @@ 
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$actualStyle=$this->style;
-		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
-			foreach ($this->styleLimits as $k=>$v){
+		if (isset($this->styleLimits) && JArray::isAssociative($this->styleLimits)) {
+			foreach ($this->styleLimits as $k=>$v) {
 				$actualStyle=$k;
-				if($v>$this->value)
+				if ($v>$this->value)
 					break;
 			}
 		}

Braces +21 added lines, -17 removed lines

@@ -33,11 +33,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setActive($value);
 			}
-		}else{
-			if ($value===true)
-				$this->active="active";
-			else
-				$this->active="";
+		} else{
+			if ($value===true) {
+							$this->active="active";
+			} else {
+							$this->active="";
+			}
 		}
 		return $this;
 	}
@@ -47,11 +48,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setStriped($value);
 			}
-		}else{
-			if ($value===true)
-				$this->striped="progress-bar-striped";
-			else
-				$this->striped="";
+		} else{
+			if ($value===true) {
+							$this->striped="progress-bar-striped";
+			} else {
+							$this->striped="";
+			}
 		}
 		return $this;
 	}
@@ -61,11 +63,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->showCaption($value);
 			}
-		}else{
-			if ($value===true)
-				$this->caption="%value%%";
-			else
-				$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+		} else{
+			if ($value===true) {
+							$this->caption="%value%%";
+			} else {
+							$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+			}
 		}
 		return $this;
 	}
@@ -137,8 +140,9 @@ 
 		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
 			foreach ($this->styleLimits as $k=>$v){
 				$actualStyle=$k;
-				if($v>$this->value)
-					break;
+				if($v>$this->value) {
+									break;
+				}
 			}
 		}
 		$this->style=$actualStyle;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\JsUtils;
 use Ajax\service\JArray;
-
 use Ajax\semantic\html\base\constants\State;
 
 class HtmlProgress extends HtmlSemDoubleElement {

Ajax/semantic/html/collections/HtmlBreadcrumb.php

Doc Comments +3 added lines, -4 removed lines

@@ -64,8 +64,7 @@ 
 	 * Associate an ajax get to the breadcrumb elements, displayed in $targetSelector
 	 * $attr member is used to build each element url
 	 * @param string $targetSelector the target of the get
-	 * @param string $attr the html attribute used to build the elements url
-	 * @return HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function autoGetOnClick($targetSelector) {
 		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
@@ -91,7 +90,7 @@ 
 	 * Add new elements in breadcrumbs corresponding to request dispatcher : controllerName, actionName, parameters
 	 * @param JsUtils $js
 	 * @param Dispatcher $dispatcher the request dispatcher
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
 		return $this->addItems($js->fromDispatcher($dispatcher));
@@ -120,7 +119,7 @@ 
 	 * sets the function who generates the href elements.
 	 * default : function($element){return $element->getContent()}
 	 * @param function $_hrefFunction
-	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
+	 * @return HtmlBreadcrumb
 	 */
 	public function setHrefFunction($_hrefFunction) {
 		$this->_hrefFunction=$_hrefFunction;

Braces +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@
 	protected function createItem($value) {
 		$count=$this->count();
 		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
-		if (\is_array($value))
-			$itemO->fromArray($value);
-		else {
+		if (\is_array($value)) {
+					$itemO->fromArray($value);
+		} else {
 			$itemO->setContent($value);
 		}
 		return $itemO;

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\JsUtils;
 use Ajax\service\JArray;
-
 use Ajax\semantic\html\base\constants\State;
 
 class HtmlProgress extends HtmlSemDoubleElement {

Spacing +16 added lines, -16 removed lines

@@ -51,7 +51,7 @@ 
 		$this->startIndex=$startIndex;
 		$this->autoActive=$autoActive;
 		$this->_contentSeparator="<div class='divider'> / </div>";
-		$this->_hrefFunction=function ($e) {
+		$this->_hrefFunction=function($e) {
 			return $e->getContent();
 		};
 		if (isset($hrefFunction)) {
@@ -68,7 +68,7 @@ 
 	 * @return HtmlBreadcrumbs
 	 */
 	public function autoGetOnClick($targetSelector) {
-		return $this->getOnClick($this->root, $targetSelector, array ("attr" => $this->attr ));
+		return $this->getOnClick($this->root, $targetSelector, array("attr" => $this->attr));
 	}
 
 	public function contentAsString() {
@@ -80,7 +80,7 @@ 
 
 	public function setActive($index=null) {
 		if (!isset($index)) {
-			$index=sizeof($this->content) - 1;
+			$index=sizeof($this->content)-1;
 		}
 		$activeItem=$this->content[$index];
 		$activeItem->addToProperty("class", "active");
@@ -93,7 +93,7 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0) {
+	public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0) {
 		return $this->addItems($js->fromDispatcher($dispatcher));
 	}
 
@@ -107,12 +107,12 @@ 
 		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if ($this->absolutePaths === true) {
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
 		} else {
-			return $this->root . implode($separator, array_slice(array_map(function ($e) {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {
 				return $this->_hrefFunction($e);
-			}, $this->content), $this->startIndex, $index + 1));
+			}, $this->content), $this->startIndex, $index+1));
 		}
 	}
 
@@ -146,8 +146,8 @@ 
 			$this->setActive();
 		}
 		$count=$this->count();
-		for($i=1; $i < $count; $i++) {
-			$this->content[$i]->wrap($this->getContentDivider($i - 1));
+		for ($i=1; $i<$count; $i++) {
+			$this->content[$i]->wrap($this->getContentDivider($i-1));
 		}
 		return parent::compile($js, $view);
 	}
@@ -157,15 +157,15 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ( $this->content as $element ) {
-			if ($element->getProperty($this->attr) != NULL){
+		foreach ($this->content as $element) {
+			if ($element->getProperty($this->attr)!=NULL) {
 				$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 			}
 		}
@@ -180,7 +180,7 @@ 
 	 */
 	protected function createItem($value) {
 		$count=$this->count();
-		$itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section");
+		$itemO=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "a", "section");
 		if (\is_array($value))
 			$itemO->fromArray($value);
 		else {
@@ -192,7 +192,7 @@ 
 	public function addIconAt($icon, $index) {
 		$item=$this->getItem($index);
 		if (isset($item)) {
-			$icon=new HtmlIcon("icon-" . $this->identifier, $icon);
+			$icon=new HtmlIcon("icon-".$this->identifier, $icon);
 			$item->wrapContent($icon);
 		}
 	}
@@ -200,7 +200,7 @@ 
 	public function addItem($item) {
 		$count=$this->count();
 		$itemO=parent::addItem($item);
-		$this->addToPropertyCtrl("class", "section", array ("section" ));
+		$this->addToPropertyCtrl("class", "section", array("section"));
 		$itemO->setProperty($this->attr, $this->getHref($count));
 		return $itemO;
 	}
@@ -216,7 +216,7 @@ 
 	public function setAbsolutePaths($absolutePaths) {
 		$this->absolutePaths=$absolutePaths;
 		$size=\sizeof($this->content);
-		for($i=0;$i<$size;$i++){
+		for ($i=0; $i<$size; $i++) {
 			$this->content[$i]->setProperty($this->attr, $this->getHref($i));
 		}
 		return $this;

Ajax/semantic/html/collections/HtmlGrid.php

Doc Comments +5 added lines, -2 removed lines

@@ -22,6 +22,9 @@ 
 	private $_colSizing=true;
 	private $_implicitRows=false;
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
 		parent::__construct($identifier, "div", "ui grid");
 		$this->_implicitRows=$implicitRows;
@@ -158,7 +161,7 @@ 
 	/**
 	 * return the row at $index
 	 * @param int $index
-	 * @return \Ajax\semantic\html\collections\HtmlGridRow
+	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getRow($index) {
 		return $this->getItem($index);
@@ -297,7 +300,7 @@ 
 
 	/**
 	 * stretch the row contents to take up the entire column height
-	 * @return \Ajax\semantic\html\content\HtmlGridRow
+	 * @return HtmlGrid
 	 */
 	public function setStretched() {
 		return $this->addToProperty("class", "stretched");

Braces +21 added lines, -14 removed lines

@@ -81,8 +81,9 @@ 
 	public function addCol($width=NULL) {
 		$colCount=$this->colCount() + 1;
 		$this->setColsCount($colCount, true, $width);
-		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+		if ($this->hasOnlyCols($this->count())) {
+					return $this->content[$colCount - 1];
+		}
 		return $this;
 	}
 
@@ -170,8 +171,9 @@ 
 	 */
 	public function rowCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return 0;
+		if ($this->hasOnlyCols($count)) {
+					return 0;
+		}
 		return $count;
 	}
 
@@ -181,10 +183,12 @@ 
 	 */
 	public function colCount() {
 		$count=$this->count();
-		if ($this->hasOnlyCols($count))
-			return $count;
-		if ($count > 0)
-			return $this->getItem(0)->count();
+		if ($this->hasOnlyCols($count)) {
+					return $count;
+		}
+		if ($count > 0) {
+					return $this->getItem(0)->count();
+		}
 		return 0;
 	}
 
@@ -195,8 +199,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
-			return $this->getItem($col);
+		if ($row < 2 && $this->hasOnlyCols($this->count())) {
+					return $this->getItem($col);
+		}
 		$row=$this->getItem($row);
 		if (isset($row)) {
 			$col=$row->getItem($col);
@@ -245,8 +250,9 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setPadded($value=NULL) {
-		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		if (isset($value)) {
+					$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+		}
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -271,8 +277,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
-			$value=null;
+		if ($this->_createCols === false) {
+					$value=null;
+		}
 		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}

Spacing +40 added lines, -40 removed lines

@@ -36,11 +36,11 @@ 
 	}
 
 	public function asSegment() {
-		return $this->addToPropertyCtrl("class", "segment", array ("segment" ));
+		return $this->addToPropertyCtrl("class", "segment", array("segment"));
 	}
 
 	public function asContainer() {
-		return $this->addToPropertyCtrl("class", "container", array ("container" ));
+		return $this->addToPropertyCtrl("class", "container", array("container"));
 	}
 
 	/**
@@ -48,10 +48,10 @@ 
 	 * @param int $wide
 	 */
 	public function setWide($wide) {
-		if(isset(Wide::getConstants()["W" . $wide])){
-			$wide=Wide::getConstants()["W" . $wide];
+		if (isset(Wide::getConstants()["W".$wide])) {
+			$wide=Wide::getConstants()["W".$wide];
 			$this->addToPropertyCtrl("class", $wide, Wide::getConstants());
-			return $this->addToPropertyCtrl("class", "column", array ("column" ));
+			return $this->addToPropertyCtrl("class", "column", array("column"));
 		}
 		return $this;
 	}
@@ -71,9 +71,9 @@ 
 	 * @return mixed
 	 */
 	public function addRow($colsCount=NULL) {
-		$rowCount=$this->rowCount() + 1;
+		$rowCount=$this->rowCount()+1;
 		$this->setRowsCount($rowCount, $colsCount, true);
-		return $this->content[$rowCount - 1];
+		return $this->content[$rowCount-1];
 	}
 
 	/**
@@ -82,10 +82,10 @@ 
 	 * @return mixed|\Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCol($width=NULL) {
-		$colCount=$this->colCount() + 1;
+		$colCount=$this->colCount()+1;
 		$this->setColsCount($colCount, true, $width);
 		if ($this->hasOnlyCols($this->count()))
-			return $this->content[$colCount - 1];
+			return $this->content[$colCount-1];
 		return $this;
 	}
 
@@ -95,7 +95,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function addCols($sizes=array()) {
-		foreach ( $sizes as $size ) {
+		foreach ($sizes as $size) {
 			$this->addCol($size);
 		}
 		return $this;
@@ -109,19 +109,19 @@ 
 	 */
 	public function setRowsCount($rowsCount, $colsCount=NULL, $force=false) {
 		$count=$this->count();
-		if ($rowsCount < 2 && $force === false) {
-			for($i=$count; $i < $colsCount; $i++) {
-				$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i));
+		if ($rowsCount<2 && $force===false) {
+			for ($i=$count; $i<$colsCount; $i++) {
+				$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i));
 			}
 		} else {
 			if ($this->hasOnlyCols($count)) {
 				$tmpContent=$this->content;
 				$item=$this->addItem($colsCount);
 				$item->setContent($tmpContent);
-				$this->content=array ();
+				$this->content=array();
 				$count=1;
 			}
-			for($i=$count; $i < $rowsCount; $i++) {
+			for ($i=$count; $i<$rowsCount; $i++) {
 				$this->addItem($colsCount);
 			}
 		}
@@ -129,7 +129,7 @@ 
 	}
 
 	protected function hasOnlyCols($count) {
-		return $count > 0 && $this->content[0] instanceof HtmlGridCol;
+		return $count>0 && $this->content[0] instanceof HtmlGridCol;
 	}
 
 	/**
@@ -143,14 +143,14 @@ 
 		if (isset($width)==false) {
 			$this->setWide($numCols);
 		}
-		if ($toCreate == true) {
+		if ($toCreate==true) {
 			$count=$this->count();
-			if ($count == 0 || $this->hasOnlyCols($count)) {
-				for($i=$count; $i < $numCols; $i++) {
-					$this->addItem(new HtmlGridCol("col-" . $this->identifier . "-" . $i, $width));
+			if ($count==0 || $this->hasOnlyCols($count)) {
+				for ($i=$count; $i<$numCols; $i++) {
+					$this->addItem(new HtmlGridCol("col-".$this->identifier."-".$i, $width));
 				}
 			} else {
-				for($i=0; $i < $count; $i++) {
+				for ($i=0; $i<$count; $i++) {
 					$this->getItem($i)->setColsCount($numCols);
 				}
 			}
@@ -186,7 +186,7 @@ 
 		$count=$this->count();
 		if ($this->hasOnlyCols($count))
 			return $count;
-		if ($count > 0)
+		if ($count>0)
 			return $this->getItem(0)->count();
 		return 0;
 	}
@@ -198,7 +198,7 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGridCol
 	 */
 	public function getCell($row, $col) {
-		if ($row < 2 && $this->hasOnlyCols($this->count()))
+		if ($row<2 && $this->hasOnlyCols($this->count()))
 			return $this->getItem($col);
 		$row=$this->getItem($row);
 		if (isset($row)) {
@@ -213,8 +213,8 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setDivided($vertically=false) {
-		$value=($vertically === true) ? "vertically divided" : "divided";
-		return $this->addToPropertyCtrl("class", $value, array ("divided" ));
+		$value=($vertically===true) ? "vertically divided" : "divided";
+		return $this->addToPropertyCtrl("class", $value, array("divided"));
 	}
 
 	/**
@@ -223,15 +223,15 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setCelled($internally=false) {
-		$value=($internally === true) ? "internally celled" : "celled";
-		return $this->addToPropertyCtrl("class", $value, array ("celled","internally celled" ));
+		$value=($internally===true) ? "internally celled" : "celled";
+		return $this->addToPropertyCtrl("class", $value, array("celled", "internally celled"));
 	}
 
 	/**
 	 * A grid can have its columns centered
 	 */
 	public function setCentered() {
-		return $this->addToPropertyCtrl("class", "centered", array ("centered" ));
+		return $this->addToPropertyCtrl("class", "centered", array("centered"));
 	}
 
 	/**
@@ -249,7 +249,7 @@ 
 	 */
 	public function setPadded($value=NULL) {
 		if (isset($value))
-			$this->addToPropertyCtrl("class", $value, array ("vertically","horizontally" ));
+			$this->addToPropertyCtrl("class", $value, array("vertically", "horizontally"));
 		return $this->addToProperty("class", "padded");
 	}
 
@@ -259,12 +259,12 @@ 
 	 * @return \Ajax\semantic\html\collections\HtmlGrid
 	 */
 	public function setRelaxed($very=false) {
-		$value=($very === true) ? "very relaxed" : "relaxed";
-		return $this->addToPropertyCtrl("class", $value, array ("relaxed","very relaxed" ));
+		$value=($very===true) ? "very relaxed" : "relaxed";
+		return $this->addToPropertyCtrl("class", $value, array("relaxed", "very relaxed"));
 	}
 
 	public function setVerticalAlignment($value=VerticalAlignment::MIDDLE) {
-		return $this->addToPropertyCtrl("class", $value . " aligned", VerticalAlignment::getConstantValues("aligned"));
+		return $this->addToPropertyCtrl("class", $value." aligned", VerticalAlignment::getConstantValues("aligned"));
 	}
 
 	/**
@@ -274,9 +274,9 @@ 
 	 * @see \Ajax\common\html\HtmlCollection::createItem()
 	 */
 	protected function createItem($value) {
-		if ($this->_createCols === false)
+		if ($this->_createCols===false)
 			$value=null;
-		$item=new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $value, $this->_colSizing, $this->_implicitRows);
+		$item=new HtmlGridRow($this->identifier."-row-".($this->count()+1), $value, $this->_colSizing, $this->_implicitRows);
 		return $item;
 	}
 
@@ -286,15 +286,15 @@ 
 	 */
 	public function setValues($values, $force=true) {
 		$count=$this->count();
-		if ($this->_createCols === false || $force === true) {
-			for($i=$count; $i < \sizeof($values); $i++) {
+		if ($this->_createCols===false || $force===true) {
+			for ($i=$count; $i<\sizeof($values); $i++) {
 				$colSize=\sizeof($values[$i]);
-				$this->addItem(new HtmlGridRow($this->identifier . "-row-" . ($this->count() + 1), $colSize, $this->_colSizing, $this->_implicitRows));
+				$this->addItem(new HtmlGridRow($this->identifier."-row-".($this->count()+1), $colSize, $this->_colSizing, $this->_implicitRows));
 			}
 		}
-		$count=\min(array ($this->count(),\sizeof($values) ));
-		for($i=0; $i < $count; $i++) {
-			$this->content[$i]->setValues($values[$i], $this->_createCols === false);
+		$count=\min(array($this->count(), \sizeof($values)));
+		for ($i=0; $i<$count; $i++) {
+			$this->content[$i]->setValues($values[$i], $this->_createCols===false);
 		}
 	}