* MonoDevelop.Projects/Project.cs, MonoDevelop.Projects/IBuildStep.cs:

  Removed unused stuff.
* Makefile.am, MonoDevelop.Projects.addin.xml,
  MonoDevelop.Projects.mdp, MonoDevelop.Projects/CombineEntry.cs,
  MonoDevelop.Projects/Workspace.cs: Added Workspace class. Used to
  group independent solutions.

svn path=/trunk/monodevelop/; revision=90076

7 files changed, 16 insertions, 48 deletions

diff --git a/Core/src/MonoDevelop.Projects/ChangeLog b/Core/src/MonoDevelop.Projects/ChangeLog
index 8308633224..307a0fa1d2 100644
--- a/Core/src/MonoDevelop.Projects/ChangeLog
+++ b/Core/src/MonoDevelop.Projects/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-21  Lluis Sanchez Gual <lluis@novell.com> 
+
+	* MonoDevelop.Projects/Project.cs, MonoDevelop.Projects/IBuildStep.cs:
+	  Removed unused stuff.
+	* Makefile.am, MonoDevelop.Projects.addin.xml, MonoDevelop.Projects.mdp,
+	  MonoDevelop.Projects/CombineEntry.cs, MonoDevelop.Projects/Workspace.cs:
+	  Added Workspace class. Used to group independent solutions.
+
 2007-11-19  Michael Hutchinson <mhutchinson@novell.com> 
 
 	* MonoDevelop.Projects/Combine.cs: Catch some potential nulls and replace
diff --git a/Core/src/MonoDevelop.Projects/Makefile.am b/Core/src/MonoDevelop.Projects/Makefile.am
index 009c7adbe3..47ce97137f 100644
--- a/Core/src/MonoDevelop.Projects/Makefile.am
+++ b/Core/src/MonoDevelop.Projects/Makefile.am
@@ -197,7 +197,6 @@ FILES =  \
 	MonoDevelop.Projects/FileFormatManager.cs \
 	MonoDevelop.Projects/GenericProject.cs \
 	MonoDevelop.Projects/GenericProjectBinding.cs \
-	MonoDevelop.Projects/IBuildStep.cs \
 	MonoDevelop.Projects/ICompilerResult.cs \
 	MonoDevelop.Projects/IConfiguration.cs \
 	MonoDevelop.Projects/IDotNetLanguageBinding.cs \
@@ -228,7 +227,8 @@ FILES =  \
 	MonoDevelop.Projects/SharpDevelopFileFormat.cs \
 	MonoDevelop.Projects/TypelibImporter.cs \
 	MonoDevelop.Projects/UnknownCombineEntry.cs \
-	MonoDevelop.Projects/UnknownProjectVersionException.cs
+	MonoDevelop.Projects/UnknownProjectVersionException.cs \
+	MonoDevelop.Projects/Workspace.cs
 
 RES = MonoDevelop.Projects.addin.xml 
 
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
index 97878dcfcc..77a128b9b3 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
@@ -89,6 +89,7 @@
 	<Extension path = "/MonoDevelop/ProjectModel/SerializableClasses">
 		<DataType class = "MonoDevelop.Projects.Combine" />
 		<DataType class = "MonoDevelop.Projects.Project" />
+		<DataType class = "MonoDevelop.Projects.Workspace" />
 		<DataType class = "MonoDevelop.Projects.DotNetProject" />
 		<DataType class = "MonoDevelop.Projects.GenericProject" />
 		<DataType class = "MonoDevelop.Projects.GenericProjectConfiguration" />
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
index 6463836584..305ac9d370 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
@@ -141,7 +141,6 @@
     <File name="MonoDevelop.Projects/DotNetProjectBinding.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects/DotNetProjectConfiguration.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects/IConfiguration.cs" subtype="Code" buildaction="Compile" />
