[Squirrel-sql-commits] sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/types OracleXmlTypeDataTypeComponent.java, 1.5, 1.5.2.1

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

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

Modified Files:
      Tag: squirrel_3_0_branch
	OracleXmlTypeDataTypeComponent.java 
Log Message:
Merged from trunk.  Log exceptions which are being squelched.

Index: OracleXmlTypeDataTypeComponent.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/oracle/src/net/sourceforge/squirrel_sql/plugins/oracle/types/OracleXmlTypeDataTypeComponent.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** OracleXmlTypeDataTypeComponent.java	10 Jan 2009 02:18:45 -0000	1.5
--- OracleXmlTypeDataTypeComponent.java	22 Mar 2009 19:21:00 -0000	1.5.2.1
***************
*** 85,88 ****
--- 85,89 ----
  	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent#getClassName()
  	 */
+ 	@Override
  	public String getClassName()
  	{
***************
*** 104,113 ****
  
  	/**
! 	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent#getWhereClauseValue(
! 	 * java.lang.Object, net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
  	 */
  	public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md)
  	{
! 	  /*
  		* For Oracle 10g we could say something like : 
  		* 
--- 105,115 ----
  
  	/**
! 	 * @see net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.IDataTypeComponent#getWhereClauseValue(java.lang.Object,
! 	 *      net.sourceforge.squirrel_sql.fw.sql.ISQLDatabaseMetaData)
  	 */
+ 	@Override
  	public String getWhereClauseValue(Object value, ISQLDatabaseMetaData md)
  	{
! 		/*
  		* For Oracle 10g we could say something like : 
  		* 
***************
*** 172,176 ****
  		try
  		{
! 			Object o = rs.getObject(idx);
  			if (o == null)
  			{
--- 174,178 ----
  		try
  		{
! 			final Object o = rs.getObject(idx);
  			if (o == null)
  			{
***************
*** 179,192 ****
  			else if ("oracle.sql.OPAQUE".equals(o.getClass().getName()))
  			{
! 				Method createXmlMethod = getCreateXmlMethod(o.getClass());
  
  				// Below is equivalent to the following:
  				// xmlType = XMLType.createXML(o);
! 				Object xmlTypeObj = createXmlMethod.invoke(null, o);
! 				Method getStringValMethod = XML_TYPE_CLASS.getMethod("getStringVal", (Class[]) null);
  
  				// Below is equivalent to the following:
  				// stringValueResult = xmlType.getStringVal();
! 				Object stringValueResult = getStringValMethod.invoke(xmlTypeObj, (Object[]) null);
  				result = stringValueResult;
  
--- 181,194 ----
  			else if ("oracle.sql.OPAQUE".equals(o.getClass().getName()))
  			{
! 				final Method createXmlMethod = getCreateXmlMethod(o.getClass());
  
  				// Below is equivalent to the following:
  				// xmlType = XMLType.createXML(o);
! 				final Object xmlTypeObj = createXmlMethod.invoke(null, o);
! 				final Method getStringValMethod = XML_TYPE_CLASS.getMethod("getStringVal", (Class[]) null);
  
  				// Below is equivalent to the following:
  				// stringValueResult = xmlType.getStringVal();
! 				final Object stringValueResult = getStringValMethod.invoke(xmlTypeObj, (Object[]) null);
  				result = stringValueResult;
  
***************
*** 195,203 ****
  			{
  				XML_TYPE_CLASS = o.getClass();
! 				Method getStringValMethod = XML_TYPE_CLASS.getMethod("getStringVal", (Class[]) null);
  
  				// Below is equivalent to the following:
  				// stringValueResult = xmlType.getStringVal();
! 				Object stringValueResult = getStringValMethod.invoke(o, (Object[]) null);
  				result = stringValueResult;
  			}
--- 197,205 ----
  			{
  				XML_TYPE_CLASS = o.getClass();
! 				final Method getStringValMethod = XML_TYPE_CLASS.getMethod("getStringVal", (Class[]) null);
  
  				// Below is equivalent to the following:
  				// stringValueResult = xmlType.getStringVal();
! 				final Object stringValueResult = getStringValMethod.invoke(o, (Object[]) null);
  				result = stringValueResult;
  			}
***************
*** 207,216 ****
  			}
  		}
! 		catch (ClassNotFoundException e)
  		{
  			s_log.error("Perhaps the XDK, which contains the class " + XML_TYPE_CLASSNAME
  				+ " is not in the CLASSPATH?", e);
  		}
! 		catch (Exception e)
  		{
  			s_log.error("Unexpected exception while attempting to read " + "SYS.XMLType column", e);
--- 209,218 ----
  			}
  		}
! 		catch (final ClassNotFoundException e)
  		{
  			s_log.error("Perhaps the XDK, which contains the class " + XML_TYPE_CLASSNAME
  				+ " is not in the CLASSPATH?", e);
  		}
! 		catch (final Exception e)
  		{
  			s_log.error("Unexpected exception while attempting to read " + "SYS.XMLType column", e);
***************
*** 247,255 ****
  			createXmlMethod = XML_TYPE_CLASS.getMethod("createXML", argClasses);
  		}
! 		catch (SecurityException e)
! 		{ /* Do nothing - the method could be called createXml instead */
  		}
! 		catch (NoSuchMethodException e)
! 		{ /* Do nothing - the method could be called createXml instead */
  		}
  
--- 249,267 ----
  			createXmlMethod = XML_TYPE_CLASS.getMethod("createXML", argClasses);
  		}
