@@ -13,13 +13,15 @@ discard block |
||
| 13 | 13 | |
| 14 | 14 | public static function get (int $selector): ?NetObject |
| 15 | 15 | { |
| 16 | - if (!isset (self::$objects[$selector])) |
|
| 17 | - return null; |
|
| 16 | + if (!isset (self::$objects[$selector])) { |
|
| 17 | + return null; |
|
| 18 | + } |
|
| 18 | 19 | |
| 19 | 20 | $object = self::$objects[$selector]->get (); |
| 20 | 21 | |
| 21 | - if ($object === null) |
|
| 22 | - self::remove ($selector); |
|
| 22 | + if ($object === null) { |
|
| 23 | + self::remove ($selector); |
|
| 24 | + } |
|
| 23 | 25 | |
| 24 | 26 | return $object; |
| 25 | 27 | } |
@@ -41,9 +43,10 @@ discard block |
||
| 41 | 43 | |
| 42 | 44 | public static function clean (): void |
| 43 | 45 | { |
| 44 | - foreach (self::$objects as $selector => $reference) |
|
| 45 | - if ($reference->get () === null) |
|
| 46 | + foreach (self::$objects as $selector => $reference) { |
|
| 47 | + if ($reference->get () === null) |
|
| 46 | 48 | unset (self::$objects[$selector]); |
| 49 | + } |
|
| 47 | 50 | } |
| 48 | 51 | } |
| 49 | 52 | |
@@ -55,23 +58,24 @@ discard block |
||
| 55 | 58 | // TODO: поддержка многоуровневых ссылок вида родитель->родитель->объект |
| 56 | 59 | function c (string $name): ?NetObject |
| 57 | 60 | { |
| 58 | - if (is_int ($name) && ($object = _c($name)) !== null) |
|
| 59 | - return $object; |
|
| 61 | + if (is_int ($name) && ($object = _c($name)) !== null) { |
|
| 62 | + return $object; |
|
| 63 | + } |
|
| 60 | 64 | |
| 61 | 65 | foreach (Components::getObjects () as $selector => $reference) |
| 62 | 66 | { |
| 63 | 67 | $object = $reference->get (); |
| 64 | 68 | |
| 65 | - if ($object === null) |
|
| 66 | - continue; |
|
| 69 | + if ($object === null) { |
|
| 70 | + continue; |
|
| 71 | + } |
|
| 67 | 72 | |
| 68 | 73 | try |
| 69 | 74 | { |
| 70 | - if ($object->name == $name) |
|
| 71 | - return $object; |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - catch (\WinformsException $e) {} |
|
| 75 | + if ($object->name == $name) { |
|
| 76 | + return $object; |
|
| 77 | + } |
|
| 78 | + } catch (\WinformsException $e) {} |
|
| 75 | 79 | } |
| 76 | 80 | |
| 77 | 81 | return null; |