Author: lluis
Date: 2007-03-28 10:20:03 -0500 (Wed, 28 Mar 2007)
New Revision: 75078
Removed:
trunk/mono-addins/Mono.Addins/Mono.Addins/ConfigurationInfo.cs
Modified:
trunk/mono-addins/ChangeLog
trunk/mono-addins/Mono.Addins/Makefile.am
trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
trunk/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs
Log:
* Mono.Addins/Mono.Addins.mdp,
Mono.Addins/Mono.Addins/GettextCatalog.cs, Mono.Addins/Makefile.am:
Removed Mono.Posix reference.
* Mono.Addins/Mono.Addins/ConfigurationInfo.cs: Removed unused file.
* Mono.Addins/Mono.Addins/AddinRegistry.cs,
Mono.Addins/Mono.Addins.Database/Util.cs: Use a different path for
the global registry in windows.
* Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs: Set the
RootAddin property of root add-in extensions. Collect object type
extensions which for extension points defined in root add-ins.
Modified: trunk/mono-addins/ChangeLog
===================================================================
--- trunk/mono-addins/ChangeLog 2007-03-28 15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/ChangeLog 2007-03-28 15:20:03 UTC (rev 75078)
@@ -1,3 +1,16 @@
+2007-03-28 Lluis Sanchez Gual <[EMAIL PROTECTED]>
+
+ * Mono.Addins/Mono.Addins.mdp,
+ Mono.Addins/Mono.Addins/GettextCatalog.cs, Mono.Addins/Makefile.am:
+ Removed Mono.Posix reference.
+ * Mono.Addins/Mono.Addins/ConfigurationInfo.cs: Removed unused file.
+ * Mono.Addins/Mono.Addins/AddinRegistry.cs,
+ Mono.Addins/Mono.Addins.Database/Util.cs: Use a different path for
+ the global registry in windows.
+ * Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs: Set the
+ RootAddin property of root add-in extensions. Collect object type
+ extensions which for extension points defined in root add-ins.
+
2007-03-26 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* AUTHORS, README, NEWS: Added.
Modified: trunk/mono-addins/Mono.Addins/Makefile.am
===================================================================
--- trunk/mono-addins/Mono.Addins/Makefile.am 2007-03-28 15:13:40 UTC (rev
75077)
+++ trunk/mono-addins/Mono.Addins/Makefile.am 2007-03-28 15:20:03 UTC (rev
75078)
@@ -88,7 +88,6 @@
EXTRAS =
REFERENCES = \
- -r:Mono.Posix \
-r:System \
-r:System.Xml
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs 2007-03-28
15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/AddinRegistry.cs 2007-03-28
15:20:03 UTC (rev 75078)
@@ -63,8 +63,13 @@
internal static AddinRegistry GetGlobalRegistry (string
startupDirectory)
{
AddinRegistry reg = new AddinRegistry
(GlobalRegistryPath, startupDirectory);
- // TODO: What about windows?
- reg.AddinDirectories.Add ("/etc/mono.addins");
+ string baseDir;
+ if (Util.IsWindows)
+ baseDir = Environment.GetFolderPath
(Environment.SpecialFolder.CommonProgramFiles);
+ else
+ baseDir = "/etc";
+
+ reg.AddinDirectories.Add (Path.Combine (baseDir,
"mono.addins"));
return reg;
}
Deleted: trunk/mono-addins/Mono.Addins/Mono.Addins/ConfigurationInfo.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/ConfigurationInfo.cs
2007-03-28 15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/ConfigurationInfo.cs
2007-03-28 15:20:03 UTC (rev 75078)
@@ -1,34 +0,0 @@
-
-using System;
-using System.IO;
-using System.Collections.Specialized;
-
-namespace Mono.Addins
-{
- [Serializable]
- public class ConfigurationInfo
- {
- string configDir;
- string startupDirectory;
- internal bool Locked;
-
- public ConfigurationInfo (string configDirectory)
- {
- configDir = configDirectory;
- }
-
- public string ConfigDirectory {
- get { return configDir != null ? configDir :
string.Empty; }
- internal set { configDir = value; }
- }
-
- public string UserAddinPath {
- get { return Path.Combine (ConfigDirectory, "addins"); }
- }
-
- internal string StartupDirectory {
- get { return startupDirectory != null ?
startupDirectory : string.Empty; }
- set { startupDirectory = value; }
- }
- }
-}
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs 2007-03-28
15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins/GettextCatalog.cs 2007-03-28
15:20:03 UTC (rev 75078)
@@ -24,7 +24,7 @@
*/
using System;
-using Mono.Unix;
+//using Mono.Unix;
namespace Mono.Addins
{
@@ -33,7 +33,7 @@
{
static GettextCatalog ()
{
-// Catalog.Init ("monodevelop",
"/home/lluis/install//share/locale");
+// Catalog.Init ("mono-addins",
"/home/lluis/install//share/locale");
}
private GettextCatalog ()
@@ -42,28 +42,13 @@
public static string GetString (string str)
{
- return str != null ? Catalog.GetString (str) : null;
+ return str;
+// return str != null ? Catalog.GetString (str) : null;
}
public static string GetString (string str, params object[]
arguments)
{
return string.Format (GetString (str), arguments);
}
-
- public static string GetPluralString (string singular,
- string plural,
- int n)
- {
- return Catalog.GetPluralString (singular, plural, n);
- }
-
- public static string GetPluralString (string singular,
- string plural,
- int n,
- params object[] arguments)
- {
- return string.Format(GetPluralString (singular, plural,
n), arguments);
- }
-
}
}
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
2007-03-28 15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/AddinUpdateData.cs
2007-03-28 15:20:03 UTC (rev 75078)
@@ -70,6 +70,7 @@
RootExtensionPoint rep = new RootExtensionPoint ();
rep.Description = description;
rep.ExtensionPoint = ep;
+ ep.RootAddin = description.AddinId;
list.Add (rep);
}
@@ -173,8 +174,18 @@
foreach (object ob in extensionPointsFound) {
ExtensionPoint ep = ob as ExtensionPoint;
- if (ep == null)
+
+ if (ep == null) {
+ // It is a list of extension from a
root add-in
+ ArrayList rootExtensionPoints =
(ArrayList) ob;
+ foreach (RootExtensionPoint rep in
rootExtensionPoints) {
+ foreach (ExtensionNodeType nt
in rep.ExtensionPoint.NodeSet.NodeTypes) {
+ if
(nt.ObjectTypeName.Length > 0)
+
CollectObjectTypeExtensions (rep.Description, rep.ExtensionPoint,
nt.ObjectTypeName);
+ }
+ }
continue;
+ }
if (ep.RootAddin == null) {
// Ignore class extensions
@@ -206,7 +217,7 @@
foreach (ArrayList list in objectTypeExtensions.Values)
{
foreach (UnresolvedObjectTypeExtension data in
list) {
if (!data.FoundExtensionPoint) {
- monitor.ReportWarning ("The
add-in '" + data.Description.AddinId + "' is trying to register the class '" +
data.Extension + "', but there isn't any add-in defining a suitable extension
point");
+ monitor.ReportWarning ("The
add-in '" + data.Description.AddinId + "' is trying to register the class '" +
data.Extension.Path + "', but there isn't any add-in defining a suitable
extension point");
// The type extensions may be
registered using different base classes.
// Make sure the warning is
shown only once
data.FoundExtensionPoint = true;
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs 2007-03-28
15:13:40 UTC (rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.Database/Util.cs 2007-03-28
15:20:03 UTC (rev 75078)
@@ -38,6 +38,10 @@
{
internal class Util
{
+ public static bool IsWindows {
+ get { return Path.DirectorySeparatorChar == '\\'; }
+ }
+
public static void CheckWrittableFloder (string path)
{
string testFile = null;
Modified: trunk/mono-addins/Mono.Addins/Mono.Addins.mdp
===================================================================
--- trunk/mono-addins/Mono.Addins/Mono.Addins.mdp 2007-03-28 15:13:40 UTC
(rev 75077)
+++ trunk/mono-addins/Mono.Addins/Mono.Addins.mdp 2007-03-28 15:20:03 UTC
(rev 75078)
@@ -86,7 +86,6 @@
<References>
<ProjectReference type="Gac" localcopy="True" refto="System,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<ProjectReference type="Gac" localcopy="True" refto="System.Xml,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <ProjectReference type="Gac" localcopy="True" refto="Mono.Posix,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</References>
<MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True"
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName=""
SyncReferences="True">
<BuildFilesVar Sync="True" Name="FILES" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches