From e518b0a898e545ebea58734262cccf2a8006127c Mon Sep 17 00:00:00 2001 From: yggverse Date: Tue, 9 Apr 2024 16:56:25 +0300 Subject: [PATCH] encapsulate memory container --- src/Box/Main.php | 11 ++++++++--- src/Yoda.php | 3 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/Box/Main.php b/src/Box/Main.php index 98bcb4e..9367c14 100644 --- a/src/Box/Main.php +++ b/src/Box/Main.php @@ -13,9 +13,15 @@ class Main public \Yggverse\Yoda\Label\Content $content; public \Yggverse\Yoda\Label\Tray $tray; + public \Yggverse\Yoda\Model\Memory $memory; + public function __construct( string $name = 'boxMain' ) { + // Init memory + $this->memory = new \Yggverse\Yoda\Model\Memory(); + + // Init container $this->box = new \GtkBox( \GtkOrientation::VERTICAL ); @@ -72,7 +78,6 @@ class Main function ($entry) { global $config; - global $memory; $this->tray->label->set_text( sprintf( @@ -93,7 +98,7 @@ class Main $name = $address->getHost(); - if (!$host = $memory->get($name)) + if (!$host = $this->memory->get($name)) { $resolve = new \Yggverse\Net\Resolve( $config->resolver->request->record, @@ -110,7 +115,7 @@ class Main { $host = $resolved->getHost(); - $memory->set( + $this->memory->set( $name, $host ); diff --git a/src/Yoda.php b/src/Yoda.php index 5785955..6e58d05 100644 --- a/src/Yoda.php +++ b/src/Yoda.php @@ -9,9 +9,6 @@ require_once __DIR__ . // Init config $config = \Yggverse\Yoda\Model\File::getConfig(); -// Init memory -$memory = new \Yggverse\Yoda\Model\Memory(); - // Init GTK \Gtk::init();