[Monodevelop-patches-list] r2260 - in trunk/MonoDevelop/Core/src/MonoDevelop.Core: . Services
John Luke <jluke@cfl.rr.com>
jluke at mono-cvs.ximian.com
Sun Feb 20 13:59:35 EST 2005
Author: jluke
Date: 2005-02-20 13:59:35 -0500 (Sun, 20 Feb 2005)
New Revision: 2260
Removed:
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorInformDialog.cs
Modified:
trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/AbstractService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/FileUtilityService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IService.cs
trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/ServiceManager.cs
Log:
get rid of some unneccesary things
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/ChangeLog 2005-02-20 18:59:35 UTC (rev 2260)
@@ -1,3 +1,15 @@
+2005-02-20 John Luke <john.luke at gmail.com>
+
+ * Services/ServiceManager.cs:
+ * Services/IMessageService.cs:
+ * Services/AbstractService.cs:
+ * Services/FileUtilityService.cs:
+ * Services/IService.cs:
+ * Makefile.am: remove System.Drawing stuff
+ dont define:LINUX
+ * Services/SaveErrorChooseDialog.cs:
+ * Services/SaveErrorInformDialog.cs: remove SWF cruft
+
2005-01-31 Todd Berman <tberman at off.net>
* AddIns/AddIn.cs: Remove usage of AddIn.xsd, it is a bad solution.
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Makefile.am 2005-02-20 18:59:35 UTC (rev 2260)
@@ -7,7 +7,6 @@
Properties/PropertyFileLoadException.cs \
Properties/IXmlConvertable.cs \
Services/FileUtilityService.cs \
-Services/SaveErrorInformDialog.cs \
Services/AbstractService.cs \
Services/IMessageService.cs \
Services/StringParserService.cs \
@@ -15,7 +14,6 @@
Services/ServiceManager.cs \
Services/IService.cs \
Services/IStringTagProvider.cs \
-Services/SaveErrorChooseDialog.cs \
AssemblyInfo.cs \
AddIns/Conditions/DuplicateConditionException.cs \
AddIns/Conditions/ConditionCollection.cs \
@@ -61,8 +59,7 @@
DLL = MonoDevelop.Core.dll
-REFS = /r:System.Drawing.dll \
-/r:Mono.Posix.dll
+REFS = -r:Mono.Posix.dll
all: $(DLL)
@@ -72,7 +69,7 @@
mv $@.tmp $@
$(DLL): $(build_sources) $(build_resources)
- $(CSC) /out:$(DLL) /target:library $(REFS) /define:LINUX \
+ $(CSC) /out:$(DLL) /target:library $(REFS) \
$(build_sources) && cp $(DLL) $(top_builddir)/build/bin/.
assemblydir = $(libdir)/monodevelop/bin
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/AbstractService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/AbstractService.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/AbstractService.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -6,14 +6,6 @@
// </file>
using System;
-using System.IO;
-using System.Collections;
-using System.Threading;
-using System.Resources;
-using System.Drawing;
-using System.Diagnostics;
-using System.Reflection;
-using System.Xml;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/FileUtilityService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/FileUtilityService.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/FileUtilityService.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -7,14 +7,9 @@
using System;
using System.IO;
-using System.Text;
-using System.Collections;
using System.Collections.Specialized;
-using System.Drawing;
-using System.Reflection;
-using System.Resources;
using System.Diagnostics;
-using System.Xml;
+using System.Reflection;
using MonoDevelop.Services;
using MonoDevelop.Core.Services;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IMessageService.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -6,14 +6,6 @@
// </file>
using System;
-using System.IO;
-using System.Collections;
-using System.Threading;
-using System.Resources;
-using System.Drawing;
-using System.Diagnostics;
-using System.Reflection;
-using System.Xml;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IService.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IService.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/IService.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -6,14 +6,6 @@
// </file>
using System;
-using System.IO;
-using System.Collections;
-using System.Threading;
-using System.Resources;
-using System.Drawing;
-using System.Diagnostics;
-using System.Reflection;
-using System.Xml;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorChooseDialog.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -1,167 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-#if false
-
-using System;
-using System.IO;
-using System.Windows.Forms;
-using System.Drawing;
-
-namespace MonoDevelop.Core.Services
-{
- /// <summary>
- /// Add summary description for SaveErrorChooseDialog
- /// </summary>
- public class SaveErrorChooseDialog : System.Windows.Forms.Form
- {
- Button retryButton;
- Button ignoreButton;
- Label descriptionLabel;
- TextBox descriptionTextBox;
- Button exceptionButton;
- Button chooseLocationButton;
-
- string displayMessage;
- Exception exceptionGot;
-
- public SaveErrorChooseDialog(string fileName, string message, string dialogName, Exception exceptionGot, bool chooseLocationEnabled)
- {
- this.Text = dialogName;
- // Must be called for initialization
- this.InitializeComponents(chooseLocationEnabled);
-
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- displayMessage = stringParserService.Parse(message, new string[,] {
- {"FileName", fileName},
- {"Path", Path.GetDirectoryName(fileName)},
- {"FileNameWithoutPath", Path.GetFileName(fileName)},
- {"Exception", exceptionGot.GetType().FullName},
- });
-
- descriptionTextBox.Lines = this.displayMessage.Split('\n');
-
- this.exceptionGot = exceptionGot;
- }
-
- void ShowException(object sender, EventArgs e)
- {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(exceptionGot.ToString(), "Exception got");
- }
-
- /// <summary>
- /// This method was autogenerated - do not change the contents manually
- /// </summary>
- private void InitializeComponents(bool chooseLocationEnabled)
- {
- IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
-
- //
- // Set up generated class SaveErrorChooseDialog
- //
- this.ClientSize = new Size(508, 320);
- this.SuspendLayout();
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "SaveErrorChooseDialog";
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.ShowInTaskbar = false;
- this.StartPosition = FormStartPosition.CenterScreen;
-
- //
- // Set up member descriptionLabel
- //
- this.descriptionLabel = new Label();
- this.descriptionLabel.Name = "descriptionLabel";
- this.descriptionLabel.Location = new Point(8, 8);
- this.descriptionLabel.Size = new Size(584, 24);
- this.descriptionLabel.TabIndex = 3;
- this.descriptionLabel.Anchor = (System.Windows.Forms.AnchorStyles.Top
- | (System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right));
- this.descriptionLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- this.descriptionLabel.Text = "Description";
- this.Controls.Add(descriptionLabel);
-
- //
- // Set up member descriptionTextBox
- //
- this.descriptionTextBox = new TextBox();
- this.descriptionTextBox.Multiline = true;
- this.descriptionTextBox.Size = new Size(584, 237);
- this.descriptionTextBox.Location = new Point(8, 40);
- this.descriptionTextBox.TabIndex = 2;
- this.descriptionTextBox.Anchor = (System.Windows.Forms.AnchorStyles.Top
- | (System.Windows.Forms.AnchorStyles.Bottom
- | (System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.descriptionTextBox.ReadOnly = true;
- this.descriptionTextBox.Name = "descriptionTextBox";
- this.Controls.Add(descriptionTextBox);
-
- //
- // Set up member retryButton
- //
- this.retryButton = new Button();
- this.retryButton.DialogResult = System.Windows.Forms.DialogResult.Retry;
- this.retryButton.Name = "retryButton";
- this.retryButton.TabIndex = 5;
- this.retryButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.retryButton.Text = resourceService.GetString("Global.RetryButtonText");
- this.retryButton.Size = new Size(110, 27);
- this.retryButton.Location = new Point(28, 285);
- this.Controls.Add(retryButton);
-
- //
- // Set up member ignoreButton
- //
- this.ignoreButton = new Button();
- this.ignoreButton.Name = "ignoreButton";
- this.ignoreButton.DialogResult = System.Windows.Forms.DialogResult.Ignore;
- this.ignoreButton.TabIndex = 4;
- this.ignoreButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.ignoreButton.Text = resourceService.GetString("Global.IgnoreButtonText");
- this.ignoreButton.Size = new Size(110, 27);
- this.ignoreButton.Location = new Point(146, 285);
- this.Controls.Add(ignoreButton);
-
-
- //
- // Set up member exceptionButton
- //
- this.exceptionButton = new Button();
- this.exceptionButton.TabIndex = 1;
- this.exceptionButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.exceptionButton.Name = "exceptionButton";
- this.exceptionButton.Text = "Show Exception";
- this.exceptionButton.Size = new Size(110, 27);
- this.exceptionButton.Location = new Point(382, 285);
- this.exceptionButton.Click += new EventHandler(ShowException);
- this.Controls.Add(exceptionButton);
-
- if (chooseLocationEnabled) {
- //
- // Set up member chooseLocationButton
- //
- this.chooseLocationButton = new Button();
- this.chooseLocationButton.Name = "chooseLocationButton";
- this.chooseLocationButton.DialogResult = System.Windows.Forms.DialogResult.OK;
- this.chooseLocationButton.TabIndex = 0;
- this.chooseLocationButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.chooseLocationButton.Text = resourceService.GetString("Global.ChooseLocationButtonText");
- this.chooseLocationButton.Size = new Size(110, 27);
- this.chooseLocationButton.Location = new Point(264, 285);
- }
-
- this.Controls.Add(chooseLocationButton);
-
- this.ResumeLayout(false);
- this.Size = new Size(526, 262);
- }
- }
-}
-
-#endif
Deleted: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorInformDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorInformDialog.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/SaveErrorInformDialog.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -1,134 +0,0 @@
-// <file>
-// <copyright see="prj:///doc/copyright.txt"/>
-// <license see="prj:///doc/license.txt"/>
-// <owner name="Mike Krüger" email="mike at icsharpcode.net"/>
-// <version value="$version"/>
-// </file>
-
-#if false
-
-using System;
-using System.IO;
-using System.Windows.Forms;
-using System.Drawing;
-
-namespace MonoDevelop.Core.Services
-{
- /// <summary>
- /// Add summary description for SaveErrorInformDialog
- /// </summary>
- public class SaveErrorInformDialog : System.Windows.Forms.Form
- {
- System.Windows.Forms.Label descriptionLabel;
- System.Windows.Forms.TextBox descriptionTextBox;
- System.Windows.Forms.Button exceptionButton;
- System.Windows.Forms.Button okButton;
-
- string displayMessage;
- Exception exceptionGot;
-
- public SaveErrorInformDialog(string fileName, string message, string dialogName, Exception exceptionGot)
- {
- this.Text = dialogName;
- // Must be called for initialization
- this.InitializeComponent2();
-
- StringParserService stringParserService = (StringParserService)ServiceManager.Services.GetService(typeof(StringParserService));
- displayMessage = stringParserService.Parse(message, new string[,] {
- {"FileName", fileName},
- {"Path", Path.GetDirectoryName(fileName)},
- {"FileNameWithoutPath", Path.GetFileName(fileName)},
- {"Exception", exceptionGot.GetType().FullName},
- });
- descriptionTextBox.Lines = this.displayMessage.Split('\n');
-
- this.exceptionGot = exceptionGot;
- }
-
- void ShowException(object sender, EventArgs e)
- {
- IMessageService messageService =(IMessageService)ServiceManager.Services.GetService(typeof(IMessageService));
- messageService.ShowMessage(exceptionGot.ToString(), "Exception got");
- }
- //IResourceService resourceService = (IResourceService)ServiceManager.Services.GetService(typeof(IResourceService));
-
- /// <summary>
- /// This method was autogenerated - do not change the contents manually
- /// </summary>
- private void InitializeComponent2()
- {
-
- //
- // Set up generated class SaveErrorInformDialog
- //
- this.ClientSize = new Size(508, 320);
- this.SuspendLayout();
- //
- // Set up member descriptionLabel
- //
- this.descriptionLabel = new System.Windows.Forms.Label();
- this.descriptionLabel.Location = new System.Drawing.Point(8, 8);
- this.descriptionLabel.Size = new System.Drawing.Size(584, 24);
- this.descriptionLabel.TabIndex = 3;
- this.descriptionLabel.Anchor = (System.Windows.Forms.AnchorStyles.Top
- | (System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right));
- this.descriptionLabel.TextAlign = System.Drawing.ContentAlignment.BottomLeft;
- this.descriptionLabel.Text = "Description";
- this.descriptionLabel.Name = "descriptionLabel";
- this.Controls.Add(descriptionLabel);
-
- //
- // Set up member descriptionTextBox
- //
- this.descriptionTextBox = new System.Windows.Forms.TextBox();
- this.descriptionTextBox.Name = "descriptionTextBox";
- this.descriptionTextBox.Multiline = true;
- this.descriptionTextBox.Size = new System.Drawing.Size(584, 237);
- this.descriptionTextBox.Location = new System.Drawing.Point(8, 40);
- this.descriptionTextBox.TabIndex = 2;
- this.descriptionTextBox.Anchor = (System.Windows.Forms.AnchorStyles.Top
- | (System.Windows.Forms.AnchorStyles.Bottom
- | (System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.descriptionTextBox.ReadOnly = true;
- this.Controls.Add(descriptionTextBox);
-
- //
- // Set up member exceptionButton
- //
- this.exceptionButton = new System.Windows.Forms.Button();
- this.exceptionButton.TabIndex = 1;
- this.exceptionButton.Name = "exceptionButton";
- this.exceptionButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.exceptionButton.Text = "Show Exception";
- this.exceptionButton.Size = new System.Drawing.Size(120, 27);
- this.exceptionButton.Location = new System.Drawing.Point(372, 285);
- this.exceptionButton.Click += new EventHandler(ShowException);
- this.Controls.Add(exceptionButton);
-
- //
- // Set up member chooseLocationButton
- //
- this.okButton = new System.Windows.Forms.Button();
- this.okButton.Name = "okButton";
- this.okButton.TabIndex = 0;
- this.okButton.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
- this.okButton.Text = "OK";//resourceService.GetString("Global.OKButtonText");
- this.okButton.Size = new System.Drawing.Size(120, 27);
- this.okButton.Location = new System.Drawing.Point(244, 285);
- this.okButton.DialogResult = DialogResult.OK;
- this.Controls.Add(okButton);
-
-
- this.MaximizeBox = false;
- this.Name = "SaveErrorInformDialog";
- this.MinimizeBox = false;
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.ShowInTaskbar = false;
- this.StartPosition = FormStartPosition.CenterScreen;
-
- this.ResumeLayout(false);
- this.Size = new System.Drawing.Size(526, 262);
- }
- }
-}
-#endif
Modified: trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/ServiceManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/ServiceManager.cs 2005-02-20 00:50:39 UTC (rev 2259)
+++ trunk/MonoDevelop/Core/src/MonoDevelop.Core/Services/ServiceManager.cs 2005-02-20 18:59:35 UTC (rev 2260)
@@ -6,14 +6,7 @@
// </file>
using System;
-using System.IO;
using System.Collections;
-using System.Threading;
-using System.Resources;
-using System.Drawing;
-using System.Diagnostics;
-using System.Reflection;
-using System.Xml;
using MonoDevelop.Core.AddIns;
using MonoDevelop.Core.Properties;
More information about the Monodevelop-patches-list
mailing list