<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>trunk/as2api</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">api_loader.rb</a></tt></td><td align="right" id="added">+7</td><td align="right" id="removed">-9</td><td nowrap="nowrap" align="center">288 -> 289</td></tr>
<tr class="alt"><td><tt><a href="#file2">api_model.rb</a></tt></td><td align="right" id="added">+2</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center">288 -> 289</td></tr>
<tr><td></td><td align="right" id="added">+9</td><td align="right" id="removed">-11</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Rename variables to match previously renamed ImportList class
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>api_loader.rb</b></big> <small id="info">288 -> 289</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_loader.rb 2006-03-07 22:39:23 UTC (rev 288)
+++ trunk/as2api/api_loader.rb 2006-03-07 23:01:55 UTC (rev 289)
@@ -119,7 +119,7 @@
</small></pre><pre class="diff" id="context"> end
def compilation_unit_start
</pre><pre class="diff" id="removed">- @import_<span id="removedchars">manager</span> = ImportList.new
</pre><pre class="diff" id="added">+ @import_<span id="addedchars">list</span> = ImportList.new
</pre><pre class="diff" id="context"> @defined_type = nil
end
</pre><pre class="diff"><small id="info">@@ -130,7 +130,7 @@
</small></pre><pre class="diff" id="context"> end
def import(name)
</pre><pre class="diff" id="removed">- @import_<span id="removedchars">manager</span>.add_import(name)
</pre><pre class="diff" id="added">+ @import_<span id="addedchars">list</span>.add_import(name)
</pre><pre class="diff" id="context"> end
def start_class(dynamic, name, super_name, interfaces)
</pre><pre class="diff"><small id="info">@@ -149,7 +149,7 @@
</small></pre><pre class="diff" id="context"> end
end
@defined_type.type_resolver = @type_resolver
</pre><pre class="diff" id="removed">- @defined_type.import_manager = @import_manager
</pre><pre class="diff" id="added">+ @defined_type.import_list = @import_list
</pre><pre class="diff" id="context"> end
def start_intrinsic_class(dynamic, name, super_name, interfaces)
</pre><pre class="diff"><small id="info">@@ -167,7 +167,7 @@
</small></pre><pre class="diff" id="context"> @defined_type.extends = @type_resolver.resolve(super_name)
end
@defined_type.type_resolver = @type_resolver
</pre><pre class="diff" id="removed">- @defined_type.import_manager = @import_manager
</pre><pre class="diff" id="added">+ @defined_type.import_list = @import_list
</pre><pre class="diff" id="context"> end
def access_modifier(modifier)
</pre><pre class="diff"><small id="info">@@ -469,8 +469,7 @@
</small></pre><pre class="diff" id="context"> private
def import_types_into_namespace(type, local_namespace)
</pre><pre class="diff" id="removed">- importer = type.import_manager
- importer.each_type do |type_name|
</pre><pre class="diff" id="added">+ type.import_list.each_type do |type_name|
</pre><pre class="diff" id="context"> import_type = local_namespace[type_name.join(".")]
import_type = maybe_parse_external_definition(TypeProxy.new(type, type_name.join('.'))) unless import_type
if import_type
</pre><pre class="diff"><small id="info">@@ -482,8 +481,7 @@
</small></pre><pre class="diff" id="context"> end
def import_packages_into_namespace(type, local_namespace)
</pre><pre class="diff" id="removed">- importer = type.import_manager
- importer.each_package do |package_name|
</pre><pre class="diff" id="added">+ type.import_list.each_package do |package_name|
</pre><pre class="diff" id="context"> @packages[package_name.join(".")].each_type do |package_type|
if local_namespace.has_key?(package_type.unqualified_name)
$stderr.puts "#{type.input_filename}: #{package_type.unqualified_name} already refers to #{local_namespace[package_type.unqualified_name].qualified_name}"
</pre><pre class="diff"><small id="info">@@ -514,7 +512,7 @@
</small></pre><pre class="diff" id="context"> return file_name unless file_name.nil?
return nil if type_proxy.qualified?
</pre><pre class="diff" id="removed">- type_proxy.containing_type.import_<span id="removedchars">manager</span>.each_package do |package_name|
</pre><pre class="diff" id="added">+ type_proxy.containing_type.import_<span id="addedchars">list</span>.each_package do |package_name|
</pre><pre class="diff" id="context"> candidate_name = package_name.join(".") + "." + type_proxy.name
file_name = search_classpath_for(candidate_name)
return file_name unless file_name.nil?
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname">trunk/as2api</span><br />
<div class="fileheader"><big><b>api_model.rb</b></big> <small id="info">288 -> 289</small></div>
<pre class="diff"><small id="info">--- trunk/as2api/api_model.rb 2006-03-07 22:39:23 UTC (rev 288)
+++ trunk/as2api/api_model.rb 2006-03-07 23:01:55 UTC (rev 289)
@@ -32,12 +32,12 @@
</small></pre><pre class="diff" id="context"> @extends = nil
@comment = nil
@type_resolver = nil
</pre><pre class="diff" id="removed">- @import_<span id="removedchars">manager</span> = nil
</pre><pre class="diff" id="added">+ @import_<span id="addedchars">list</span> = nil
</pre><pre class="diff" id="context"> @input_file = nil
@document = true
end
</pre><pre class="diff" id="removed">- attr_accessor :package, :extends, :comment, :source_utf8, :type_resolver, :import_<span id="removedchars">manager</span>, :intrinsic, :constructor
</pre><pre class="diff" id="added">+ attr_accessor :package, :extends, :comment, :source_utf8, :type_resolver, :import_<span id="addedchars">list</span>, :intrinsic, :constructor
</pre><pre class="diff" id="context">
def input_filename
@input_file.suffix
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.11</small></center>
</body></html>