-    <File name="MonoDevelop.Projects/IBuildStep.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects/Project.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects/ProjectFile.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects/ProjectFileEventArgs.cs" subtype="Code" buildaction="Compile" />
@@ -232,6 +231,7 @@
     <File name="MonoDevelop.Projects.Text/TextFileService.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects.Parser/TypeNameResolver.cs" subtype="Code" buildaction="Compile" />
     <File name="MonoDevelop.Projects.Parser/ITypeNameResolver.cs" subtype="Code" buildaction="Compile" />
+    <File name="MonoDevelop.Projects/Workspace.cs" subtype="Code" buildaction="Compile" />
   </Contents>
   <References>
     <ProjectReference type="Gac" localcopy="False" refto="monodoc, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
index 91a6c061b6..4a130cfc42 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/CombineEntry.cs
@@ -149,7 +149,7 @@ namespace MonoDevelop.Projects
 		
 		public virtual Combine RootCombine {
 			get {
-				if (parentCombine != null)
+				if (parentCombine != null && !(parentCombine is Workspace))
 					return parentCombine.RootCombine;
 				else
 					return this as Combine; 
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
index 1836cbcbfe..b32bd8033e 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
@@ -59,9 +59,6 @@ namespace MonoDevelop.Projects
 		[ItemProperty ("newfilesearch", DefaultValue = NewFileSearch.None)]
 		protected NewFileSearch newFileSearch  = NewFileSearch.None;
 
-		[ItemProperty ("enableviewstate", DefaultValue = true)]
-		protected bool enableViewState = true;
-		
 		ProjectFileCollection projectFiles;
 
 		protected ProjectReferenceCollection projectReferences;
@@ -129,17 +126,6 @@ namespace MonoDevelop.Projects
 			}
 		}
 		
-		[Browsable(false)]
-		public bool EnableViewState {
-			get {
-				return enableViewState;
-			}
-			set {
-				enableViewState = value;
-				NotifyModified ();
-			}
-		}
-		
 		public abstract string ProjectType {
 			get;
 		}
@@ -186,15 +172,6 @@ namespace MonoDevelop.Projects
 			isDirty = false;
 		}
 
-		public virtual string GetParseableFileContent(string fileName)
-		{
-			fileName = fileName.Replace('\\', '/'); // FIXME PEDRO
-			StreamReader sr = File.OpenText(fileName);
-			string content = sr.ReadToEnd();
-			sr.Close();
-			return content;
-		}
-		
 		internal void RenameReferences(string oldName, string newName)
 		{
 			ArrayList toBeRemoved = new ArrayList();
@@ -703,21 +680,6 @@ namespace MonoDevelop.Projects
 		public event ProjectFileRenamedEventHandler FileRenamedInProject;
 		public event ProjectReferenceEventHandler ReferenceRemovedFromProject;
 		public event ProjectReferenceEventHandler ReferenceAddedToProject;
-		
-		class MainBuildStep: IBuildStep
-		{
-			public ICompilerResult Build (IProgressMonitor monitor, Project project)
-			{
-				monitor.Log.WriteLine (GettextCatalog.GetString ("Performing main compilation..."));
-				return project.DoBuild (monitor);
-			}
-			
-			public bool NeedsBuilding (Project project)
-			{
-				if (!project.isDirty) project.CheckNeedsBuild ();
-				return project.isDirty;
-			}
-		}
 	}
 	
 	public class UnknownProject: Project
diff --git a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
index dc27319783..36f28a1dbb 100644
--- a/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/IBuildStep.cs
+++ b/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Workspace.cs
@@ -1,5 +1,5 @@
 //
-// IBuildStep.cs
+// Workspace.cs
 //
 // Author:
 //   Lluis Sanchez Gual
@@ -26,15 +26,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
+
 using System;
-using MonoDevelop.Core;
 
 namespace MonoDevelop.Projects
 {
-	public interface IBuildStep
+	public class Workspace: Combine
 	{
-		ICompilerResult Build (IProgressMonitor monitor, Project project);
-		bool NeedsBuilding (Project project);
 	}
-	
 }