Switching static functions to non-static

tripal/includes/TripalField.inc

@@ -232,7 +232,7 @@ class TripalField {
    *   to the user.
    *
    */
-  public static function formatterSettingsSummary($field, $instance, $view_mode) {
+  public function formatterSettingsSummary($view_mode) {
 
   }
 
@@ -259,8 +259,7 @@ class TripalField {
    * @return
    *   A Drupal Form array containing the settings form for this field.
    */
-  public static function formatterSettingsForm($field, $instance,
-      $view_mode, $form, &$form_state) {
+  public function formatterSettingsForm($view_mode, $form, &$form_state) {
 
   }
 
@@ -385,8 +384,7 @@ class TripalField {
    *      - message: The human readable message to be displayed.
    *
    */
-  public static function widgetFormValidate($entity_type, $entity, $field, $instance, $langcode,
-      $items, &$errors) {
+  public function widgetFormValidate($entity_type, $entity, $field, $items, &$errors) {
 
   }
 
@@ -418,8 +416,7 @@ class TripalField {
    *  @param $form_state.
    *    The form state array.
    */
-  public static function widgetFormSubmit($entity_type, $entity, $field, $instance, $langcode,
-      &$items, $form, &$form_state) {
+  public function widgetFormSubmit($entity_type, $entity, $langcode, &$items, $form, &$form_state) {
   }
   /**
    * Loads the field values from the underlying data store.
@@ -453,10 +450,6 @@ class TripalField {
 
   }
 
-
-  public function instanceLoad($instance) {
-
-  }
   /**
    * Provides a form for the 'Field Settings' of the field management page.
    *
@@ -470,7 +463,7 @@ class TripalField {
    * @param $has_data
    *   TRUE if the field already has data, FALSE if not.
    */
-  public static function instanceSettingsForm($field, $instance) {
+  public function instanceSettingsForm() {
     $settings = $instance['settings'];
     $element = array();
 
@@ -497,7 +490,7 @@ class TripalField {
    * @param unknown $form
    * @param unknown $form_state
    */
-  public static function instanceSettingsFormValidate($field, $instance, $form, &$form_state) {
+  public function instanceSettingsFormValidate($form, &$form_state) {
 
   }
 
@@ -514,7 +507,7 @@ class TripalField {
    * @param $has_data
    *   TRUE if the field already has data, FALSE if not.
    */
-  public static function globalSettingsForm($field, $instance, $has_data) {
+  public function globalSettingsForm($has_data) {
     $settings = $field['settings'];
     $element = array();
 
@@ -541,7 +534,7 @@ class TripalField {
    * @param unknown $form
    * @param unknown $form_state
    */
-  public static function globalSettingsFormValidate($field, $instance, $form, &$form_state) {
+  public function globalSettingsFormValidate($form, &$form_state) {
 
   }
 
@@ -555,7 +548,7 @@ class TripalField {
    * @return
    *   An associative array describing the data structure of the field.
    */
-  public static function viewsDataAlter(&$data, $field, $entity_info) {
+  public function viewsDataAlter(&$data, $entity_info) {
 
   }
 

tripal/includes/tripal.fields.inc

@@ -231,7 +231,7 @@ function tripal_field_instance_settings_form($field, $instance) {
   $is_loaded = tripal_load_include_field_type($field_type);
   if ($is_loaded) {
     $tfield = new $field_type($field, $instance);
-    $form = $tfield->instanceSettingsForm($field, $instance);
+    $form = $tfield->instanceSettingsForm();
   }
   return $form;
 }
@@ -281,7 +281,7 @@ function tripal_field_formatter_settings_summary($field, $instance, $view_mode)
   $is_loaded = tripal_load_include_field_type($field_type);
   if ($is_loaded) {
     $tfield = new $field_type($field, $instance);
-    $form = $tfield->formatterSettingsSummary($field, $instance, $view_mode);
+    $form = $tfield->formatterSettingsSummary($view_mode);
   }
   return $summary;
 }
@@ -297,7 +297,7 @@ function tripal_formatter_settings_form($field, $instance,
   $is_loaded = tripal_load_include_field_type($field_type);
   if ($is_loaded) {
     $tfield = new $field_type($field, $instance);
-    $form = $tfield->formatterSettingsForm(field, $instance, $view_mode, $form, $form_state);
+    $form = $tfield->formatterSettingsForm($view_mode, $form, $form_state);
   }
   return $form;
 }
@@ -385,8 +385,7 @@ function tripal_field_submit($entity_type, $entity, $field, $instance,
   $is_loaded = tripal_load_include_field_type($field_type);
   if ($is_loaded) {
     $tfield = new $field_type($field, $instance);
-    $form = $field_type::widgetFormSubmit($entity_type, $entity, $field, $instance,
-        $langcode, $items, $form, $form_state);
+    $form = $tfield->widgetFormSubmit($entity_type, $entity, $langcode, $items, $form, $form_state);
   }
 }
 

tripal_chado/includes/TripalFields/chado_gene__transcripts.inc

@@ -125,16 +125,14 @@ class chado_gene__transcripts extends TripalField {
   /**
    * @see TripalField::formatter_settings_summary()
    */
-  public static function formatterSettingsSummary($field, $instance,
-      $view_mode) {
+  public function formatterSettingsSummary($view_mode) {
 
   }
 
   /**
    * @see TripalField::formatter_settings_form()
    */
-  public static function formatterSettingsForm($field, $instance,
-      $view_mode, $form, &$form_state) {
+  public function formatterSettingsForm($view_mode, $form, &$form_state) {
 
   }
 

tripal_chado/includes/TripalFields/chado_linker__prop.inc

@@ -127,7 +127,7 @@ class chado_linker__prop extends TripalField {
   /**
    * @see TripalField::validate()
    */
-  static function widgetFormValidate($entity_type, $entity, $field, $instance, $langcode, $items, &$errors) {
+  public function widgetFormValidate($entity_type, $entity, $field, $items, &$errors) {
     $field_name = $element['#field_name'];
     $delta = $element['#delta'];
     $entity = $element['#entity'];

tripal_chado/includes/TripalFields/chado_linker__prop_adder.inc

@@ -149,8 +149,7 @@ class chado_linker__prop_adder extends TripalField {
   /**
    * @see TripalField::widgetFormValidate
    */
-  public static function widgetFormValidate($entity_type, $entity, $field, $instance, $langcode,
-      $items, &$errors) {
+  public function widgetFormValidate($entity_type, $entity, $field, $items, &$errors) {
 
   }
 }

tripal_chado/includes/TripalFields/chado_linker__relationship.inc

@@ -869,9 +869,9 @@ class chado_linker__relationship extends TripalField {
   /**
    * @see TripalField::instanceSettingsForm()
    */
-  public static function instanceSettingsForm($field, $instance) {
+  public function instanceSettingsForm() {
 
-    $element = parent::instanceSettingsForm($field, $instance);
+    $element = parent::instanceSettingsForm();
     $element['relationships'] = array(
       '#type' => 'fieldset',
       '#title' => 'Allowed Relationship Types',
@@ -949,7 +949,7 @@ class chado_linker__relationship extends TripalField {
   /**
    * @see TripalField::instanceSettingsFormValidate()
    */
-  public static function instanceSettingsFormValidate($field, $instance, $form, &$form_state) {
+  public function instanceSettingsFormValidate($form, &$form_state) {
     //dpm($form);dpm($form_state);
     $settings = $form_state['values']['instance']['settings'];
 
@@ -977,9 +977,9 @@ class chado_linker__relationship extends TripalField {
       $term = tripal_get_cvterm(array('name' => trim($supertype)));
       if (!isset($term->cvterm_id)) {
         form_set_error(
-            "instance][settings][relationships][child_relationship_types",
-            t("The term '@type' can not be found or matches more than one term.", array('@type' => $supertype))
-            );
+          "instance][settings][relationships][child_relationship_types",
+          t("The term '@type' can not be found or matches more than one term.", array('@type' => $supertype))
+        );
       }
     }
   }