! 		catch (final SecurityException e)
! 		{
! 			if (s_log.isDebugEnabled())
! 			{
! 				s_log.debug("getCreateXmlMethod: unable to get method named createXML in class "
! 					+ "oracle.xdb.XMLType: " + e.getMessage(), e);
! 			}
  		}
! 		catch (final NoSuchMethodException e)
! 		{
! 			if (s_log.isDebugEnabled())
! 			{
! 				s_log.debug("getCreateXmlMethod: unable to get method named createXML in class "
! 					+ "oracle.xdb.XMLType: " + e.getMessage(), e);
! 			}
  		}
  
***************
*** 260,264 ****
  				createXmlMethod = XML_TYPE_CLASS.getMethod("createXml", argClasses);
  			}
! 			catch (SecurityException e)
  			{
  				s_log.error("getCreateXmlMethod: Unable to get method named createXml or createXML in class "
--- 272,276 ----
  				createXmlMethod = XML_TYPE_CLASS.getMethod("createXml", argClasses);
  			}
! 			catch (final SecurityException e)
  			{
  				s_log.error("getCreateXmlMethod: Unable to get method named createXml or createXML in class "
***************
*** 266,270 ****
  				throw e;
  			}
! 			catch (NoSuchMethodException e)
  			{
  				s_log.error("getCreateXmlMethod: Unable to get method named createXml or createXML in class "
--- 278,282 ----
  				throw e;
  			}
! 			catch (final NoSuchMethodException e)
  			{
  				s_log.error("getCreateXmlMethod: Unable to get method named createXml or createXML in class "
***************
*** 304,317 ****
  			try
  			{
! 				Class<?>[] args = new Class[] { Connection.class, String.class };
  
! 				Method createXmlMethod = getCreateXmlMethod(args);
  
! 				Object xmlTypeObj = createXmlMethod.invoke(null, pstmt.getConnection(), value.toString());
  
  				// now bind the string..
  				pstmt.setObject(position, xmlTypeObj);
  			}
! 			catch (Exception e)
  			{
  				s_log.error("setPreparedStatementValue: Unexpected exception - " + e.getMessage(), e);
--- 316,329 ----
  			try
  			{
! 				final Class<?>[] args = new Class[] { Connection.class, String.class };
  
! 				final Method createXmlMethod = getCreateXmlMethod(args);
  
! 				final Object xmlTypeObj = createXmlMethod.invoke(null, pstmt.getConnection(), value.toString());
  
  				// now bind the string..
  				pstmt.setObject(position, xmlTypeObj);
  			}
! 			catch (final Exception e)
  			{
  				s_log.error("setPreparedStatementValue: Unexpected exception - " + e.getMessage(), e);