hrev50328 adds 3 changesets to branch 'master'
old head: 836a14832190d2718b879ac08fb82a7926b5dd8f
new head: 20df96b029ae00b592e754ff66404b12e7e12414
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=20df96b029ae+%5E836a14832190
----------------------------------------------------------------------------
880a646413bb: Debugger: Cleanup.
TargetHostInterface:
- Adjust _StartTeamDebugger to always require a user interface object to
be passed in rather than implicitly falling back to GUI if unspecified.
Debugger:
- Refactor to be in compliance with the above.
ec60909a20fb: Debugger: Reorganize settings classes.
- Refactor TeamUiSettingsFactory into an abstract base class with implementing
subclass DebuggerUiSettingsFactory.
- Adjust SettingsManager to expect the UiSettingsFactory to be passed in as an
initialization parameter, and refactor accordingly.
- Move GuiTeamUiSettings.* into a user_interface/gui subfolder.
No functional change, simply reorganization towards splitting the debugger's
core functionality into a separate library from the application to aid in
sharing with remote_debug_server.
20df96b029ae: Debugger: Relocate value_handlers.
- As they are currently only used by the VariablesView, move ValueHandler
and related code into user_interface/gui.
[ Rene Gollent <rene@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
29 files changed, 187 insertions(+), 87 deletions(-)
src/apps/debugger/Debugger.cpp | 42 ++++++++--
src/apps/debugger/Jamfile | 28 ++++---
src/apps/debugger/settings/SettingsManager.cpp | 9 +-
src/apps/debugger/settings/SettingsManager.h | 4 +-
src/apps/debugger/settings/TeamSettings.cpp | 5 +-
src/apps/debugger/settings/TeamSettings.h | 4 +-
.../debugger/settings/TeamUiSettingsFactory.cpp | 45 ----------
.../debugger/settings/TeamUiSettingsFactory.h | 9 +-
.../TargetHostInterface.cpp | 13 +--
.../gui/settings/DebuggerUiSettingsFactory.cpp | 86 ++++++++++++++++++++
.../gui/settings/DebuggerUiSettingsFactory.h | 29 +++++++
.../gui}/settings/GuiTeamUiSettings.cpp | 0
.../gui}/settings/GuiTeamUiSettings.h | 0
.../gui}/value/ValueHandler.cpp | 0
.../gui}/value/ValueHandler.h | 0
.../gui}/value/ValueHandlerRoster.cpp | 0
.../gui}/value/ValueHandlerRoster.h | 0
.../value/value_handlers/AddressValueHandler.cpp | 0
.../value/value_handlers/AddressValueHandler.h | 0
.../value/value_handlers/BoolValueHandler.cpp | 0
.../gui}/value/value_handlers/BoolValueHandler.h | 0
.../value_handlers/EnumerationValueHandler.cpp | 0
.../value_handlers/EnumerationValueHandler.h | 0
.../value/value_handlers/FloatValueHandler.cpp | 0
.../value/value_handlers/FloatValueHandler.h | 0
.../value/value_handlers/IntegerValueHandler.cpp | 0
.../value/value_handlers/IntegerValueHandler.h | 0
.../value/value_handlers/StringValueHandler.cpp | 0
.../value/value_handlers/StringValueHandler.h | 0
############################################################################
Commit: 880a646413bb06b0c1a55f1ac2cf38c1b17d937b
URL: http://cgit.haiku-os.org/haiku/commit/?id=880a646413bb
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Thu May 19 02:16:58 2016 UTC
Debugger: Cleanup.
TargetHostInterface:
- Adjust _StartTeamDebugger to always require a user interface object to
be passed in rather than implicitly falling back to GUI if unspecified.
Debugger:
- Refactor to be in compliance with the above.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/Debugger.cpp b/src/apps/debugger/Debugger.cpp
index 0570f37..eb4f484 100644
--- a/src/apps/debugger/Debugger.cpp
+++ b/src/apps/debugger/Debugger.cpp
@@ -418,10 +418,17 @@ Debugger::MessageReceived(BMessage* message)
options.requestType = TEAM_DEBUGGER_REQUEST_ATTACH;
options.settingsManager = &fSettingsManager;
options.team = teamID;
+ options.userInterface = new(std::nothrow)
GraphicalUserInterface;
+ if (options.userInterface == NULL) {
+ // TODO: notify user.
+ break;
+ }
+ BReference<UserInterface>
uiReference(options.userInterface, true);
status_t error = interface->StartTeamDebugger(options);
if (error != B_OK) {
// TODO: notify user.
- }
+ } else
+ uiReference.Detach();
break;
}
case MSG_START_NEW_TEAM:
@@ -576,6 +583,10 @@ Debugger::_StartNewTeam(TargetHostInterface* interface,
const char* path,
TeamDebuggerOptions options;
options.requestType = TEAM_DEBUGGER_REQUEST_CREATE;
options.settingsManager = &fSettingsManager;
+ options.userInterface = new(std::nothrow) GraphicalUserInterface;
+ if (options.userInterface == NULL)
+ return B_NO_MEMORY;
+ BReference<UserInterface> uiReference(options.userInterface, true);
options.commandLineArgc = argVector.ArgumentCount();
if (options.commandLineArgc <= 0)
return B_BAD_VALUE;
@@ -586,8 +597,10 @@ Debugger::_StartNewTeam(TargetHostInterface* interface,
const char* path,
MemoryDeleter deleter(argv);
status_t error = interface->StartTeamDebugger(options);
- if (error == B_OK)
+ if (error == B_OK) {
deleter.Detach();
+ uiReference.Detach();
+ }
return error;
}
@@ -599,10 +612,17 @@ Debugger::_HandleOptions(const Options& options)
TeamDebuggerOptions debuggerOptions;
set_debugger_options_from_options(debuggerOptions, options);
debuggerOptions.settingsManager = &fSettingsManager;
-
+ debuggerOptions.userInterface = new(std::nothrow)
GraphicalUserInterface;
+ if (debuggerOptions.userInterface == NULL)
+ return B_NO_MEMORY;
+ BReference<UserInterface> uiReference(debuggerOptions.userInterface,
true);
TargetHostInterface* hostInterface
= TargetHostInterfaceRoster::Default()->ActiveInterfaceAt(0);
- return hostInterface->StartTeamDebugger(debuggerOptions);
+ status_t error = hostInterface->StartTeamDebugger(debuggerOptions);
+ if (error == B_OK)
+ uiReference.Detach();
+
+ return error;
}
diff --git a/src/apps/debugger/target_host_interface/TargetHostInterface.cpp
b/src/apps/debugger/target_host_interface/TargetHostInterface.cpp
index a910025..d4034f3 100644
--- a/src/apps/debugger/target_host_interface/TargetHostInterface.cpp
+++ b/src/apps/debugger/target_host_interface/TargetHostInterface.cpp
@@ -10,7 +10,6 @@
#include <AutoLocker.h>
#include "DebuggerInterface.h"
-#include "GraphicalUserInterface.h"
#include "MessageCodes.h"
#include "TeamDebugger.h"
@@ -238,16 +237,11 @@ status_t
TargetHostInterface::_StartTeamDebugger(team_id teamID,
const TeamDebuggerOptions& options, bool stopInMain)
{
- BReference<UserInterface> userInterfaceReference;
UserInterface* userInterface = options.userInterface;
if (userInterface == NULL) {
- userInterface = new(std::nothrow) GraphicalUserInterface;
- if (userInterface == NULL) {
- fprintf(stderr, "Error: Out of memory!\n");
- return B_NO_MEMORY;
- }
-
- userInterfaceReference.SetTo(userInterface, true);
+ fprintf(stderr, "Error: Requested team debugger start without "
+ "valid user interface!\n");
+ return B_BAD_VALUE;
}
thread_id threadID = options.thread;
@@ -273,7 +267,6 @@ TargetHostInterface::_StartTeamDebugger(team_id teamID,
}
}
-
BReference<DebuggerInterface> debuggerInterfaceReference(interface,
true);
debugger = new(std::nothrow) TeamDebugger(this, userInterface,
############################################################################
Commit: ec60909a20fb5d87db22583cd87e225e5c67e95e
URL: http://cgit.haiku-os.org/haiku/commit/?id=ec60909a20fb
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun May 22 19:40:46 2016 UTC
Debugger: Reorganize settings classes.
- Refactor TeamUiSettingsFactory into an abstract base class with implementing
subclass DebuggerUiSettingsFactory.
- Adjust SettingsManager to expect the UiSettingsFactory to be passed in as an
initialization parameter, and refactor accordingly.
- Move GuiTeamUiSettings.* into a user_interface/gui subfolder.
No functional change, simply reorganization towards splitting the debugger's
core functionality into a separate library from the application to aid in
sharing with remote_debug_server.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/Debugger.cpp b/src/apps/debugger/Debugger.cpp
index eb4f484..4367b91 100644
--- a/src/apps/debugger/Debugger.cpp
+++ b/src/apps/debugger/Debugger.cpp
@@ -26,6 +26,7 @@
#include "CoreFileDebuggerInterface.h"
#include "CommandLineUserInterface.h"
#include "DebuggerInterface.h"
+#include "DebuggerUiSettingsFactory.h"
#include "GraphicalUserInterface.h"
#include "ImageDebugLoadingStateHandlerRoster.h"
#include "MessageCodes.h"
@@ -233,7 +234,11 @@ parse_arguments(int argc, const char* const* argv, bool
noOutput,
static status_t
global_init(TargetHostInterfaceRoster::Listener* listener)
{
- status_t error = TypeHandlerRoster::CreateDefault();
+ status_t error = DebuggerUiSettingsFactory::CreateDefault();
+ if (error != B_OK)
+ return error;
+
+ error = TypeHandlerRoster::CreateDefault();
if (error != B_OK)
return error;
@@ -331,6 +336,7 @@ Debugger::Debugger()
Debugger::~Debugger()
{
+ DebuggerUiSettingsFactory::DeleteDefault();
ValueHandlerRoster::DeleteDefault();
TypeHandlerRoster::DeleteDefault();
ImageDebugLoadingStateHandlerRoster::DeleteDefault();
@@ -345,7 +351,7 @@ Debugger::Init()
if (error != B_OK)
return error;
- return fSettingsManager.Init();
+ return fSettingsManager.Init(DebuggerUiSettingsFactory::Default());
}
@@ -656,7 +662,7 @@ CliDebugger::Run(const Options& options)
}
SettingsManager settingsManager;
- error = settingsManager.Init();
+ error = settingsManager.Init(DebuggerUiSettingsFactory::Default());
if (error != B_OK) {
fprintf(stderr, "Error: Settings manager initialization failed:
"
"%s\n", strerror(error));
@@ -724,7 +730,7 @@ ReportDebugger::Run(const Options& options)
}
SettingsManager settingsManager;
- error = settingsManager.Init();
+ error = settingsManager.Init(DebuggerUiSettingsFactory::Default());
if (error != B_OK) {
fprintf(stderr, "Error: Settings manager initialization failed:
"
"%s\n", strerror(error));
diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index 5e3306c..cc8d5e5 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -44,6 +44,7 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui
expression_eval_window ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui inspector_window ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui model ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui settings ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui team_window ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui team_settings_window
] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui teams_window ] ;
@@ -216,7 +217,6 @@ local sources =
# settings
BreakpointSetting.cpp
- GuiTeamUiSettings.cpp
SettingsManager.cpp
TeamFileManagerSettings.cpp
TeamSettings.cpp
@@ -296,6 +296,10 @@ local sources =
InspectorWindow.cpp
MemoryView.cpp
+ # user_interface/gui/settings
+ DebuggerUiSettingsFactory.cpp
+ GuiTeamUiSettings.cpp
+
# user_interface/gui/teams_window
TeamsWindow.cpp
TeamsListView.cpp
diff --git a/src/apps/debugger/settings/SettingsManager.cpp
b/src/apps/debugger/settings/SettingsManager.cpp
index c3a56cc..7efe77b 100644
--- a/src/apps/debugger/settings/SettingsManager.cpp
+++ b/src/apps/debugger/settings/SettingsManager.cpp
@@ -26,7 +26,8 @@ static const int32 kMaxRecentTeamSettings = 10;
SettingsManager::SettingsManager()
:
fLock("settings manager"),
- fRecentTeamSettings(kMaxRecentTeamSettings, true)
+ fRecentTeamSettings(kMaxRecentTeamSettings, true),
+ fUiSettingsFactory(NULL)
{
}
@@ -38,13 +39,15 @@ SettingsManager::~SettingsManager()
status_t
-SettingsManager::Init()
+SettingsManager::Init(TeamUiSettingsFactory* factory)
{
// check the lock
status_t error = fLock.InitCheck();
if (error != B_OK)
return error;
+ fUiSettingsFactory = factory;
+
// get and create our settings directory
if (find_directory(B_USER_SETTINGS_DIRECTORY, &fSettingsPath, true) ==
B_OK
&& fSettingsPath.Append(kSettingsDirPath) == B_OK
@@ -147,7 +150,7 @@ SettingsManager::_LoadSettings()
if (settings == NULL)
return B_NO_MEMORY;
- error = settings->SetTo(childArchive);
+ error = settings->SetTo(childArchive, *fUiSettingsFactory);
if (error != B_OK) {
delete settings;
continue;
diff --git a/src/apps/debugger/settings/SettingsManager.h
b/src/apps/debugger/settings/SettingsManager.h
index 6dc9465..7a007d9 100644
--- a/src/apps/debugger/settings/SettingsManager.h
+++ b/src/apps/debugger/settings/SettingsManager.h
@@ -13,6 +13,7 @@
class TeamSettings;
+class TeamUiSettingsFactory;
class SettingsManager {
@@ -20,7 +21,7 @@ public:
SettingsManager();
~SettingsManager();
- status_t Init();
+ status_t
Init(TeamUiSettingsFactory* factory);
status_t LoadTeamSettings(const
char* teamName,
TeamSettings& settings);
@@ -41,6 +42,7 @@ private:
BLocker fLock;
BPath fSettingsPath;
TeamSettingsList fRecentTeamSettings; //
oldest is first
+ TeamUiSettingsFactory* fUiSettingsFactory;
};
diff --git a/src/apps/debugger/settings/TeamSettings.cpp
b/src/apps/debugger/settings/TeamSettings.cpp
index 0ce088b..54a0480 100644
--- a/src/apps/debugger/settings/TeamSettings.cpp
+++ b/src/apps/debugger/settings/TeamSettings.cpp
@@ -97,7 +97,8 @@ TeamSettings::SetTo(Team* team)
status_t
-TeamSettings::SetTo(const BMessage& archive)
+TeamSettings::SetTo(const BMessage& archive,
+ const TeamUiSettingsFactory& factory)
{
_Unset();
@@ -127,7 +128,7 @@ TeamSettings::SetTo(const BMessage& archive)
for (int32 i = 0; archive.FindMessage("uisettings", i, &childArchive)
== B_OK; i++) {
TeamUiSettings* setting = NULL;
- error = TeamUiSettingsFactory::Create(childArchive, setting);
+ error = factory.Create(childArchive, setting);
if (error == B_OK && !fUiSettings.AddItem(setting))
error = B_NO_MEMORY;
if (error != B_OK) {
diff --git a/src/apps/debugger/settings/TeamSettings.h
b/src/apps/debugger/settings/TeamSettings.h
index 1bd14f5..2e5e45f 100644
--- a/src/apps/debugger/settings/TeamSettings.h
+++ b/src/apps/debugger/settings/TeamSettings.h
@@ -18,6 +18,7 @@ class Team;
class TeamFileManagerSettings;
class TeamSignalSettings;
class TeamUiSettings;
+class TeamUiSettingsFactory;
class TeamSettings {
@@ -28,7 +29,8 @@ public:
~TeamSettings();
status_t SetTo(Team* team);
- status_t SetTo(const BMessage&
archive);
+ status_t SetTo(const BMessage&
archive,
+ const
TeamUiSettingsFactory& factory);
status_t WriteTo(BMessage&
archive) const;
const BString& TeamName() const {
return fTeamName; }
diff --git a/src/apps/debugger/settings/TeamUiSettingsFactory.cpp
b/src/apps/debugger/settings/TeamUiSettingsFactory.cpp
index 4ff393e..e6448fd 100644
--- a/src/apps/debugger/settings/TeamUiSettingsFactory.cpp
+++ b/src/apps/debugger/settings/TeamUiSettingsFactory.cpp
@@ -6,52 +6,7 @@
#include "TeamUiSettingsFactory.h"
-#include <Message.h>
-
-#include "GuiTeamUiSettings.h"
-
-
-TeamUiSettingsFactory::TeamUiSettingsFactory()
-{
-}
-
TeamUiSettingsFactory::~TeamUiSettingsFactory()
{
}
-
-
-status_t
-TeamUiSettingsFactory::Create(const BMessage& archive,
- TeamUiSettings*& settings)
-{
- int32 type;
- status_t error = archive.FindInt32("type", &type);
- if (error != B_OK)
- return error;
-
- switch (type) {
- case TEAM_UI_SETTINGS_TYPE_GUI:
- settings = new(std::nothrow) GuiTeamUiSettings();
- if (settings == NULL)
- return B_NO_MEMORY;
-
- error = settings->SetTo(archive);
- if (error != B_OK) {
- delete settings;
- settings = NULL;
- return error;
- }
- break;
-
- case TEAM_UI_SETTINGS_TYPE_CLI:
- // TODO: implement once we have a CLI interface
- // (and corresponding settings)
- return B_UNSUPPORTED;
-
- default:
- return B_BAD_DATA;
- }
-
- return B_OK;
-}
diff --git a/src/apps/debugger/settings/TeamUiSettingsFactory.h
b/src/apps/debugger/settings/TeamUiSettingsFactory.h
index 8ec0b3c..04d0b30 100644
--- a/src/apps/debugger/settings/TeamUiSettingsFactory.h
+++ b/src/apps/debugger/settings/TeamUiSettingsFactory.h
@@ -14,11 +14,10 @@ class TeamUiSettings;
class TeamUiSettingsFactory {
public:
-
TeamUiSettingsFactory();
-
~TeamUiSettingsFactory();
-
- static status_t Create(const BMessage& archive,
-
TeamUiSettings*& settings);
+ virtual
~TeamUiSettingsFactory();
+
+ virtual status_t Create(const BMessage& archive,
+
TeamUiSettings*& settings) const = 0;
};
#endif // TEAM_UI_SETTINGS_FACTORY_H
diff --git
a/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.cpp
b/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.cpp
new file mode 100644
index 0000000..ee2b010
--- /dev/null
+++
b/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.cpp
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2011-2016, Rene Gollent, rene@xxxxxxxxxxx.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include "DebuggerUiSettingsFactory.h"
+
+#include <Message.h>
+
+#include "GuiTeamUiSettings.h"
+
+
+DebuggerUiSettingsFactory* DebuggerUiSettingsFactory::sDefaultInstance = NULL;
+
+
+DebuggerUiSettingsFactory::DebuggerUiSettingsFactory()
+{
+}
+
+
+DebuggerUiSettingsFactory::~DebuggerUiSettingsFactory()
+{
+}
+
+
+DebuggerUiSettingsFactory*
+DebuggerUiSettingsFactory::Default()
+{
+ return sDefaultInstance;
+}
+
+
+status_t
+DebuggerUiSettingsFactory::CreateDefault()
+{
+ sDefaultInstance = new(std::nothrow) DebuggerUiSettingsFactory();
+ if (sDefaultInstance == NULL)
+ return B_NO_MEMORY;
+
+ return B_OK;
+}
+
+
+void
+DebuggerUiSettingsFactory::DeleteDefault()
+{
+ delete sDefaultInstance;
+ sDefaultInstance = NULL;
+}
+
+
+status_t
+DebuggerUiSettingsFactory::Create(const BMessage& archive,
+ TeamUiSettings*& settings) const
+{
+ int32 type;
+ status_t error = archive.FindInt32("type", &type);
+ if (error != B_OK)
+ return error;
+
+ switch (type) {
+ case TEAM_UI_SETTINGS_TYPE_GUI:
+ settings = new(std::nothrow) GuiTeamUiSettings();
+ if (settings == NULL)
+ return B_NO_MEMORY;
+
+ error = settings->SetTo(archive);
+ if (error != B_OK) {
+ delete settings;
+ settings = NULL;
+ return error;
+ }
+ break;
+
+ case TEAM_UI_SETTINGS_TYPE_CLI:
+ // TODO: implement once we have a CLI interface
+ // (and corresponding settings)
+ return B_UNSUPPORTED;
+
+ default:
+ return B_BAD_DATA;
+ }
+
+ return B_OK;
+}
diff --git
a/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.h
b/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.h
new file mode 100644
index 0000000..42c5137
--- /dev/null
+++ b/src/apps/debugger/user_interface/gui/settings/DebuggerUiSettingsFactory.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2011-2016, Rene Gollent, rene@xxxxxxxxxxx.
+ * Distributed under the terms of the MIT License.
+ */
+#ifndef DEBUGGER_UI_SETTINGS_FACTORY_H
+#define DEBUGGER_UI_SETTINGS_FACTORY_H
+
+
+#include "TeamUiSettingsFactory.h"
+
+
+class DebuggerUiSettingsFactory : public TeamUiSettingsFactory {
+public:
+
+ static DebuggerUiSettingsFactory* Default();
+ static status_t CreateDefault();
+ static void DeleteDefault();
+
+ virtual status_t Create(const BMessage& archive,
+
TeamUiSettings*& settings) const;
+
+private:
+
DebuggerUiSettingsFactory();
+ virtual
~DebuggerUiSettingsFactory();
+
+ static DebuggerUiSettingsFactory* sDefaultInstance;
+};
+
+#endif // DEBUGGER_UI_SETTINGS_FACTORY_H
diff --git a/src/apps/debugger/settings/GuiTeamUiSettings.cpp
b/src/apps/debugger/user_interface/gui/settings/GuiTeamUiSettings.cpp
similarity index 100%
rename from src/apps/debugger/settings/GuiTeamUiSettings.cpp
rename to src/apps/debugger/user_interface/gui/settings/GuiTeamUiSettings.cpp
diff --git a/src/apps/debugger/settings/GuiTeamUiSettings.h
b/src/apps/debugger/user_interface/gui/settings/GuiTeamUiSettings.h
similarity index 100%
rename from src/apps/debugger/settings/GuiTeamUiSettings.h
rename to src/apps/debugger/user_interface/gui/settings/GuiTeamUiSettings.h
############################################################################
Revision: hrev50328
Commit: 20df96b029ae00b592e754ff66404b12e7e12414
URL: http://cgit.haiku-os.org/haiku/commit/?id=20df96b029ae
Author: Rene Gollent <rene@xxxxxxxxxxx>
Date: Sun May 22 19:54:39 2016 UTC
Debugger: Relocate value_handlers.
- As they are currently only used by the VariablesView, move ValueHandler
and related code into user_interface/gui.
----------------------------------------------------------------------------
diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile
index cc8d5e5..261b1e4 100644
--- a/src/apps/debugger/Jamfile
+++ b/src/apps/debugger/Jamfile
@@ -51,13 +51,13 @@ SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui
teams_window ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui utility_windows ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui util ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui value ] ;
+SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface gui value value_handlers
] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface report ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) user_interface util ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) util ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) value ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) value type_handlers ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) value value_formatters ] ;
-SEARCH_SOURCE += [ FDirName $(SUBDIR) value value_handlers ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) value value_nodes ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) value values ] ;
@@ -350,6 +350,16 @@ local sources =
TableCellValueEditor.cpp
TableCellValueRenderer.cpp
TableCellValueRendererUtils.cpp
+ ValueHandler.cpp
+ ValueHandlerRoster.cpp
+
+ # user_interface/gui/value/value_handlers
+ AddressValueHandler.cpp
+ BoolValueHandler.cpp
+ EnumerationValueHandler.cpp
+ FloatValueHandler.cpp
+ IntegerValueHandler.cpp
+ StringValueHandler.cpp
# user_interface/report
ReportUserInterface.cpp
@@ -370,8 +380,6 @@ local sources =
TypeHandlerRoster.cpp
Value.cpp
ValueFormatter.cpp
- ValueHandler.cpp
- ValueHandlerRoster.cpp
ValueLoader.cpp
ValueNode.cpp
ValueNodeContainer.cpp
@@ -390,14 +398,6 @@ local sources =
FloatValueFormatter.cpp
StringValueFormatter.cpp
- # value/value_handlers
- AddressValueHandler.cpp
- BoolValueHandler.cpp
- EnumerationValueHandler.cpp
- FloatValueHandler.cpp
- IntegerValueHandler.cpp
- StringValueHandler.cpp
-
# value/value_nodes
AddressValueNode.cpp
ArrayValueNode.cpp
diff --git a/src/apps/debugger/value/ValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/ValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/ValueHandler.cpp
rename to src/apps/debugger/user_interface/gui/value/ValueHandler.cpp
diff --git a/src/apps/debugger/value/ValueHandler.h
b/src/apps/debugger/user_interface/gui/value/ValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/ValueHandler.h
rename to src/apps/debugger/user_interface/gui/value/ValueHandler.h
diff --git a/src/apps/debugger/value/ValueHandlerRoster.cpp
b/src/apps/debugger/user_interface/gui/value/ValueHandlerRoster.cpp
similarity index 100%
rename from src/apps/debugger/value/ValueHandlerRoster.cpp
rename to src/apps/debugger/user_interface/gui/value/ValueHandlerRoster.cpp
diff --git a/src/apps/debugger/value/ValueHandlerRoster.h
b/src/apps/debugger/user_interface/gui/value/ValueHandlerRoster.h
similarity index 100%
rename from src/apps/debugger/value/ValueHandlerRoster.h
rename to src/apps/debugger/user_interface/gui/value/ValueHandlerRoster.h
diff --git a/src/apps/debugger/value/value_handlers/AddressValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/AddressValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/AddressValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/AddressValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/AddressValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/AddressValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/AddressValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/AddressValueHandler.h
diff --git a/src/apps/debugger/value/value_handlers/BoolValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/BoolValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/BoolValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/BoolValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/BoolValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/BoolValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/BoolValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/BoolValueHandler.h
diff --git a/src/apps/debugger/value/value_handlers/EnumerationValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/EnumerationValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/EnumerationValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/EnumerationValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/EnumerationValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/EnumerationValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/EnumerationValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/EnumerationValueHandler.h
diff --git a/src/apps/debugger/value/value_handlers/FloatValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/FloatValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/FloatValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/FloatValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/FloatValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/FloatValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/FloatValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/FloatValueHandler.h
diff --git a/src/apps/debugger/value/value_handlers/IntegerValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/IntegerValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/IntegerValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/IntegerValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/IntegerValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/IntegerValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/IntegerValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/IntegerValueHandler.h
diff --git a/src/apps/debugger/value/value_handlers/StringValueHandler.cpp
b/src/apps/debugger/user_interface/gui/value/value_handlers/StringValueHandler.cpp
similarity index 100%
rename from src/apps/debugger/value/value_handlers/StringValueHandler.cpp
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/StringValueHandler.cpp
diff --git a/src/apps/debugger/value/value_handlers/StringValueHandler.h
b/src/apps/debugger/user_interface/gui/value/value_handlers/StringValueHandler.h
similarity index 100%
rename from src/apps/debugger/value/value_handlers/StringValueHandler.h
rename to
src/apps/debugger/user_interface/gui/value/value_handlers/StringValueHandler.h
