[Squirrel-sql-commits] sql12/plugins/sqlreplace/src/net/sourceforge/squirrel_sql/plugins/sqlreplace ReplacementManager.java, 1.2, 1.3

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/plugins/sqlreplace/src/net/sourceforge/squirrel_sql/plugins/sqlreplace
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv14508/plugins/sqlreplace/src/net/sourceforge/squirrel_sql/plugins/sqlreplace

Modified Files:
	ReplacementManager.java 
Log Message:
Fix for patterns that have embedded special characters so that they are ignored and treated as literals.

Index: ReplacementManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/sqlreplace/src/net/sourceforge/squirrel_sql/plugins/sqlreplace/ReplacementManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ReplacementManager.java	15 Jan 2009 12:11:13 -0000	1.2
--- ReplacementManager.java	13 Feb 2009 03:08:10 -0000	1.3
***************
*** 24,28 ****
  import java.util.Iterator;
  
! import net.sourceforge.squirrel_sql.client.session.MessagePanel;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
--- 24,28 ----
  import java.util.Iterator;
  
! import net.sourceforge.squirrel_sql.fw.util.IMessageHandler;
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
***************
*** 46,50 ****
  	private ArrayList<Replacement> replacements = new ArrayList<Replacement>();
  
! 	MessagePanel mpan;
  
  	private final static ILogger log = LoggerController.createLogger(SQLReplacePlugin.class);
--- 46,50 ----
  	private ArrayList<Replacement> replacements = new ArrayList<Replacement>();
  
! 	IMessageHandler mpan;
  
  	private final static ILogger log = LoggerController.createLogger(SQLReplacePlugin.class);
***************
*** 58,62 ****
  		{
  			replacementFile = new File(_plugin.getPluginUserSettingsFolder(), "sqlreplacement.xml");
! 			mpan = (MessagePanel) _plugin.getApplication().getMessageHandler();
  		}
  		catch (final IOException e)
--- 58,62 ----
  		{
  			replacementFile = new File(_plugin.getPluginUserSettingsFolder(), "sqlreplacement.xml");
! 			mpan = _plugin.getApplication().getMessageHandler();
  		}
  		catch (final IOException e)
***************
*** 156,165 ****
  	public String getContent()
  	{
! 		final StringBuffer sb = new StringBuffer();
  		final Iterator<Replacement> it = replacements.iterator();
  		while (it.hasNext())
  		{
  			final Replacement r = it.next();
! 			sb.append(r.toString() + "\n");
  		}
  
--- 156,166 ----
  	public String getContent()
  	{
! 		final StringBuilder sb = new StringBuilder();
  		final Iterator<Replacement> it = replacements.iterator();
  		while (it.hasNext())
  		{
  			final Replacement r = it.next();
! 			sb.append(r.toString());
! 			sb.append("\n");
  		}
  
***************
*** 182,188 ****
  			if (toReplace.indexOf(r.getVariable()) > -1)
  			{
! 				log.info("Replace-Rule: " + r.toString());
! 				mpan.showMessage("Replace-Rule: " + r.toString());
! 				toReplace = toReplace.replaceAll(r.getRegexVariable(), r.getValue());
  			}
  		}
--- 183,193 ----
  			if (toReplace.indexOf(r.getVariable()) > -1)
  			{
! 				String replacementMsg = "Replace-Rule: " + r.toString();
! 				if (log.isInfoEnabled()) {
! 					log.info(replacementMsg);
! 				}
! 				mpan.showMessage(replacementMsg);
! 				
! 				toReplace = toReplace.replace(r.getVariable(), r.getValue());
  			}
  		}