Author: ankit
Date: 2007-12-14 06:04:10 -0500 (Fri, 14 Dec 2007)
New Revision: 91272
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/SlnFileFormat.cs
Log:
* MSBuildFileFormat.cs: Use monitor's Begin/EndTask.
* SlnFileFormat.cs: Likewise.
Modified: trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
2007-12-14 10:54:36 UTC (rev 91271)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/ChangeLog
2007-12-14 11:04:10 UTC (rev 91272)
@@ -1,3 +1,8 @@
+2007-12-14 Ankit Jain <[EMAIL PROTECTED]>
+
+ * MSBuildFileFormat.cs: Use monitor's Begin/EndTask.
+ * SlnFileFormat.cs: Likewise.
+
2007-12-13 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MdPrjHelper.cs, DefaultMSBuildProjectExtension.cs,
MSBuildFileFormat.cs:
Modified:
trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-12-14 10:54:36 UTC (rev 91271)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/MSBuildFileFormat.cs
2007-12-14 11:04:10 UTC (rev 91272)
@@ -413,6 +413,8 @@
string lang = Utils.GetLanguage (fname);
string basePath = Path.GetDirectoryName (fname);
+ monitor.BeginTask (GettextCatalog.GetString ("Loading
project: {0}", fname), 1);
+
//try to get type guid
string type_guid;
string type_guids = String.Empty;
@@ -518,6 +520,7 @@
extensionChain.OnFinishRead (data, project);
SetupHandlers (project);
+ monitor.EndTask ();
return project;
}
Modified: trunk/monodevelop/main/src/addins/prj2make-sharp-lib/SlnFileFormat.cs
===================================================================
--- trunk/monodevelop/main/src/addins/prj2make-sharp-lib/SlnFileFormat.cs
2007-12-14 10:54:36 UTC (rev 91271)
+++ trunk/monodevelop/main/src/addins/prj2make-sharp-lib/SlnFileFormat.cs
2007-12-14 11:04:10 UTC (rev 91272)
@@ -135,7 +135,9 @@
sw.WriteLine ("# Visual Studio 2005");
//Write the projects
+ monitor.BeginTask (GettextCatalog.GetString
("Saving projects"), 1);
WriteProjects (c, c.BaseDirectory, sw, monitor);
+ monitor.EndTask ();
SlnData slnData = GetSlnData (c);
if (slnData == null) {
@@ -196,6 +198,7 @@
void WriteProjects (Combine combine, string baseDirectory,
StreamWriter writer, IProgressMonitor monitor)
{
+ monitor.BeginStepTask (GettextCatalog.GetString
("Saving projects"), combine.Entries.Count, 1);
foreach (CombineEntry ce in combine.Entries) {
Combine c = ce as Combine;
@@ -206,6 +209,7 @@
if (project == null) {
monitor.ReportWarning
(GettextCatalog.GetString (
"Error saving project
({0}) : Only DotNetProjects can be part of a MSBuild solution. Ignoring.",
ce.Name));
+ monitor.Step (1);
continue;
}
@@ -213,6 +217,7 @@
// FIXME: Should not happen,
temp
monitor.ReportWarning
(GettextCatalog.GetString ("Saving for project {0} not supported. Ignoring.",
ce.FileName));
+ monitor.Step (1);
continue;
}
@@ -266,7 +271,9 @@
writer.WriteLine ("EndProject");
if (c != null)
WriteProjects (c, baseDirectory,
writer, monitor);
+ monitor.Step (1);
}
+ monitor.EndTask ();
}
void WriteProjectConfigurations (Combine c, List<string> list,
int ind, string config)
@@ -393,6 +400,7 @@
List<Section> projectSections = null;
List<string> lines = null;
+ monitor.BeginTask (GettextCatalog.GetString ("Loading
solution: {0}", fileName), 1);
//Parse the .sln file
using (StreamReader reader = new
StreamReader(fileName)) {
combine = new Combine ();
@@ -430,8 +438,10 @@
}
}
+ monitor.BeginTask("Loading projects ..",
projectSections.Count + 1);
Dictionary<string, CombineEntry> entries = new
Dictionary<string, CombineEntry> ();
foreach (Section sec in projectSections) {
+ monitor.Step (1);
Match match = ProjectRegex.Match (lines
[sec.Start]);
if (!match.Success) {
LoggingService.LogDebug
(GettextCatalog.GetString (
@@ -533,6 +543,7 @@
data.UnknownProjects.AddRange (lines.GetRange
(sec.Start, sec.Count));
}
+ monitor.EndTask ();
if (globals != null && globals.Contains
("NestedProjects")) {
LoadNestedProjects (globals ["NestedProjects"]
as Section, lines, entries, monitor);
@@ -616,6 +627,7 @@
globalLines.InsertRange (globalLines.Count,
lines.GetRange (sec.Start, sec.Count));
data.GlobalExtra = globalLines;
+ monitor.EndTask ();
return combine;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
