[TWiki-Dev] [SVN] WillNorris r13598 - in twiki/branches/MAIN/twikiplugins/BeautifierPlugin: data/TWiki lib/TWiki/Plugins

[<de...@de...>]

Author: WillNorris
Date: 2007-05-01 03:07:45 -0500 (Tue, 01 May 2007)
New Revision: 13598

Modified:
   twiki/branches/MAIN/twikiplugins/BeautifierPlugin/data/TWiki/BeautifierPlugin.txt
   twiki/branches/MAIN/twikiplugins/BeautifierPlugin/lib/TWiki/Plugins/BeautifierPlugin.pm
Log:
Item3990: fixed 'shift' warnings

Modified: twiki/branches/MAIN/twikiplugins/BeautifierPlugin/data/TWiki/BeautifierPlugin.txt
===================================================================
--- twiki/branches/MAIN/twikiplugins/BeautifierPlugin/data/TWiki/BeautifierPlugin.txt	2007-04-30 21:00:57 UTC (rev 13597)
+++ twiki/branches/MAIN/twikiplugins/BeautifierPlugin/data/TWiki/BeautifierPlugin.txt	2007-05-01 08:07:45 UTC (rev 13598)
@@ -94,6 +94,7 @@
 ---++ History
 
 | *Date* | *Change* | *Name* |
+| 30 Apr 2007 | warnings cleanup; no functional changes | TWiki:Main.WillNorris |
 | 27 Apr 2007 | automatically adds CSS for formatting code fragments | TWiki:Main.WillNorris |
 |  1 Jan 2006 | upgraded to TWiki::Func::extractNameValuePair for better parameter parsing, upgraded TWiki:Plugins.BuildContrib support | TWiki:Main.WillNorris |
 | 26 Jul 2003 | Syntax fixes from TWiki:Main/WillNorris  | TWiki:Main/LingLo |
@@ -101,7 +102,7 @@
 | 28 Dec 2002 | Accepts mixed case language names | TWiki:Main/LingLo |
 | 20 Dec 2002 | Changed syntax to allow for simpler addition of new languages | TWiki:Main/LingLo |
 | 16 Oct 2002 | Added nebula nodes and links to Python scripts, but it doesn't work since the node names are usually in strings | TWiki:Main/LeafGarland |
-| 30 Jul 2002 | Added nebula nodes and links to Tcl scripts | TWiki:Main/LeafGarland |
+| 30 Jul 2002 | Added nebula nodes and links to TCL scripts | TWiki:Main/LeafGarland |
 | 30 Jul 2002 | Changed Beautifier::Core to use 'linkscripts' | TWiki:Main/LeafGarland |
 | 28 Jul 2002 | Created | TWiki:Main/LingLo |
 

Modified: twiki/branches/MAIN/twikiplugins/BeautifierPlugin/lib/TWiki/Plugins/BeautifierPlugin.pm
===================================================================
--- twiki/branches/MAIN/twikiplugins/BeautifierPlugin/lib/TWiki/Plugins/BeautifierPlugin.pm	2007-04-30 21:00:57 UTC (rev 13597)
+++ twiki/branches/MAIN/twikiplugins/BeautifierPlugin/lib/TWiki/Plugins/BeautifierPlugin.pm	2007-05-01 08:07:45 UTC (rev 13598)
@@ -106,7 +106,7 @@
 
 sub handleCode
 {
-    my $args = shift;
+    my ( $args, $codeFragment ) = @_;
 
     TWiki::Func::addToHEAD( BEAUTIFIERPLUGIN_CODEFRAGMENT_CSS => '<link rel="stylesheet" href="%PUBURL%/%TWIKIWEB%/BeautifierPlugin/style.css" type="text/css" media="all" />' );
 
@@ -117,19 +117,19 @@
         eval "use HFile::HFile_$lang";
         if ($@)
         {
-            return '<b>BeautifierPlugin Error: Unable to handle "$lang" syntax.</b>'
-		. _formatBeautifierOutput( shift );
+            return qq{<b>BeautifierPlugin Error: Unable to handle "$lang" language.</b>}
+		. _formatBeautifierOutput( $codeFragment );
         }
         my $hfile = eval "new HFile::HFile_$lang";
         $langs->{$lang} = new Beautifier::Core($hfile, new Output::HTML);
     }
-    return _formatBeautifierOutput( $langs->{$lang}->highlight_text( shift ) );
+    return _formatBeautifierOutput( $langs->{$lang}->highlight_text( $codeFragment ) );
 }
 
 # =========================
 
 sub _formatBeautifierOutput {
-    return '<div class="BeautifierPlugin"><div class="fragment"><pre>' . shift . '</pre></div></div>';
+    return '<div class="BeautifierPlugin"><div class="fragment"><pre>' . shift() . '</pre></div></div>';
 }
 
 # =========================