Author: lluis
Date: 2006-06-14 20:53:27 -0400 (Wed, 14 Jun 2006)
New Revision: 61726
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/LanguageBindingService.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
Log:
2006-06-15 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects/LanguageBindingService.cs:
* MonoDevelop.Projects/ProjectService.cs: Use the new extension
listeners
to read extensions.
* MonoDevelop.Projects/Project.cs: Don't cache build steps since
they may change if new add-ins are activated.
* MonoDevelop.Projects.addin.xml:
* MonoDevelop.Projects.Extensions/DataTypeCodon.cs: New codon used to
specify serializable types.
* Makefile.am:
* MonoDevelop.Projects.mdp: Updated.
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2006-06-15
00:52:15 UTC (rev 61725)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/ChangeLog 2006-06-15
00:53:27 UTC (rev 61726)
@@ -1,3 +1,19 @@
+2006-06-15 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Projects/LanguageBindingService.cs:
+ * MonoDevelop.Projects/ProjectService.cs: Use the new extension
listeners
+ to read extensions.
+
+ * MonoDevelop.Projects/Project.cs: Don't cache build steps since
+ they may change if new add-ins are activated.
+
+ * MonoDevelop.Projects.addin.xml:
+ * MonoDevelop.Projects.Extensions/DataTypeCodon.cs: New codon used to
+ specify serializable types.
+
+ * Makefile.am:
+ * MonoDevelop.Projects.mdp: Updated.
+
2006-06-08 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects/DotNetProject.cs: GetDefaultNamespace now
Modified: trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2006-06-15
00:52:15 UTC (rev 61725)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/Makefile.am 2006-06-15
00:53:27 UTC (rev 61726)
@@ -47,6 +47,7 @@
MonoDevelop.Projects/ProjectEventArgs.cs \
MonoDevelop.Projects/ProjectRenameEventArgs.cs \
MonoDevelop.Projects/ProjectService.cs \
+MonoDevelop.Projects.Extensions/DataTypeCodon.cs \
MonoDevelop.Projects.Extensions/ItemPropertyCodon.cs \
MonoDevelop.Projects.Extensions/FileFormatCodon.cs \
MonoDevelop.Projects.Utility/Comparers.cs \
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/LanguageBindingService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/LanguageBindingService.cs
2006-06-15 00:52:15 UTC (rev 61725)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/LanguageBindingService.cs
2006-06-15 00:53:27 UTC (rev 61726)
@@ -9,6 +9,7 @@
using System.Xml;
using System.IO;
using System.Collections;
+using System.Collections.Generic;
using System.Reflection;
using System.CodeDom.Compiler;
@@ -24,7 +25,7 @@
{
public class LanguageBindingService : AbstractService
{
- LanguageBindingCodon[] bindings = null;
+ List<LanguageBindingCodon> bindings = null;
ILanguageBinding[] langs;
public ILanguageBinding GetBindingPerLanguageName(string
languagename)
@@ -50,7 +51,7 @@
if (langs != null)
return langs;
- langs = new ILanguageBinding [bindings.Length];
+ langs = new ILanguageBinding [bindings.Count];
for (int n=0; n<langs.Length; n++)
langs [n] = bindings [n].LanguageBinding;
@@ -117,7 +118,18 @@
public override void InitializeService ()
{
base.InitializeService ();
- bindings = (LanguageBindingCodon[])
Runtime.AddInService.GetTreeItems ("/SharpDevelop/Workbench/LanguageBindings",
typeof(LanguageBindingCodon));
+ bindings = new List<LanguageBindingCodon> ();
+ Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/LanguageBindings", OnExtensionChanged);
}
+
+ void OnExtensionChanged (ExtensionAction action, object item)
+ {
+ if (action == ExtensionAction.Add) {
+ bindings.Add ((LanguageBindingCodon) item);
+
+ // Make sure the langs list is re-created
+ langs = null;
+ }
+ }
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
2006-06-15 00:52:15 UTC (rev 61725)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/Project.cs
2006-06-15 00:53:27 UTC (rev 61726)
@@ -52,8 +52,6 @@
[ItemProperty ("DeploymentInformation")]
protected DeployInformation deployInformation = new
DeployInformation();
- IBuildStep[] buildPipeline;
-
bool isDirty = false;
bool filesChecked;
@@ -314,7 +312,7 @@
ICompilerResult res = null;
- foreach (IBuildStep step in BuildPipeline) {
+ foreach (IBuildStep step in steps) {
ICompilerResult sres = step.Build
(monitor, this);
if (sres != null) {
if (res != null) {
@@ -343,9 +341,7 @@
protected virtual IBuildStep[] BuildPipeline {
get {
- if (buildPipeline == null)
- buildPipeline = (IBuildStep[])
Runtime.AddInService.GetTreeItems ("/SharpDevelop/Workbench/BuildPipeline",
typeof(IBuildStep));
- return buildPipeline;
+ return (IBuildStep[])
Runtime.AddInService.GetTreeItems ("/SharpDevelop/Workbench/BuildPipeline",
typeof(IBuildStep));
}
}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
2006-06-15 00:52:15 UTC (rev 61725)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects/ProjectService.cs
2006-06-15 00:53:27 UTC (rev 61726)
@@ -33,7 +33,7 @@
public class ProjectService : AbstractService, IProjectService
{
DataContext dataContext = new DataContext ();
- ProjectBindingCodon[] projectBindings;
+ ArrayList projectBindings = new ArrayList ();
FileFormatManager formatManager = new FileFormatManager ();
IFileFormat defaultProjectFormat = new MdpFileFormat ();
@@ -126,19 +126,39 @@
formatManager.RegisterFileFormat (defaultProjectFormat);
formatManager.RegisterFileFormat (defaultCombineFormat);
- FileFormatCodon[] formatCodons = (FileFormatCodon[])
Runtime.AddInService.GetTreeItems("/SharpDevelop/Workbench/ProjectFileFormats",
typeof(FileFormatCodon));
- foreach (FileFormatCodon codon in formatCodons)
+ Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/ProjectFileFormats", OnFormatExtensionChanged);
+ Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/SerializableClasses", OnSerializableExtensionChanged);
+ Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/Serialization/ExtendedProperties",
OnPropertiesExtensionChanged);
+ Runtime.AddInService.RegisterExtensionItemListener
("/SharpDevelop/Workbench/ProjectBindings", OnProjectsExtensionChanged);
+ }
+
+ void OnFormatExtensionChanged (ExtensionAction action, object
item)
+ {
+ if (action == ExtensionAction.Add) {
+ FileFormatCodon codon = (FileFormatCodon) item;
formatManager.RegisterFileFormat
(codon.FileFormat);
-
- foreach (ClassCodon cls in
Runtime.AddInService.GetTreeCodons
("/SharpDevelop/Workbench/SerializableClasses"))
- DataContext.IncludeType (cls.Type);
-
- foreach (ItemPropertyCodon cls in
Runtime.AddInService.GetTreeItems
("/SharpDevelop/Workbench/Serialization/ExtendedProperties")) {
+ }
+ }
+
+ void OnSerializableExtensionChanged (ExtensionAction action,
object item)
+ {
+ if (action == ExtensionAction.Add)
+ DataContext.IncludeType
(((DataTypeCodon)item).Type);
+ }
+
+ void OnPropertiesExtensionChanged (ExtensionAction action,
object item)
+ {
+ if (action == ExtensionAction.Add) {
+ ItemPropertyCodon cls = (ItemPropertyCodon)
item;
if (cls.ClassType != null && cls.PropertyType
!= null)
DataContext.RegisterProperty
(cls.ClassType, cls.PropertyName, cls.PropertyType);
}
-
- projectBindings = (ProjectBindingCodon[])
Runtime.AddInService.GetTreeItems ("/SharpDevelop/Workbench/ProjectBindings",
typeof(ProjectBindingCodon));
}
+
+ void OnProjectsExtensionChanged (ExtensionAction action, object
item)
+ {
+ if (action == ExtensionAction.Add)
+ projectBindings.Add (item);
+ }
}
}
Added:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs
2006-06-15 00:52:15 UTC (rev 61725)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.Extensions/DataTypeCodon.cs
2006-06-15 00:53:27 UTC (rev 61726)
@@ -0,0 +1,51 @@
+//
+// DataTypeCodon.cs
+//
+// Author:
+// Lluis Sanchez Gual
+//
+
+//
+// Copyright (C) 2006 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using MonoDevelop.Core.AddIns;
+
+namespace MonoDevelop.Projects
+{
+ [CodonNameAttribute("DataType")]
+ [Description ("A type name.")]
+ public class DataTypeCodon: ClassCodon
+ {
+ public DataTypeCodon()
+ {
+ }
+
+ public override object BuildItem (object owner, ArrayList
subItems, ConditionCollection conditions)
+ {
+ return this;
+ }
+ }
+}
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
===================================================================
---
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2006-06-15 00:52:15 UTC (rev 61725)
+++
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.addin.xml
2006-06-15 00:53:27 UTC (rev 61726)
@@ -52,9 +52,9 @@
</Extension>
<Extension path = "/SharpDevelop/Workbench/SerializableClasses"
extension-nodes="Class" description="Classes to be registered for
serialization.">
- <Class class = "MonoDevelop.Projects.Combine" />
- <Class class = "MonoDevelop.Projects.Project" />
- <Class class = "MonoDevelop.Projects.DotNetProject" />
+ <DataType class = "MonoDevelop.Projects.Combine" />
+ <DataType class = "MonoDevelop.Projects.Project" />
+ <DataType class = "MonoDevelop.Projects.DotNetProject" />
</Extension>
<Extension path =
"/SharpDevelop/Workbench/Serialization/ExtendedProperties"
extension-nodes="ItemProperty" description="Custom properties for projects and
other types.">
Modified:
trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
===================================================================
--- trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2006-06-15 00:52:15 UTC (rev 61725)
+++ trunk/monodevelop/Core/src/MonoDevelop.Projects/MonoDevelop.Projects.mdp
2006-06-15 00:53:27 UTC (rev 61726)
@@ -218,6 +218,7 @@
<File name="./MonoDevelop.Projects/ExecutionContext.cs" subtype="Code"
buildaction="Compile" />
<File name="./MonoDevelop.Projects/BuildTool.cs" subtype="Code"
buildaction="Compile" />
<File name="./MonoDevelop.Projects/ProjectsServices.cs" subtype="Code"
buildaction="Compile" />
+ <File name="./MonoDevelop.Projects.Extensions/DataTypeCodon.cs"
subtype="Code" buildaction="Compile" />
</Contents>
<References>
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches