From aae0222f8154a32d71112a8a468412efa5b857da Mon Sep 17 00:00:00 2001
From: MW
Date: Thu, 17 May 2007 10:24:10 +0000
Subject: More OO and abstract goodness for Gareth to drool over. Cleaned up
 the World class a bit and added a WorldBase class (that World now inherits
 from)

---
 .../OpenSim.Scripting.EmbeddedJVM.csproj           | 306 ++++++++++-----------
 .../OpenSim.Scripting.EmbeddedJVM.dll.build        | 124 ++++-----
 2 files changed, 215 insertions(+), 215 deletions(-)

(limited to 'OpenSim.Scripting/EmbeddedJVM')

diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
index 3b3053b..a1e95f4 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.csproj
@@ -1,153 +1,153 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5C69901F-0000-0000-0000-000000000000}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon></ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder></AppDesignerFolder>
-    <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>
-    <StartupObject></StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>False</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>True</Optimize>
-    <OutputPath>../../bin/ScriptEngines/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile></DocumentationFile>
-    <DebugSymbols>True</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <Optimize>False</Optimize>
-    <OutputPath>../../bin/ScriptEngines/</OutputPath>
-    <RegisterForComInterop>False</RegisterForComInterop>
-    <RemoveIntegerChecks>False</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn></NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" >
-      <HintPath>System.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="System.Xml" >
-      <HintPath>System.Xml.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../../OpenSim.Framework/OpenSim.Framework.csproj">
-      <Name>OpenSim.Framework</Name>
-      <Project>{7404933D-0000-0000-0000-000000000000}</Project>
-      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-			<Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ClassInstance.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ClassRecord.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Heap.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Interpreter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterLogic.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterMethods.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="InterpreterReturn.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MethodMemory.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Object.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="OpenSimJVM.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Stack.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="StackFrame.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Thread.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties/AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/ArrayReference.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/BaseType.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/ObjectReference.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/PrimitiveTypes/Byte.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/PrimitiveTypes/Char.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/PrimitiveTypes/Float.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Types/PrimitiveTypes/Int.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>8.0.50727</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{97A82740-0000-0000-0000-000000000000}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>OpenSim.Scripting.EmbeddedJVM</AssemblyName>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder></AppDesignerFolder>
+    <RootNamespace>OpenSim.Scripting.EmbeddedJVM</RootNamespace>
+    <StartupObject></StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>True</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>False</Optimize>
+    <OutputPath>..\..\bin\ScriptEngines\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile></DocumentationFile>
+    <DebugSymbols>False</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <Optimize>True</Optimize>
+    <OutputPath>..\..\bin\ScriptEngines\</OutputPath>
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <RemoveIntegerChecks>False</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn></NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" >
+      <HintPath>System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System.Xml" >
+      <HintPath>System.Xml.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\OpenSim.Framework\OpenSim.Framework.csproj">
+      <Name>OpenSim.Framework</Name>
+      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+			<Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ClassInstance.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ClassRecord.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Heap.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Interpreter.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="InterpreterLogic.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="InterpreterMethods.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="InterpreterReturn.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainMemory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MethodMemory.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Object.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="OpenSimJVM.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Stack.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="StackFrame.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Thread.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\ArrayReference.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\BaseType.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\ObjectReference.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimitiveTypes\Byte.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimitiveTypes\Char.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimitiveTypes\Float.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Types\PrimitiveTypes\Int.cs">
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index cf6c71d..ae79c83 100644
--- a/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -1,62 +1,62 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.Scripting.EmbeddedJVM" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="ClassInstance.cs" />
-                <include name="ClassRecord.cs" />
-                <include name="Heap.cs" />
-                <include name="Interpreter.cs" />
-                <include name="InterpreterLogic.cs" />
-                <include name="InterpreterMethods.cs" />
-                <include name="InterpreterReturn.cs" />
-                <include name="MainMemory.cs" />
-                <include name="MethodMemory.cs" />
-                <include name="Object.cs" />
-                <include name="OpenSimJVM.cs" />
-                <include name="Stack.cs" />
-                <include name="StackFrame.cs" />
-                <include name="Thread.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
-                <include name="Types/ArrayReference.cs" />
-                <include name="Types/BaseType.cs" />
-                <include name="Types/ObjectReference.cs" />
-                <include name="Types/PrimitiveTypes/Byte.cs" />
-                <include name="Types/PrimitiveTypes/Char.cs" />
-                <include name="Types/PrimitiveTypes/Float.cs" />
-                <include name="Types/PrimitiveTypes/Int.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/ScriptEngines/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/ScriptEngines/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/ScriptEngines/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>
+<project name="OpenSim.Scripting.EmbeddedJVM" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+            <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="ClassInstance.cs" />
+                <include name="ClassRecord.cs" />
+                <include name="Heap.cs" />
+                <include name="Interpreter.cs" />
+                <include name="InterpreterLogic.cs" />
+                <include name="InterpreterMethods.cs" />
+                <include name="InterpreterReturn.cs" />
+                <include name="MainMemory.cs" />
+                <include name="MethodMemory.cs" />
+                <include name="Object.cs" />
+                <include name="OpenSimJVM.cs" />
+                <include name="Stack.cs" />
+                <include name="StackFrame.cs" />
+                <include name="Thread.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Types/ArrayReference.cs" />
+                <include name="Types/BaseType.cs" />
+                <include name="Types/ObjectReference.cs" />
+                <include name="Types/PrimitiveTypes/Byte.cs" />
+                <include name="Types/PrimitiveTypes/Char.cs" />
+                <include name="Types/PrimitiveTypes/Float.cs" />
+                <include name="Types/PrimitiveTypes/Int.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/ScriptEngines/" />
+        <mkdir dir="${project::get-base-directory()}/../../bin/ScriptEngines/"/>
+        <copy todir="${project::get-base-directory()}/../../bin/ScriptEngines/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
-- 
cgit v1.1