[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent DataTypeClob.java, 1.19, 1.20 ClobDescriptor.java, 1.3, 1.4 BlobDescriptor.java, 1.1, 1.2

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv13840/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent

Modified Files:
	DataTypeClob.java ClobDescriptor.java BlobDescriptor.java 
Log Message:
Warn the user when exporting data to CSV/Excel if there are Clob placeholders (<Clob>) in the table data being exported.  Let the user know when the export to file is complete, if no command is to be executed to show the 
exported file.

Index: DataTypeClob.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/DataTypeClob.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DataTypeClob.java	6 Feb 2006 01:29:36 -0000	1.19
--- DataTypeClob.java	17 Mar 2007 23:53:43 -0000	1.20
***************
*** 23,27 ****
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
- import java.awt.event.KeyAdapter;
  import java.awt.event.KeyEvent;
  import java.awt.event.MouseAdapter;
--- 23,26 ----
***************
*** 149,153 ****
  	private static boolean _makeNewlinesVisibleInCell = true;
  
! 
  	/**
  	 * Constructor - save the data needed by this data type.
--- 148,152 ----
  	private static boolean _makeNewlinesVisibleInCell = true;
  
!     
  	/**
  	 * Constructor - save the data needed by this data type.
***************
*** 184,188 ****
  			if (readCompleteClobsString != null && readCompleteClobsString.equals("true"))
  				_readCompleteClobs = true;
! 
  			_readClobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;	// set to default
  			String readClobsSizeString = DTProperties.get(thisClassName, "readClobsSize");
--- 183,187 ----
  			if (readCompleteClobsString != null && readCompleteClobsString.equals("true"))
  				_readCompleteClobs = true;
!             
  			_readClobsSize = LARGE_COLUMN_DEFAULT_READ_LENGTH;	// set to default
  			String readClobsSizeString = DTProperties.get(thisClassName, "readClobsSize");
***************
*** 206,209 ****
--- 205,224 ----
  	}
  
+     /**
+      * Used to provide manual override in cases where we are exporting data.
+      * @return the current value of _readCompleteClob
+      */
+     public static boolean getReadCompleteClob() {
+         return _readCompleteClobs;
+     }    
+ 
+     /**
+      * Used to provide manual override in cases where we are exporting data.
+      * @param val the new value of _readCompleteClob
+      */
+     public static void setReadCompleteClob(boolean val) {
+         _readCompleteClobs = val;
+     }
+     
  	/**
  	 * Determine if two objects of this data type contain the same value.

Index: ClobDescriptor.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/ClobDescriptor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ClobDescriptor.java	14 Jul 2004 12:31:13 -0000	1.3
--- ClobDescriptor.java	17 Mar 2007 23:53:43 -0000	1.4
***************
*** 73,76 ****
--- 73,80 ----
  		StringManagerFactory.getStringManager(ClobDescriptor.class);
  
+     public static interface i18n {
+         String CLOB_LABEL = s_stringMgr.getString("ClobDescriptor.clob");
+     }
+     
  	/**
  	 * Ctor
***************
*** 140,144 ****
  			return _data + "...";	// tell user the data is truncated
  		}
! 		return s_stringMgr.getString("ClobDescriptor.clob");
  	}
  
--- 144,148 ----
  			return _data + "...";	// tell user the data is truncated
  		}
! 		return i18n.CLOB_LABEL;
  	}
  

Index: BlobDescriptor.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/datasetviewer/cellcomponent/BlobDescriptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BlobDescriptor.java	7 Apr 2004 02:31:25 -0000	1.1
--- BlobDescriptor.java	17 Mar 2007 23:53:43 -0000	1.2
***************
*** 76,79 ****
--- 76,83 ----
  		StringManagerFactory.getStringManager(BlobDescriptor.class);
  	
+     public static interface i18n {
+         String BLOB_LABEL = s_stringMgr.getString("BlobDescriptor.blob");
+     }
+     
  	/**
  	 * Ctor
***************
*** 139,149 ****
  					for (int i=0; i<_data.length; i++)
  						useValue[i] = new Byte(_data[i]);
! 			String outString = (String)BinaryDisplayConverter.convertToString(useValue,
! 						BinaryDisplayConverter.HEX, false);
  			if (_wholeBlobRead || _userSetBlobLimit > _data.length)
  				return outString;	// we have the whole contents of the BLOB
  			else return outString+"...";	// tell user the data is truncated
  		}
! 		else return s_stringMgr.getString("BlobDescriptor.blob");
  	}
  	
--- 143,154 ----
  					for (int i=0; i<_data.length; i++)
  						useValue[i] = new Byte(_data[i]);
! 			String outString = BinaryDisplayConverter.convertToString(useValue,
! 						                            BinaryDisplayConverter.HEX, 
!                                                     false);
  			if (_wholeBlobRead || _userSetBlobLimit > _data.length)
  				return outString;	// we have the whole contents of the BLOB
  			else return outString+"...";	// tell user the data is truncated
  		}
! 		else return i18n.BLOB_LABEL;
  	}