moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Clean up of HSSFDataFormat. Whilst Bug 22456 was probably not an issue with the previous code, these changes are even better ;-) Squashing Bug 22456 now.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@425376 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason Height 2006-07-25 11:50:55 +00:00
parent 4aea586fe5
commit 3ffa62ef21
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java/org/apache/poi/hssf/usermodel/HSSFDataFormat.java
View File

@ -80,7 +80,7 @@ import java.util.Vector;
public class HSSFDataFormat public class HSSFDataFormat
{ {
private static Vector builtinFormats; private static List builtinFormats = createBuiltinFormats();
private Vector formats = new Vector(); private Vector formats = new Vector();
private Workbook workbook; private Workbook workbook;
@ -97,7 +97,6 @@ public class HSSFDataFormat
public HSSFDataFormat( Workbook workbook ) public HSSFDataFormat( Workbook workbook )
{ {
this.workbook = workbook; this.workbook = workbook;
if ( builtinFormats == null ) populateBuiltinFormats();
Iterator i = workbook.getFormats().iterator(); Iterator i = workbook.getFormats().iterator();
while ( i.hasNext() ) while ( i.hasNext() )
{ {
@ -111,9 +110,9 @@ public class HSSFDataFormat
} }
private static synchronized void populateBuiltinFormats() private static synchronized List createBuiltinFormats()
{ {
builtinFormats = new Vector(); List builtinFormats = new Vector();
builtinFormats.add( 0, "General" ); builtinFormats.add( 0, "General" );
builtinFormats.add( 1, "0" ); builtinFormats.add( 1, "0" );
builtinFormats.add( 2, "0.00" ); builtinFormats.add( 2, "0.00" );
@ -169,14 +168,11 @@ public class HSSFDataFormat
builtinFormats.add( 0x2f, "mm:ss.0" ); builtinFormats.add( 0x2f, "mm:ss.0" );
builtinFormats.add( 0x30, "##0.0E+0" ); builtinFormats.add( 0x30, "##0.0E+0" );
builtinFormats.add( 0x31, "@" ); builtinFormats.add( 0x31, "@" );
return builtinFormats;
} }
public static List getBuiltinFormats() public static List getBuiltinFormats()
{ {
if ( builtinFormats == null )
{
populateBuiltinFormats();
}
return builtinFormats; return builtinFormats;
} }
@ -192,10 +188,6 @@ public class HSSFDataFormat
if (format.toUpperCase().equals("TEXT")) if (format.toUpperCase().equals("TEXT"))
format = "@"; format = "@";
if ( builtinFormats == null )
{
populateBuiltinFormats();
}
short retval = -1; short retval = -1;
for (short k = 0; k <= 0x31; k++) for (short k = 0; k <= 0x31; k++)
@ -282,10 +274,6 @@ public class HSSFDataFormat
public static String getBuiltinFormat( short index ) public static String getBuiltinFormat( short index )
{ {
if ( builtinFormats == null )
{
populateBuiltinFormats();
}
return (String) builtinFormats.get( index ); return (String) builtinFormats.get( index );
} }
@ -296,10 +284,6 @@ public class HSSFDataFormat
public static int getNumberOfBuiltinBuiltinFormats() public static int getNumberOfBuiltinBuiltinFormats()
{ {
if ( builtinFormats == null )
{
populateBuiltinFormats();
}
return builtinFormats.size(); return builtinFormats.size();
} }
} }