[Monodevelop-patches-list] r828 - in trunk/MonoDevelop: . build/AddIns src/AddIns/DisplayBindings/SourceEditor/Gui src/AddIns/DisplayBindings/TextEditor src/Libraries/ICSharpCode.TextEditor src/Main/Core/AddIns

[commit-watcher at mono-cvs.ximian.com]

Author: tberman
Date: 2004-02-08 19:02:25 -0500 (Sun, 08 Feb 2004)
New Revision: 828

Modified:
   trunk/MonoDevelop/Makefile
   trunk/MonoDevelop/build/AddIns/MonoDevelopNewEditor.addin
   trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
   trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile
   trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile
   trunk/MonoDevelop/src/Main/Core/AddIns/AddInTreeSingleton.cs
Log:
alright, unbroke


Modified: trunk/MonoDevelop/Makefile
===================================================================
--- trunk/MonoDevelop/Makefile	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/Makefile	2004-02-09 00:02:25 UTC (rev 828)
@@ -4,7 +4,7 @@
 GDLDOCK=build/bin/gdl-sharp.dll
 QMAKE=@ $(MAKE)
 
-$(PROGRAM): $(GTKMOZEMBED) $(GDLDOCK) MonoDevelop.Base SourceEditor CSharpBinding StartPage
+$(PROGRAM): $(GTKMOZEMBED) $(GDLDOCK) MonoDevelop.Base SourceEditor CSharpBinding StartPage MonoDevelop.DefaultTexteditor
 	@ echo Building $@
 	$(QMAKE) -C src/Main/StartUp
 

Modified: trunk/MonoDevelop/build/AddIns/MonoDevelopNewEditor.addin
===================================================================
--- trunk/MonoDevelop/build/AddIns/MonoDevelopNewEditor.addin	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/build/AddIns/MonoDevelopNewEditor.addin	2004-02-09 00:02:25 UTC (rev 828)
@@ -7,6 +7,8 @@
 	
 	<Runtime>
 		<Import assembly="../bin/MonoDevelop.SourceEditor.dll"/>
+		<Import assembly="../bin/MonoDevelop.TextEditor.dll"/>
+		<Import assembly="../bin/MonoDevelop.DefaultTexteditor.dll"/>
 	</Runtime>
 	
 	<Extension path = "/SharpDevelop/Dialogs/OptionsDialog/CodingOptions">
@@ -409,7 +411,6 @@
 
 	<Extension path = "/SharpDevelop/Workbench/DisplayBindings">
 		<DisplayBinding id    = "NewText"
-		       insertbefore = "Text"
 		       supportedformats = "Text Files,Source Files"
 		       class = "MonoDevelop.SourceEditor.Gui.SourceEditorDisplayBinding" />
 	</Extension>

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/SourceEditor/Gui/SourceEditorDisplayBinding.cs	2004-02-09 00:02:25 UTC (rev 828)
@@ -155,12 +155,12 @@
 		
 		public void InitializeFormatter()
 		{
-			IFormattingStrategy[] formater = (IFormattingStrategy[])(AddInTreeSingleton.AddInTree.GetTreeNode("/AddIns/DefaultTextEditor/Formater").BuildChildItems(this)).ToArray(typeof(IFormattingStrategy));
+			/*IFormattingStrategy[] formater = (IFormattingStrategy[])(AddInTreeSingleton.AddInTree.GetTreeNode("/AddIns/DefaultTextEditor/Formater").BuildChildItems(this)).ToArray(typeof(IFormattingStrategy));
 			Console.WriteLine("SET FORMATTER : " + formater[0]);
 			if (formater != null && formater.Length > 0) {
 //					formater[0].Document = Document;
 				se.View.fmtr = formater[0];
-			}
+			}*/
 
 		}
 		

Modified: trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile
===================================================================
--- trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/src/AddIns/DisplayBindings/TextEditor/Makefile	2004-02-09 00:02:25 UTC (rev 828)
@@ -57,7 +57,7 @@
 		/r:../../../../build/bin/MonoDevelop.Core.dll \
 		/r:../../../../build/bin/MonoDevelop.TextEditor.dll \
 		/r:../../../../build/bin/MonoDevelop.Base.dll \
-		/r:../../../../build/bin/MonoDevelop.EditorBindings.dll \
+		/r:../../../../build/bin/MonoDevelop.SourceEditor.dll \
 		/r:System.DirectoryServices.dll /r:pango-sharp.dll /r:glade-sharp.dll \
 		/r:../../../../build/bin/MonoDevelop.Gui.Widgets.dll \
 		/r:glib-sharp.dll \

Modified: trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile
===================================================================
--- trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/src/Libraries/ICSharpCode.TextEditor/Makefile	2004-02-09 00:02:25 UTC (rev 828)
@@ -103,8 +103,7 @@
  /r:glib-sharp.dll \
  /r:gdk-sharp.dll \
  /r:pango-sharp.dll \
- /r:../../../build/bin/MonoDevelop.EditorBindings.dll
-
+ /r:../../../build/bin/MonoDevelop.SourceEditor.dll 
 all: $(DLL)
 
 $(DLL): $(SOURCES)

Modified: trunk/MonoDevelop/src/Main/Core/AddIns/AddInTreeSingleton.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Core/AddIns/AddInTreeSingleton.cs	2004-02-08 23:52:16 UTC (rev 827)
+++ trunk/MonoDevelop/src/Main/Core/AddIns/AddInTreeSingleton.cs	2004-02-09 00:02:25 UTC (rev 828)
@@ -58,8 +58,6 @@
 			StringCollection retryList  = new StringCollection();
 			
 			foreach (string addInFile in addInFiles) {
-				if (Path.GetFileName (addInFile) == "MonoDevelopNewEditor.addin" && Environment.GetEnvironmentVariable ("NEW_EDITOR") == null)
-					continue;
 				
 				AddIn addIn = new AddIn();
 				try {