From bc005359f2f0687a035f1c0399689f16e376d44e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Thu, 12 Feb 2004 03:09:22 +0000
Subject: [PATCH] Now contains the DataEditor for the file. No longer uses the
 node monitoring itself, but the watching mechanism provided by the DataEditor
 (it now even does this at the right place). Removed some variables now
 maintained by the DataEditor.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6568 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/apps/diskprobe/ProbeView.cpp | 33 +++++++++++++++-----------------
 src/apps/diskprobe/ProbeView.h   |  8 +++++---
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp
index ee28eccf7f..7c7095ff30 100644
--- a/src/apps/diskprobe/ProbeView.cpp
+++ b/src/apps/diskprobe/ProbeView.cpp
@@ -5,6 +5,7 @@
 
 
 #include "ProbeView.h"
+#include "DataView.h"
 
 #define BEOS_R5_COMPATIBLE
 	// for SetLimits()
@@ -347,24 +348,12 @@ HeaderView::GetPreferredSize(float *_width, float *_height)
 
 
 ProbeView::ProbeView(BRect rect, entry_ref *ref, const char *attribute)
-	: BView(rect, "probeView", B_FOLLOW_ALL, B_WILL_DRAW),
-	fAttribute(attribute)
+	: BView(rect, "probeView", B_FOLLOW_ALL, B_WILL_DRAW)
 {
-	BNode node(ref);
-
-	node_ref nodeRef;
-	if (node.GetNodeRef(&nodeRef) == B_OK)
-		watch_node(&nodeRef, B_WATCH_STAT, this);
-
-	struct stat stat;
-	stat.st_mode = 0;
-
-	BEntry entry(ref);
-	entry.GetStat(&stat);
-	fIsDevice = (stat.st_mode & (S_IFBLK | S_IFCHR)) != 0;
+	fEditor.SetTo(*ref, attribute);
 
 	rect = Bounds();
-	fHeaderView = new HeaderView(rect, ref, fIsDevice, attribute ? fAttribute.String() : NULL);
+	fHeaderView = new HeaderView(rect, ref, fEditor.IsDevice(), fEditor.Attribute());
 	fHeaderView->ResizeToPreferred();
 	AddChild(fHeaderView);
 
@@ -372,7 +361,7 @@ ProbeView::ProbeView(BRect rect, entry_ref *ref, const char *attribute)
 	rect.top = rect.bottom + 3;
 	rect.bottom = Bounds().bottom - B_H_SCROLL_BAR_HEIGHT;
 	rect.right -= B_V_SCROLL_BAR_WIDTH;
-	BView *view = new BView(rect, "text", B_FOLLOW_NONE, B_WILL_DRAW);
+	BView *view = new DataView(rect, fEditor);
 
 	fScrollView = new BScrollView("scroller", view, B_FOLLOW_ALL, B_WILL_DRAW, true, true);
 	AddChild(fScrollView);
@@ -381,7 +370,13 @@ ProbeView::ProbeView(BRect rect, entry_ref *ref, const char *attribute)
 
 ProbeView::~ProbeView()
 {
-	stop_watching(this);
+}
+
+
+void 
+ProbeView::DetachedFromWindow()
+{
+	fEditor.StopWatching(this);
 }
 
 
@@ -399,6 +394,8 @@ ProbeView::AddFileMenuItems(BMenu *menu, int32 index)
 void 
 ProbeView::AttachedToWindow()
 {
+	fEditor.StartWatching(this);
+
 	// Add menu to window
 
 	BMenuBar *bar = Window()->KeyMenuBar();
@@ -410,7 +407,7 @@ ProbeView::AttachedToWindow()
 		MoveBy(0, bar->Bounds().Height());
 		ResizeBy(0, -bar->Bounds().Height());
 
-		BMenu *menu = new BMenu(fAttribute.Length() > 0 ? "Attribute" : fIsDevice ? "Device" : "File");
+		BMenu *menu = new BMenu(fEditor.IsAttribute() ? "Attribute" : fEditor.IsDevice() ? "Device" : "File");
 		AddFileMenuItems(menu, 0);
 		menu->AddSeparatorItem();
 
diff --git a/src/apps/diskprobe/ProbeView.h b/src/apps/diskprobe/ProbeView.h
index fdc5a08940..70f674e631 100644
--- a/src/apps/diskprobe/ProbeView.h
+++ b/src/apps/diskprobe/ProbeView.h
@@ -6,6 +6,8 @@
 #define PROBE_VIEW_H
 
 
+#include "DataEditor.h"
+
 #include <View.h>
 #include <String.h>
 #include <Path.h>
@@ -21,16 +23,16 @@ class ProbeView : public BView {
 		ProbeView(BRect rect, entry_ref *ref, const char *attribute = NULL);
 		virtual ~ProbeView();
 
+		virtual void DetachedFromWindow();
 		virtual void AttachedToWindow();
 		virtual void MessageReceived(BMessage *message);
 
 		void AddFileMenuItems(BMenu *menu, int32 index);
 
 	private:
-		BString			fAttribute;
-		bool			fIsDevice;
+		DataEditor		fEditor;
 		HeaderView		*fHeaderView;
 		BScrollView		*fScrollView;
 };
 
-#endif	/* PROBE_WINDOW_H */
+#endif	/* PROBE_VIEW_H */