syntaxAlchemist/lib-nested
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity

port: rename observers to cast

Browse source
This commit is contained in:
Michael Sippel 2021-05-16 23:47:17 +02:00
parent 89a6f84114
commit f8b5da1393
Signed by: senvas
GPG key ID: F96CF119C34B64A6
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
nested/src/core/port.rs
View file

@ -18,14 +18,14 @@ use {
\*/ \*/
pub struct ViewPort<V: View + ?Sized> { pub struct ViewPort<V: View + ?Sized> {
view: Arc<RwLock<Option<Arc<V>>>>, view: Arc<RwLock<Option<Arc<V>>>>,
observers: Arc<RwLock<ObserverBroadcast<V>>> cast: Arc<RwLock<ObserverBroadcast<V>>>
} }
impl<V: View + ?Sized> ViewPort<V> { impl<V: View + ?Sized> ViewPort<V> {
pub fn new() -> Self { pub fn new() -> Self {
ViewPort { ViewPort {
view: Arc::new(RwLock::new(None)), view: Arc::new(RwLock::new(None)),
observers: Arc::new(RwLock::new(ObserverBroadcast::new())) cast: Arc::new(RwLock::new(ObserverBroadcast::new()))
} }
} }
@ -37,28 +37,28 @@ impl<V: View + ?Sized> ViewPort<V> {
pub fn set_view(&self, view: Option<Arc<V>>) { pub fn set_view(&self, view: Option<Arc<V>>) {
*self.view.write().unwrap() = view.clone(); *self.view.write().unwrap() = view.clone();
self.observers.write().unwrap().reset(view); self.cast.write().unwrap().reset(view);
} }
pub fn add_observer(&self, observer: Arc<RwLock<dyn Observer<V>>>) { pub fn add_observer(&self, observer: Arc<RwLock<dyn Observer<V>>>) {
self.observers.write().unwrap().add_observer(Arc::downgrade(&observer)); self.cast.write().unwrap().add_observer(Arc::downgrade(&observer));
observer.write().unwrap().reset(self.view.read().unwrap().clone()); observer.write().unwrap().reset(self.view.read().unwrap().clone());
} }
pub fn inner(&self) -> InnerViewPort<V> { pub fn inner(&self) -> InnerViewPort<V> {
InnerViewPort(ViewPort{ view: self.view.clone(), observers: self.observers.clone() }) InnerViewPort(ViewPort{ view: self.view.clone(), cast: self.cast.clone() })
} }
pub fn outer(&self) -> OuterViewPort<V> { pub fn outer(&self) -> OuterViewPort<V> {
OuterViewPort(ViewPort{ view: self.view.clone(), observers: self.observers.clone() }) OuterViewPort(ViewPort{ view: self.view.clone(), cast: self.cast.clone() })
} }
pub fn into_inner(self) -> InnerViewPort<V> { pub fn into_inner(self) -> InnerViewPort<V> {
InnerViewPort(ViewPort{ view: self.view, observers: self.observers }) InnerViewPort(ViewPort{ view: self.view, cast: self.cast })
} }
pub fn into_outer(self) -> OuterViewPort<V> { pub fn into_outer(self) -> OuterViewPort<V> {
OuterViewPort(ViewPort{ view: self.view, observers: self.observers }) OuterViewPort(ViewPort{ view: self.view, cast: self.cast })
} }
} }
@ -66,7 +66,7 @@ impl<V: View + ?Sized> Clone for ViewPort<V> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
ViewPort { ViewPort {
view: self.view.clone(), view: self.view.clone(),
observers: self.observers.clone() cast: self.cast.clone()
} }
} }
} }
@ -80,7 +80,7 @@ pub struct OuterViewPort<V: View + ?Sized>(ViewPort<V>);
impl<V: View + ?Sized> InnerViewPort<V> { impl<V: View + ?Sized> InnerViewPort<V> {
pub fn get_broadcast(&self) -> Arc<RwLock<ObserverBroadcast<V>>> { pub fn get_broadcast(&self) -> Arc<RwLock<ObserverBroadcast<V>>> {
self.0.observers.clone() self.0.cast.clone()
} }
pub fn set_view(&self, view: Option<Arc<V>>) -> Arc<RwLock<ObserverBroadcast<V>>> { pub fn set_view(&self, view: Option<Arc<V>>) -> Arc<RwLock<ObserverBroadcast<V>>> {
@ -93,7 +93,7 @@ impl<V: View + ?Sized> InnerViewPort<V> {
} }
pub fn notify(&self, msg: &V::Msg) { pub fn notify(&self, msg: &V::Msg) {
self.0.observers.read().unwrap().notify(msg); self.0.cast.read().unwrap().notify(msg);
} }
} }
@ -163,16 +163,16 @@ where V::Msg: Clone {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct AnyViewPort { pub struct AnyViewPort {
view: Arc<dyn Any + Send + Sync + 'static>, view: Arc<dyn Any + Send + Sync + 'static>,
observers: Arc<dyn Any + Send + Sync + 'static> cast: Arc<dyn Any + Send + Sync + 'static>
} }
impl AnyViewPort { impl AnyViewPort {
pub fn downcast<V: View + ?Sized + 'static>(self) -> Result<ViewPort<V>, AnyViewPort> { pub fn downcast<V: View + ?Sized + 'static>(self) -> Result<ViewPort<V>, AnyViewPort> {
match ( match (
self.view.clone().downcast::<RwLock<Option<Arc<V>>>>(), self.view.clone().downcast::<RwLock<Option<Arc<V>>>>(),
self.observers.clone().downcast::<RwLock<ObserverBroadcast<V>>>() self.cast.clone().downcast::<RwLock<ObserverBroadcast<V>>>()
) { ) {
(Ok(view), Ok(observers)) => Ok(ViewPort{view, observers}), (Ok(view), Ok(cast)) => Ok(ViewPort{view, cast}),
_ => Err(self) _ => Err(self)
} }
} }
@ -182,7 +182,7 @@ impl<V: View + ?Sized + 'static> From<ViewPort<V>> for AnyViewPort {
fn from(port: ViewPort<V>) -> Self { fn from(port: ViewPort<V>) -> Self {
AnyViewPort { AnyViewPort {
view: port.view as Arc<dyn Any + Send + Sync + 'static>, view: port.view as Arc<dyn Any + Send + Sync + 'static>,
observers: port.observers as Arc<dyn Any + Send + Sync + 'static> cast: port.cast as Arc<dyn Any + Send + Sync + 'static>
} }
} }
} }
@ -205,7 +205,7 @@ impl<V: View + ?Sized + 'static> From<OuterViewPort<V>> for AnyOuterViewPort {
fn from(port: OuterViewPort<V>) -> Self { fn from(port: OuterViewPort<V>) -> Self {
AnyOuterViewPort(AnyViewPort{ AnyOuterViewPort(AnyViewPort{
view: port.0.view as Arc<dyn Any + Send + Sync + 'static>, view: port.0.view as Arc<dyn Any + Send + Sync + 'static>,
observers: port.0.observers as Arc<dyn Any + Send + Sync + 'static> cast: port.0.cast as Arc<dyn Any + Send + Sync + 'static>
}) })
} }
} }
@ -220,7 +220,7 @@ impl<V: View + ?Sized + 'static> From<InnerViewPort<V>> for AnyInnerViewPort {
fn from(port: InnerViewPort<V>) -> Self { fn from(port: InnerViewPort<V>) -> Self {
AnyInnerViewPort(AnyViewPort{ AnyInnerViewPort(AnyViewPort{
view: port.0.view as Arc<dyn Any + Send + Sync + 'static>, view: port.0.view as Arc<dyn Any + Send + Sync + 'static>,
observers: port.0.observers as Arc<dyn Any + Send + Sync + 'static> cast: port.0.cast as Arc<dyn Any + Send + Sync + 'static>
}) })
} }
} }