Apple II - Virtu Core - remove String.cs shenanigans
This commit is contained in:
parent
facee4e113
commit
edbb7508b5
|
@ -1,50 +0,0 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Jellyfish.Virtu.Properties
|
||||
{
|
||||
public static class Strings // Hack because we don't want resources in the core
|
||||
{
|
||||
public static string InvalidAddressRange
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Invalid address range ${0:X04}-${1:X04}.";
|
||||
}
|
||||
}
|
||||
|
||||
public static string MarkerNotFound
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Marker ${0:X04} not found.";
|
||||
}
|
||||
}
|
||||
|
||||
public static string ResourceNotFound
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Resource '{0}' not found.";
|
||||
}
|
||||
}
|
||||
|
||||
public static string ServiceAlreadyPresent
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Service type '{0}' already present.";
|
||||
}
|
||||
}
|
||||
|
||||
public static string ServiceMustBeAssignable
|
||||
{
|
||||
get
|
||||
{
|
||||
return "Service type '{0}' must be assignable from service provider '{1}'.";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
|
@ -4,7 +4,6 @@ using System.Diagnostics.CodeAnalysis;
|
|||
using System.Globalization;
|
||||
using System.IO;
|
||||
using Jellyfish.Library;
|
||||
using Jellyfish.Virtu.Properties;
|
||||
using Jellyfish.Virtu.Services;
|
||||
|
||||
namespace Jellyfish.Virtu
|
||||
|
@ -162,7 +161,7 @@ namespace Jellyfish.Virtu
|
|||
int marker = stream.ReadWord(); // mandatory marker
|
||||
if (marker != Marker)
|
||||
{
|
||||
throw new InvalidOperationException(string.Format(CultureInfo.CurrentUICulture, Strings.MarkerNotFound, Marker));
|
||||
throw new InvalidOperationException(string.Format("Marker ${0:X04} not found.", Marker));
|
||||
}
|
||||
int startAddress = stream.ReadWord();
|
||||
int endAddress = stream.ReadWord();
|
||||
|
@ -172,7 +171,7 @@ namespace Jellyfish.Virtu
|
|||
{
|
||||
if (startAddress > endAddress)
|
||||
{
|
||||
throw new InvalidOperationException(string.Format(CultureInfo.CurrentUICulture, Strings.InvalidAddressRange, startAddress, endAddress));
|
||||
throw new InvalidOperationException(string.Format("Invalid address range ${0:X04}-${1:X04}.", startAddress, endAddress));
|
||||
}
|
||||
Load(stream, startAddress, endAddress - startAddress + 1);
|
||||
marker = stream.ReadWord(optional: true); // optional marker
|
||||
|
|
|
@ -57,7 +57,6 @@
|
|||
<Compile Include="Library\DisposableBase.cs" />
|
||||
<Compile Include="Library\MathHelpers.cs" />
|
||||
<Compile Include="Library\StreamExtensions.cs" />
|
||||
<Compile Include="Library\Strings.cs" />
|
||||
<Compile Include="Machine.cs" />
|
||||
<Compile Include="MachineComponent.cs" />
|
||||
<Compile Include="MachineEvents.cs" />
|
||||
|
|
Binary file not shown.
Loading…
Reference in New Issue