universaleditor/editor-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix incorrect associations, namespaces, and other little bugs

Browse Source
This commit is contained in:
Michael Becker 2020-05-18 15:03:06 -04:00
parent 4b87d17013
commit a8058e0e6b
No known key found for this signature in database
GPG Key ID: 506F54899E2BFED7
26 changed files with 41 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Content/UniversalEditor.Content.PlatformIndependent/Associations/FileSystem.uexml
View File

@ -10,27 +10,6 @@
<Editor ID="{1B5B1E8D-442A-4AC0-8EFD-03AADFF3CAD2}" />
</Editors>
</Association>
<Association>
<Filters>
<Filter Title="Universal Editor eXtension">
<FileNameFilters>
<FileNameFilter>*.uxt</FileNameFilter>
</FileNameFilters>
<MagicByteSequences>
<MagicByteSequence>
<MagicByte Type="String">Universal Editor extension file</MagicByte>
<MagicByte Type="HexString">00</MagicByte>
</MagicByteSequence>
</MagicByteSequences>
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.UXT.UXTDataFormat" />
</DataFormats>
</Association>
<Association>
<Filters>
<Filter Title="VirtualBox disk image">

4
Content/UniversalEditor.Content.PlatformIndependent/Associations/PropertyList.uexml
View File

@ -29,10 +29,10 @@
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.PropertyList.PropertyListObjectModel" />
<ObjectModel TypeName="UniversalEditor.ObjectModels.CoreObject.CoreObjectObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.PropertyList.CoreObject.CoreObjectDataFormat" />
<DataFormat TypeName="UniversalEditor.DataFormats.CoreObject.CoreObjectDataFormat" />
</DataFormats>
</Association>
<Association>

4
Content/UniversalEditor.Content.PlatformIndependent/Associations/SecurityCertificate.uexml
View File

@ -30,10 +30,10 @@
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.SecurityCertificate.SecurityCertificateObjectModel" />
<ObjectModel TypeName="UniversalEditor.ObjectModels.Security.Certificate.CertificateObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.SecurityCertificate.DER.DERCertificateDataFormat" />
<DataFormat TypeName="UniversalEditor.DataFormats.Security.Certificate.DER.DERCertificateDataFormat" />
</DataFormats>
</Association>
</Associations>

2
Content/UniversalEditor.Content.PlatformIndependent/Extensions/AniMiku/Associations/Concert/AniMikuConcert.uexml
View File

@ -6,7 +6,7 @@
<Filter Title="AniMiku concert">
<FileNameFilters>
<FileNameFilter>*.amp</FileNameFilter>
</FileNameFilters
</FileNameFilters>
<MagicByteSequences>
<MagicByteSequence>
<MagicByte Type="String">AMPV2\r\n</MagicByte>

4
Content/UniversalEditor.Content.PlatformIndependent/Extensions/FamilyTreeMaker/Associations/FTW.uexml
View File

@ -15,10 +15,10 @@
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.FamilyTree.FamilyTreeObjectModel" />
<ObjectModel TypeName="UniversalEditor.Plugins.Genealogy.ObjectModels.FamilyTree.FamilyTreeObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.FamilyTreeMaker.Windows.FTWDataFormat" />
<DataFormat TypeName="UniversalEditor.Plugins.Genealogy.DataFormats.FamilyTreeMaker.Windows.FTWDataFormat" />
</DataFormats>
</Association>
</Associations>

20
Content/UniversalEditor.Content.PlatformIndependent/Extensions/FileSystem/Associations/Microsoft/POD.uexml
View File

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<UniversalEditor Version="4.0">
<Associations>
<Association>
<Filters>
<Filter Title="Microsoft POD archive">
<FileNameFilters>
<FileNameFilter>*.pod</FileNameFilter>
</FileNameFilters>
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.Microsoft.POD.PODDataFormat" />
</DataFormats>
</Association>
</Associations>
</UniversalEditor>

2
Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/187RideOrDie.uexml
View File

@ -13,7 +13,7 @@
<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.MFD.MFDataFormat" />
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.MFD.MFDDataFormat" />
</DataFormats>
</Association>
</Associations>

2
Content/UniversalEditor.Content.PlatformIndependent/Extensions/GameDeveloper/Associations/FileSystem/KensLabyrinth.uexml
View File

