Remove project support from navigator, for testingorigin/mmacdonald/project_hack

2 files changed, 17 insertions, 17 deletions

diff --git a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
index 541dcf7..e404722 100644
--- a/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
+++ b/bundles/org.eclipse.orion.client.ui/web/edit/setup.js
@@ -45,7 +45,7 @@ define([
 	'orion/objects',
 	'orion/webui/littlelib',
 	'orion/Deferred',
-	'orion/projectClient'
+//	'orion/projectClient'
 ], function(
 	messages, Sidebar, mInputManager, mGlobalCommands,
 	mTextModel, mUndoStack,
@@ -114,16 +114,16 @@ objects.mixin(MenuBar.prototype, {
 		var commandRegistry = this.commandRegistry;
 		var fileClient = this.fileClient;
 		return mFileCommands.createFileCommands(serviceRegistry, commandRegistry, fileClient).then(function() {
-			return mExtensionCommands.createFileCommands(serviceRegistry, null, "all", true, commandRegistry).then(function() { //$NON-NLS-0$
-				var projectClient = serviceRegistry.getService("orion.project.client"); //$NON-NLS-0$
-				return projectClient.getProjectHandlerTypes().then(function(dependencyTypes){
-					return projectClient.getProjectDeployTypes().then(function(deployTypes){
-						return ProjectCommands.createProjectCommands(serviceRegistry, commandRegistry, fileClient, projectClient, dependencyTypes, deployTypes);
-					}, function(){
-						return ProjectCommands.createProjectCommands(serviceRegistry, commandRegistry, fileClient, projectClient, dependencyTypes);
-					});
-				});
-			});
+			return mExtensionCommands.createFileCommands(serviceRegistry, null, "all", true, commandRegistry);//.then(function() { //$NON-NLS-0$
+//				var projectClient = serviceRegistry.getService("orion.project.client"); //$NON-NLS-0$
+//				return projectClient.getProjectHandlerTypes().then(function(dependencyTypes){
+//					return projectClient.getProjectDeployTypes().then(function(deployTypes){
+//						return ProjectCommands.createProjectCommands(serviceRegistry, commandRegistry, fileClient, projectClient, dependencyTypes, deployTypes);
+//					}, function(){
+//						return ProjectCommands.createProjectCommands(serviceRegistry, commandRegistry, fileClient, projectClient, dependencyTypes);
+//					});
+//				});
+//			});
 		});
 	},
 	setActiveExplorer: function(explorer) {
@@ -181,7 +181,7 @@ objects.mixin(EditorSetup.prototype, {
 		this.outlineService = new mOutliner.OutlineService({serviceRegistry: serviceRegistry, preferences: this.preferences});
 		this.contentTypeRegistry = new mContentTypes.ContentTypeRegistry(serviceRegistry);
 		this.fileClient = new mFileClient.FileClient(serviceRegistry);
-		this.projectClient = new mProjectClient.ProjectClient(serviceRegistry, this.fileClient);
+		this.projectClient = null; //new mProjectClient.ProjectClient(serviceRegistry, this.fileClient);
 		this.searcher = new mSearchClient.Searcher({serviceRegistry: serviceRegistry, commandService: this.commandRegistry, fileService: this.fileClient});
 		this.blameService = new mBlameAnnotation.BlameService(serviceRegistry);
 	},
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js
index 300af02..57d5919 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/projects/projectView.js
@@ -108,11 +108,11 @@ define([
 					return;
 				}
 				if(parent){
-					_self.progress.progress(_self.projectClient.readAllProjects(parent), messages['listingProjects']).then(function(projects){
-						_self.workspace = parent;
-						_self.projects = projects;
-						_self.projectExplorer.loadProjects(projects);
-					});
+//					_self.progress.progress(_self.projectClient.readAllProjects(parent), messages['listingProjects']).then(function(projects){
+//						_self.workspace = parent;
+//						_self.projects = projects;
+//						_self.projectExplorer.loadProjects(projects);
+//					});
 				} else {
 					_self.progress.progress(_self.fileClient.loadWorkspace(), messages['gettingWorkspaceInfo']).then(function(workspace){
 						_self.progress.progress(_self.projectClient.readAllProjects(parent), messages['listingProjects']).then(function(projects){