changing types to type internally

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@184 980ebf18-57e1-0310-9a29-db15c13687c0

5 files changed, 9 insertions, 9 deletions

diff --git a/lib/blink/component.rb b/lib/blink/component.rb
index bad1b0761..35a8d83d9 100644
--- a/lib/blink/component.rb
+++ b/lib/blink/component.rb
@@ -5,10 +5,10 @@
 # the object allowing us to build complex structures
 # this thing contains everything else, including itself
 
-require 'blink/interface'
+require 'blink/type'
 
 module Blink
-	class Component < Blink::Interface
+	class Component < Blink::Type
         attr_accessor :name
 
         @objects = Hash.new(nil)
diff --git a/lib/blink/fact.rb b/lib/blink/fact.rb
index 375e09386..5f6fd9388 100644
--- a/lib/blink/fact.rb
+++ b/lib/blink/fact.rb
@@ -13,7 +13,7 @@ require 'blink'
 require 'blink/types'
 
 module Blink
-	class Fact < Blink::Interface
+	class Fact < Blink::Type
         def Fact.[](name)
             fact = Facter[name]
             if fact.value.nil?
diff --git a/lib/blink/type/file.rb b/lib/blink/type/file.rb
index 77c322c95..24a465c88 100644
--- a/lib/blink/type/file.rb
+++ b/lib/blink/type/file.rb
@@ -4,7 +4,7 @@
 
 require 'digest/md5'
 require 'etc'
-require 'blink/types/state'
+require 'blink/type/state'
 
 module Blink
     # we first define all of the state that our file will use
diff --git a/lib/blink/type/filetype.rb b/lib/blink/type/filetype.rb
index 1ee3b652d..03570018f 100644
--- a/lib/blink/type/filetype.rb
+++ b/lib/blink/type/filetype.rb
@@ -5,10 +5,10 @@
 # parse and write configuration files using objects with minimal parsing abilities
 
 require 'etc'
-require 'blink/interface'
+require 'blink/type'
 
 module Blink
-    class FileType < Blink::Interface
+    class FileType < Blink::Type
         include Enumerable
 
         attr_accessor :file, :splitchar, :childtype
@@ -258,7 +258,7 @@ module Blink
     #---------------------------------------------------------------
 
     #---------------------------------------------------------------
-    class FileRecord < Blink::Interface
+    class FileRecord < Blink::Type
         attr_accessor :fields, :namevar, :splitchar, :object
 
         @@subclasses = {}
diff --git a/lib/blink/type/symlink.rb b/lib/blink/type/symlink.rb
index 0e85c2e85..a5f626d82 100644
--- a/lib/blink/type/symlink.rb
+++ b/lib/blink/type/symlink.rb
@@ -3,8 +3,8 @@
 # $Id$
 
 require 'etc'
-require 'blink/types/state'
-require 'blink/types/file'
+require 'blink/type/state'
+require 'blink/type/file'
 
 module Blink
     # okay, how do we deal with parameters that don't have operations