The branch, master has been updated via 008b96aaec574b7d3310883c893f6023d620fc01 (commit) via 5330cabd37d043c1c63ca5406c726bbf83b6c428 (commit) from c03c7bbc69d7b05ad3290d3378d48f3debb80745 (commit) - Log ----------------------------------------------------------------- commit 008b96aaec574b7d3310883c893f6023d620fc01 Author: Michal Čihař <mcihar@suse.cz> Date: Thu Jul 21 14:29:36 2011 +0200 Coding style Wrap ling lines, add missing {} around for and if. commit 5330cabd37d043c1c63ca5406c726bbf83b6c428 Author: Michal Čihař <mcihar@suse.cz> Date: Thu Jul 21 14:28:22 2011 +0200 Remove rest of custom color support This seems to be stray code for it. Also adjusted documentation to represent real return value. ----------------------------------------------------------------------- Summary of changes: libraries/Config.class.php | 5 ++--- libraries/export/codegen.php | 33 ++++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 58ea577..28f9ac3 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -674,7 +674,7 @@ class PMA_Config * or the theme changes * must also check the pma_fontsize cookie in case there is no * config file - * @return int Unix timestamp + * @return int Summary of unix timestamps and fontsize, to be unique on theme parameters change */ function getThemeUniqueValue() { @@ -691,8 +691,7 @@ class PMA_Config $this->default_source_mtime + $this->get('user_preferences_mtime') + $_SESSION['PMA_Theme']->mtime_info + - $_SESSION['PMA_Theme']->filesize_info) - . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'], 1, 6) : ''); + $_SESSION['PMA_Theme']->filesize_info); } /** diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php index 94971e8..a533dd4 100644 --- a/libraries/export/codegen.php +++ b/libraries/export/codegen.php @@ -245,8 +245,9 @@ class TableProperty $result=PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { $tableProperties=array(); - while ($row = PMA_DBI_fetch_row($result)) + while ($row = PMA_DBI_fetch_row($result)) { $tableProperties[] = new TableProperty($row); + } $lines[] = "using System;"; $lines[] = "using System.Collections;"; $lines[] = "using System.Collections.Generic;"; @@ -257,25 +258,37 @@ class TableProperty $lines[] = " public class ".cgMakeIdentifier($table); $lines[] = " {"; $lines[] = " #region Member Variables"; - foreach ($tableProperties as $tablePropertie) + foreach ($tableProperties as $tablePropertie) { $lines[] = $tablePropertie->formatCs(" protected #dotNetPrimitiveType# _#name#;"); + } $lines[] = " #endregion"; $lines[] = " #region Constructors"; $lines[] = " public ".cgMakeIdentifier($table)."() { }"; $temp = array(); - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $temp[] = $tablePropertie->formatCs("#dotNetPrimitiveType# #name#"); + } + } $lines[] = " public ".cgMakeIdentifier($table)."(".implode(", ", $temp).")"; $lines[] = " {"; - foreach ($tableProperties as $tablePropertie) - if (! $tablePropertie->isPK()) + foreach ($tableProperties as $tablePropertie) { + if (! $tablePropertie->isPK()) { $lines[] = $tablePropertie->formatCs(" this._#name#=#name#;"); + } + } $lines[] = " }"; $lines[] = " #endregion"; $lines[] = " #region Public Properties"; - foreach ($tableProperties as $tablePropertie) - $lines[] = $tablePropertie->formatCs(" public virtual #dotNetPrimitiveType# #ucfirstName#\n {\n get {return _#name#;}\n set {_#name#=value;}\n }"); + foreach ($tableProperties as $tablePropertie) { + $lines[] = $tablePropertie->formatCs('' + . ' public virtual #dotNetPrimitiveType# #ucfirstName#' . "\n" + . ' {' . "\n" + . ' get {return _#name#;}' . "\n" + . ' set {_#name#=value;}' . "\n" + . ' }' + ); + } $lines[] = " #endregion"; $lines[] = " }"; $lines[] = " #endregion"; @@ -292,7 +305,9 @@ class TableProperty $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" ' . 'namespace="' . cgMakeIdentifier($db) . '" ' . 'assembly="' . cgMakeIdentifier($db) . '">'; - $lines[] = ' <class name="' . cgMakeIdentifier($table) . '" table="' . cgMakeIdentifier($table) . '">'; + $lines[] = ' <class ' + . 'name="' . cgMakeIdentifier($table) . '" ' + . 'table="' . cgMakeIdentifier($table) . '">'; $result = PMA_DBI_query(sprintf("DESC %s.%s", PMA_backquote($db), PMA_backquote($table))); if ($result) { while ($row = PMA_DBI_fetch_row($result)) { hooks/post-receive -- phpMyAdmin