@ -13,7 +13,7 @@
<ObjectModel TypeName="UniversalEditor.ObjectModels.FileSystem.FileSystemObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.KensLabyrinth.KZPDataFormat" />
<DataFormat TypeName="UniversalEditor.DataFormats.FileSystem.KensLabyrinth.KZP.KZPDataFormat" />
</DataFormats>
</Association>
</Associations>

4
Content/UniversalEditor.Content.PlatformIndependent/Extensions/SoftwarePublisher/Associations/Setup/Microsoft/ACME/BootstrapScript.uexml
View File

@ -10,10 +10,10 @@
</Filter>
</Filters>
<ObjectModels>
<ObjectModel TypeName="UniversalEditor.ObjectModels.SoftwareInstallation.Microsoft.ACME.BootstrapScript.BootstrapScriptObjectModel" />
<ObjectModel TypeName="UniversalEditor.ObjectModels.Setup.Microsoft.ACME.BootstrapScript.BootstrapScriptObjectModel" />
</ObjectModels>
<DataFormats>
<DataFormat TypeName="UniversalEditor.DataFormats.SoftwareInstallation.Microsoft.ACME.BootstrapScript.LSTDataFormat" />
<DataFormat TypeName="UniversalEditor.DataFormats.Setup.Microsoft.ACME.BootstrapScript.LSTDataFormat" />
</DataFormats>
</Association>
</Associations>

3
Content/UniversalEditor.Content.PlatformIndependent/UniversalEditor.Content.PlatformIndependent.csproj
View File

@ -818,9 +818,6 @@
<ItemGroup>
<Content Include="Extensions\GameDeveloper\Extensions\SEGA\DataFormats\SegaFARC.uexml.exclude" />
</ItemGroup>
<ItemGroup>
<Content Include="Extensions\FileSystem\Associations\Microsoft\POD.uexml" />
</ItemGroup>
<ItemGroup>
<Content Include="Extensions\FileSystem\Associations\PVM.uexml" />
</ItemGroup>

15
Libraries/UniversalEditor.Essential/DataFormats/Markup/XML/XMLDataFormat.cs
View File

@ -563,6 +563,11 @@ namespace UniversalEditor.DataFormats.Markup.XML
}
else
{
// FIXME
if (c == Settings.TagCloseChar)
{
}
currentString += c;
}
}
@ -827,7 +832,8 @@ namespace UniversalEditor.DataFormats.Markup.XML
specialSectionName = specialSectionName.Substring(0, specialSectionName.Length);
tr.Accessor.Seek(1, IO.SeekOrigin.Current);
string specialSectionContent = tr.ReadUntil(this.Settings.CDataEndChar.ToString());
string endseq = this.Settings.CDataEndChar.ToString() + this.Settings.CDataEndChar.ToString() + this.Settings.TagEndChar.ToString();
string specialSectionContent = tr.ReadUntil(endseq);
if (specialSectionContent.Length > 0)
{
specialSectionContent = specialSectionContent.Substring(0, specialSectionContent.Length);
@ -847,7 +853,14 @@ namespace UniversalEditor.DataFormats.Markup.XML
}
char padNext = tr.ReadChar();
if (padNext != ']')
throw new InvalidDataFormatException("CDATA block does not end with ]]>");
padNext = tr.ReadChar();
if (padNext != ']')
throw new InvalidDataFormatException("CDATA block does not end with ]]>");
padNext = tr.ReadChar();
if (padNext != '>')
throw new InvalidDataFormatException("CDATA block does not end with ]]>");
// insideSpecialDeclaration = false;
continue;

12
Libraries/UniversalEditor.UserInterface/Common/Reflection.cs
View File

@ -28,28 +28,20 @@ namespace UniversalEditor.UserInterface.Common
if (type.IsSubclassOf(typeof(Editor)))
{
#region Initializing Editors
Console.Write("loading editor '" + type.FullName + "'... ");
try
{
// TODO: see if there is a way we can MakeReference() without having to create all the UI
// components of the IEditorImplementation
Editor editor = (type.Assembly.CreateInstance(type.FullName) as Editor);
listEditors.Add(editor.MakeReference());
Console.WriteLine("SUCCESS!");
}
catch (System.Reflection.TargetInvocationException ex)
{
Console.WriteLine("FAILURE!");
Console.WriteLine("binding error: " + ex.InnerException.Message);
Console.WriteLine("binding error while loading editor '{0}': {1}", type.FullName, ex.InnerException.Message);
}
catch (Exception ex)
{
Console.WriteLine("FAILURE!");
Console.WriteLine("error while loading editor '" + type.FullName + "': " + ex.Message);
Console.WriteLine("error while loading editor '{0}': {1}", type.FullName, ex.Message);
}
}
#endregion

