From 66755fb166303968837afd1093e873a249d0a144 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Nov 2012 18:11:10 +0100 Subject: [PATCH] Fix: Avoid confusion between method getXXX into parent class with method getXXX into child class. They are not inheritance, so i renamed method of parent into getXXXForKey. --- .../modules/export/export_csv.modules.php | 12 +++++------ .../modules/export/export_excel.modules.php | 12 +++++------ .../export/export_excel2007.modules.php | 12 +++++------ .../modules/export/export_tsv.modules.php | 12 +++++------ htdocs/core/modules/export/modules_export.php | 12 +++++------ .../modules/import/import_csv.modules.php | 15 +++++--------- htdocs/core/modules/import/modules_import.php | 12 +++++------ htdocs/exports/export.php | 8 ++++---- htdocs/exports/index.php | 10 +++++----- htdocs/imports/import.php | 20 +++++++++---------- htdocs/imports/index.php | 10 +++++----- 11 files changed, 65 insertions(+), 70 deletions(-) diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php index 744a8830588..29f294128f5 100644 --- a/htdocs/core/modules/export/export_csv.modules.php +++ b/htdocs/core/modules/export/export_csv.modules.php @@ -85,9 +85,9 @@ class ExportCsv extends ModeleExports /** * getDriverLabel * - * @return string + * @return string Return driver label */ - function getDriverLabel($key='') + function getDriverLabel() { return $this->label; } @@ -97,7 +97,7 @@ class ExportCsv extends ModeleExports * * @return string */ - function getDriverDesc($key='') + function getDriverDesc() { return $this->desc; } @@ -117,7 +117,7 @@ class ExportCsv extends ModeleExports * * @return string */ - function getDriverVersion($key='') + function getDriverVersion() { return $this->version; } @@ -127,7 +127,7 @@ class ExportCsv extends ModeleExports * * @return string */ - function getLibLabel($key='') + function getLibLabel() { return $this->label_lib; } @@ -137,7 +137,7 @@ class ExportCsv extends ModeleExports * * @return string */ - function getLibVersion($key='') + function getLibVersion() { return $this->version_lib; } diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php index a53c2a21765..de999c5c749 100644 --- a/htdocs/core/modules/export/export_excel.modules.php +++ b/htdocs/core/modules/export/export_excel.modules.php @@ -85,9 +85,9 @@ class ExportExcel extends ModeleExports /** * getDriverLabel * - * @return string + * @return string Return driver label */ - function getDriverLabel($key='') + function getDriverLabel() { return $this->label; } @@ -97,7 +97,7 @@ class ExportExcel extends ModeleExports * * @return string */ - function getDriverDesc($key='') + function getDriverDesc() { return $this->desc; } @@ -117,7 +117,7 @@ class ExportExcel extends ModeleExports * * @return string */ - function getDriverVersion($key='') + function getDriverVersion() { return $this->version; } @@ -127,7 +127,7 @@ class ExportExcel extends ModeleExports * * @return string */ - function getLibLabel($key='') + function getLibLabel() { return $this->label_lib; } @@ -137,7 +137,7 @@ class ExportExcel extends ModeleExports * * @return string */ - function getLibVersion($key='') + function getLibVersion() { return $this->version_lib; } diff --git a/htdocs/core/modules/export/export_excel2007.modules.php b/htdocs/core/modules/export/export_excel2007.modules.php index 7d8316ee359..54db5efe1a6 100755 --- a/htdocs/core/modules/export/export_excel2007.modules.php +++ b/htdocs/core/modules/export/export_excel2007.modules.php @@ -86,9 +86,9 @@ class ExportExcel2007 extends ExportExcel /** * getDriverLabel * - * @return string + * @return string Return driver label */ - function getDriverLabel($key='') + function getDriverLabel() { return $this->label; } @@ -98,7 +98,7 @@ class ExportExcel2007 extends ExportExcel * * @return string */ - function getDriverDesc($key='') + function getDriverDesc() { return $this->desc; } @@ -118,7 +118,7 @@ class ExportExcel2007 extends ExportExcel * * @return string */ - function getDriverVersion($key='') + function getDriverVersion() { return $this->version; } @@ -128,7 +128,7 @@ class ExportExcel2007 extends ExportExcel * * @return string */ - function getLibLabel($key='') + function getLibLabel() { return $this->label_lib; } @@ -138,7 +138,7 @@ class ExportExcel2007 extends ExportExcel * * @return string */ - function getLibVersion($key='') + function getLibVersion() { return $this->version_lib; } diff --git a/htdocs/core/modules/export/export_tsv.modules.php b/htdocs/core/modules/export/export_tsv.modules.php index 687b9c6fb8d..bce70493080 100644 --- a/htdocs/core/modules/export/export_tsv.modules.php +++ b/htdocs/core/modules/export/export_tsv.modules.php @@ -80,9 +80,9 @@ class ExportTsv extends ModeleExports /** * getDriverLabel * - * @return string + * @return string Return driver label */ - function getDriverLabel($key='') + function getDriverLabel() { return $this->label; } @@ -92,7 +92,7 @@ class ExportTsv extends ModeleExports * * @return string */ - function getDriverDesc($key='') + function getDriverDesc() { return $this->desc; } @@ -112,7 +112,7 @@ class ExportTsv extends ModeleExports * * @return string */ - function getDriverVersion($key='') + function getDriverVersion() { return $this->version; } @@ -122,7 +122,7 @@ class ExportTsv extends ModeleExports * * @return string */ - function getLibLabel($key='') + function getLibLabel() { return $this->label_lib; } @@ -132,7 +132,7 @@ class ExportTsv extends ModeleExports * * @return string */ - function getLibVersion($key='') + function getLibVersion() { return $this->version_lib; } diff --git a/htdocs/core/modules/export/modules_export.php b/htdocs/core/modules/export/modules_export.php index ee9f06674af..49d069a3929 100644 --- a/htdocs/core/modules/export/modules_export.php +++ b/htdocs/core/modules/export/modules_export.php @@ -99,7 +99,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Picto string */ - function getPicto($key) + function getPictoForKey($key) { return $this->picto[$key]; } @@ -110,7 +110,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Label */ - function getDriverLabel($key) + function getDriverLabelForKey($key) { return $this->driverlabel[$key]; } @@ -121,7 +121,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Description */ - function getDriverDesc($key) + function getDriverDescForKey($key) { return $this->driverdesc[$key]; } @@ -132,7 +132,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Driver version */ - function getDriverVersion($key) + function getDriverVersionForKey($key) { return $this->driverversion[$key]; } @@ -143,7 +143,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Label of library */ - function getLibLabel($key) + function getLibLabelForKey($key) { return $this->liblabel[$key]; } @@ -154,7 +154,7 @@ class ModeleExports extends CommonDocGenerator // This class can't be abstrac * @param string $key Key of driver * @return string Version of library */ - function getLibVersion($key) + function getLibVersionForKey($key) { return $this->libversion[$key]; } diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php index da0e2718860..c7f3bfa9c24 100644 --- a/htdocs/core/modules/import/import_csv.modules.php +++ b/htdocs/core/modules/import/import_csv.modules.php @@ -99,10 +99,9 @@ class ImportCsv extends ModeleImports /** * getDriverLabel * - * @param string $key Key * @return string Label */ - function getDriverLabel($key='') + function getDriverLabel() { return $this->label; } @@ -110,10 +109,9 @@ class ImportCsv extends ModeleImports /** * getDriverDesc * - * @param string $key Key * @return string Description */ - function getDriverDesc($key='') + function getDriverDesc() { return $this->desc; } @@ -131,10 +129,9 @@ class ImportCsv extends ModeleImports /** * getDriverVersion * - * @param string $key Key * @return string Driver version */ - function getDriverVersion($key='') + function getDriverVersion() { return $this->version; } @@ -142,10 +139,9 @@ class ImportCsv extends ModeleImports /** * getDriverLabel * - * @param string $key Key * @return string Label of external lib */ - function getLibLabel($key='') + function getLibLabel() { return $this->label_lib; } @@ -153,10 +149,9 @@ class ImportCsv extends ModeleImports /** * getLibVersion * - * @param string $key Key * @return string Version of external lib */ - function getLibVersion($key='') + function getLibVersion() { return $this->version_lib; } diff --git a/htdocs/core/modules/import/modules_import.php b/htdocs/core/modules/import/modules_import.php index 87c0db7a972..51480bc1128 100644 --- a/htdocs/core/modules/import/modules_import.php +++ b/htdocs/core/modules/import/modules_import.php @@ -116,7 +116,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getPicto($key) + function getPictoForKey($key) { return $this->picto[$key]; } @@ -127,7 +127,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getDriverLabel($key) + function getDriverLabelForKey($key) { return $this->_driverlabel[$key]; } @@ -138,7 +138,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getDriverDesc($key) + function getDriverDescForKey($key) { return $this->_driverdesc[$key]; } @@ -149,7 +149,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getDriverVersion($key) + function getDriverVersionForKey($key) { return $this->_driverversion[$key]; } @@ -160,7 +160,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getLibLabel($key) + function getLibLabelForKey($key) { return $this->_liblabel[$key]; } @@ -171,7 +171,7 @@ class ModeleImports * @param string $key Key * @return string */ - function getLibVersion($key) + function getLibVersionForKey($key) { return $this->_libversion[$key]; } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index e0e9b678be1..47801a74e22 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -1152,10 +1152,10 @@ if ($step == 5 && $datatoexport) { $var=!$var; print ''; - print ''.img_picto_common($key,$objmodelexport->getPicto($key)).''; - $text=$objmodelexport->getDriverDesc($key); - print ''.$form->textwithpicto($objmodelexport->getDriverLabel($key),$text).''; - print ''.$objmodelexport->getLibLabel($key).''.$objmodelexport->getLibVersion($key).''."\n"; + print ''.img_picto_common($key,$objmodelexport->getPictoForKey($key)).''; + $text=$objmodelexport->getDriverDescForKey($key); + print ''.$form->textwithpicto($objmodelexport->getDriverLabelForKey($key),$text).''; + print ''.$objmodelexport->getLibLabelForKey($key).''.$objmodelexport->getLibVersionForKey($key).''."\n"; } print ''; diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php index 079fd67ceca..b4dcbd6cd9c 100644 --- a/htdocs/exports/index.php +++ b/htdocs/exports/index.php @@ -130,11 +130,11 @@ foreach($liste as $key => $val) { $var=!$var; print ''; - print ''.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''; - $text=$model->getDriverDesc($key); - print ''.$form->textwithpicto($model->getDriverLabel($key),$text).''; - print ''.$model->getLibLabel($key).''; - print ''.$model->getLibVersion($key).''; + print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; + $text=$model->getDriverDescForKey($key); + print ''.$form->textwithpicto($model->getDriverLabelForKey($key),$text).''; + print ''.$model->getLibLabelForKey($key).''; + print ''.$model->getLibVersionForKey($key).''; print ''; } diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index c4f0c6727ac..c942bd23efe 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -442,9 +442,9 @@ if ($step == 2 && $datatoimport) { $var=!$var; print ''; - print ''.img_picto_common($key,$objmodelimport->getPicto($key)).''; - $text=$objmodelimport->getDriverDesc($key); - print ''.$form->textwithpicto($objmodelimport->getDriverLabel($key),$text).''; + print ''.img_picto_common($key,$objmodelimport->getPictoForKey($key)).''; + $text=$objmodelimport->getDriverDescForKey($key); + print ''.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key),$text).''; print ''.$langs->trans("DownloadEmptyExample").''; // Action button print ''; @@ -510,8 +510,8 @@ if ($step == 3 && $datatoimport) // Source file format print ''.$langs->trans("SourceFileFormat").''; print ''; - $text=$objmodelimport->getDriverDesc($format); - print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); + $text=$objmodelimport->getDriverDescForKey($format); + print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print ''.$langs->trans("DownloadEmptyExample").''; print ''; @@ -715,8 +715,8 @@ if ($step == 4 && $datatoimport) // Source file format print ''.$langs->trans("SourceFileFormat").''; print ''; - $text=$objmodelimport->getDriverDesc($format); - print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); + $text=$objmodelimport->getDriverDescForKey($format); + print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print ''; // Separator and enclosure @@ -1164,8 +1164,8 @@ if ($step == 5 && $datatoimport) // Source file format print ''.$langs->trans("SourceFileFormat").''; print ''; - $text=$objmodelimport->getDriverDesc($format); - print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); + $text=$objmodelimport->getDriverDescForKey($format); + print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print ''; // File to import @@ -1499,7 +1499,7 @@ if ($step == 6 && $datatoimport) print ''.$langs->trans("SourceFileFormat").''; print ''; $text=$objmodelimport->getDriverDesc($format); - print $form->textwithpicto($objmodelimport->getDriverLabel($format),$text); + print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format),$text); print ''; // File to import diff --git a/htdocs/imports/index.php b/htdocs/imports/index.php index f9f6dfb9d27..e5915f9bbbb 100644 --- a/htdocs/imports/index.php +++ b/htdocs/imports/index.php @@ -121,11 +121,11 @@ foreach($liste as $key) { $var=!$var; print ''; - print ''.img_picto_common($model->getDriverLabel($key),$model->getPicto($key)).''; - $text=$model->getDriverDesc($key); - print ''.$form->textwithpicto($model->getDriverLabel($key),$text).''; - print ''.$model->getLibLabel($key).''; - print ''.$model->getLibVersion($key).''; + print ''.img_picto_common($model->getDriverLabelForKey($key),$model->getPictoForKey($key)).''; + $text=$model->getDriverDescForKey($key); + print ''.$form->textwithpicto($model->getDriverLabelForKey($key),$text).''; + print ''.$model->getLibLabelForKey($key).''; + print ''.$model->getLibVersionForKey($key).''; print ''; }