lib/phenomenal/manager/manager.rb in phenomenal-1.1.1 vs lib/phenomenal/manager/manager.rb in phenomenal-1.2.1

@@ -1,29 +1,29 @@
 require 'singleton'
 # This class manage the different contexts in the system and their interactions
 class Phenomenal::Manager
   include Singleton
   include Phenomenal::ConflictPolicies
-  include Phenomenal::AdaptationsManagement
-  include Phenomenal::ContextsManagement
+  include Phenomenal::AdaptationManagement
+  include Phenomenal::ContextManagement
   
   attr_accessor :rmanager
   
   # PRIVATE METHODS
   private
-   # Set the default context
+   # Set the default feature
   def init_default
-    self.default_context= Phenomenal::Feature.new(nil,self)
-    self.default_context.activate
+    self.default_feature = Phenomenal::Feature.new(nil,self)
+    self.default_feature.activate
   end
 
   # Private constructor because this is a singleton object
   def initialize
     @contexts = Hash.new
     @deployed_adaptations = Array.new
     @active_adaptations = Array.new
     @combined_contexts = Hash.new
     @shared_contexts = Hash.new
-    @rmanager = Phenomenal::RelationshipsManager.instance
+    @rmanager = Phenomenal::RelationshipManager.instance
     init_default()
   end
 end