2
Plugins/UniversalEditor.Plugins.FileSystem/DataFormats/FileSystem/TexasInstruments/TIFiles/TIFilesDataFormat.cs
View File

@ -23,7 +23,7 @@ using System;
using UniversalEditor.IO;
using UniversalEditor.ObjectModels.FileSystem;
namespace UniversalEditor.DataFormats.FileSystem.TexasInstruments
namespace UniversalEditor.DataFormats.FileSystem.TexasInstruments.TIFiles
{
/// <summary>
/// Provides a <see cref="DataFormat" /> for manipulating disk images in TIFILES format.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/DirectDrawSurfaceDataFormat.cs
View File

@ -25,7 +25,7 @@ using MBS.Framework.Drawing;
using UniversalEditor.ObjectModels.Multimedia.Picture;
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw
{
/// <summary>
/// Provides a <see cref="DataFormat" /> for manipulating images in DirectDraw Surface (DDS) format.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DXTDecompression.cs
View File

@ -44,7 +44,7 @@
using System;
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Algorithms for DirectDraw decompression, translated to C# for use in Universal Editor.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfaceCaps1.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Specifies the complexity of the surfaces stored.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfaceCaps2.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Additional detail about the surfaces stored.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfaceFormat.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Indicates the texture format of a DirectDraw Surface texture.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfaceHeaderFlags.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Indicates attributes for the DirectDraw Surface texture file.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfaceLoadInfo.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
public enum DirectDrawSurfaceLoadInfoType : uint
{

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfacePixelFormat.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Internal structure representing a DirectDraw Surface pixel format.

2
Plugins/UniversalEditor.Plugins.Multimedia/DataFormats/Multimedia/Picture/Microsoft/DirectDraw/Internal/DirectDrawSurfacePixelFormatFlags.cs
View File

@ -19,7 +19,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
namespace UniversalEditor.DataFormats.Multimedia3D.Picture.Microsoft.DirectDraw.Internal
namespace UniversalEditor.DataFormats.Multimedia.Picture.Microsoft.DirectDraw.Internal
{
/// <summary>
/// Indicates the attributes of the DirectDraw Surface pixel format.

1
Plugins/UniversalEditor.Plugins.Multimedia3D/DataFormats/Multimedia3D/Model/Blender/BlenderDataFormat.cs
View File

@ -34,6 +34,7 @@ namespace UniversalEditor.DataFormats.Multimedia3D.Model.Blender
{
if (_dfr == null)
{
_dfr = base.MakeReferenceInternal();
_dfr.Capabilities.Add(typeof(ModelObjectModel), DataFormatCapabilities.All);
}
return _dfr;

1
Plugins/UniversalEditor.Plugins.Multimedia3D/DataFormats/Multimedia3D/Model/Metasequoia/MQOTextDataFormat.cs
View File

@ -36,6 +36,7 @@ namespace UniversalEditor.DataFormats.Multimedia3D.Model.Metasequoia
{
if (_dfr == null)
{
_dfr = base.MakeReferenceInternal();
_dfr.Capabilities.Add(typeof(ModelObjectModel), DataFormatCapabilities.All);
}
return _dfr;

1
Plugins/UniversalEditor.Plugins.Multimedia3D/DataFormats/Multimedia3D/Model/Quake/MD2DataFormat.cs
View File

@ -34,6 +34,7 @@ namespace UniversalEditor.DataFormats.Multimedia3D.Model.Quake
{
if (_dfr == null)
{
_dfr = base.MakeReferenceInternal();
_dfr.Capabilities.Add(typeof(ModelObjectModel), DataFormatCapabilities.All);
}
return _dfr;

2
Plugins/UniversalEditor.Plugins.Vocaloid/DataFormats/Multimedia/Audio/Synthesized/Vocaloid/VPR/VPRSequenceJSONDataFormat.cs
View File

@ -25,7 +25,7 @@ using UniversalEditor.DataFormats.PropertyList.JavaScriptObjectNotation;
using UniversalEditor.ObjectModels.Multimedia.Audio.Synthesized;
using UniversalEditor.ObjectModels.PropertyList;
namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesized.Vocaloid
namespace UniversalEditor.Plugins.Vocaloid.DataFormats.Multimedia.Audio.Synthesized.Vocaloid.VPR
{
public class VPRSequenceJSONDataFormat : JSONDataFormat
{