4 files changed, 3 insertions, 14 deletions
diff --git a/app/models/chouette/company.rb b/app/models/chouette/company.rb
index 94a23f008..7c6f8e4f2 100644
--- a/app/models/chouette/company.rb
+++ b/app/models/chouette/company.rb
@@ -2,7 +2,7 @@ class Chouette::Company < Chouette::ActiveRecord
   include CompanyRestrictions
   include StifCodifligneAttributesSupport
   include LineReferentialSupport
-  include ObjectIdFormatToLineReferential
+  include ObjectIdFormatToReferential
 
   has_many :lines
 
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 383f5ceae..665eca779 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -2,7 +2,7 @@ class Chouette::Line < Chouette::ActiveRecord
   include StifCodifligneAttributesSupport
   include LineRestrictions
   include LineReferentialSupport
-  include ObjectIdFormatToLineReferential
+  include ObjectIdFormatToReferential
   extend StifTransportModeEnumerations
   extend StifTransportSubmodeEnumerations
 
diff --git a/app/models/chouette/network.rb b/app/models/chouette/network.rb
index dad1a17d2..6c8a12bda 100644
--- a/app/models/chouette/network.rb
+++ b/app/models/chouette/network.rb
@@ -2,7 +2,7 @@ class Chouette::Network < Chouette::ActiveRecord
   include StifCodifligneAttributesSupport
   include NetworkRestrictions
   include LineReferentialSupport
-  include ObjectIdFormatToLineReferential
+  include ObjectIdFormatToReferential
   # FIXME http://jira.codehaus.org/browse/JRUBY-6358
   self.primary_key = "id"
 
diff --git a/app/models/concerns/object_id_format_to_line_referential.rb b/app/models/concerns/object_id_format_to_line_referential.rb
deleted file mode 100644
index 9725be824..000000000
--- a/app/models/concerns/object_id_format_to_line_referential.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module ObjectIdFormatToLineReferential
-  extend ActiveSupport::Concern
-
-  included do
-    validates_presence_of :objectid_format
-  end
-
-  def objectid_format
-    "#{self.line_referential.objectid_format}_attributes_support".camelcase.constantize if self.line_referential.objectid_format
-  end
-end