summaryrefslogtreecommitdiff
path: root/source/com/c2kernel/utils/FileStringUtility.java
diff options
context:
space:
mode:
authorabranson <andrew.branson@cern.ch>2011-08-02 22:10:28 +0200
committerabranson <andrew.branson@cern.ch>2011-08-02 22:10:28 +0200
commit5664fd4644c78f4571a1a72e6b9f0511fb10720a (patch)
tree7be1c346d1d001bf6b079089f995a60c52b955c1 /source/com/c2kernel/utils/FileStringUtility.java
parent29bbf451a22916d39017ec1a3f53f4e0f0e65ee0 (diff)
Finished move to generics. Enforced 1.6 compliance for now. No errors or
warnings :)
Diffstat (limited to 'source/com/c2kernel/utils/FileStringUtility.java')
-rw-r--r--[-rwxr-xr-x]source/com/c2kernel/utils/FileStringUtility.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/com/c2kernel/utils/FileStringUtility.java b/source/com/c2kernel/utils/FileStringUtility.java
index 948341a..84f46ca 100755..100644
--- a/source/com/c2kernel/utils/FileStringUtility.java
+++ b/source/com/c2kernel/utils/FileStringUtility.java
@@ -67,7 +67,7 @@ public class FileStringUtility
{
FileReader fr = new FileReader(file);
BufferedReader buf = new BufferedReader(fr);
- Vector lines = new Vector();
+ Vector<String> lines = new Vector<String>();
String thisLine = null;
while ((thisLine = buf.readLine()) != null)
lines.addElement(thisLine);
@@ -240,9 +240,9 @@ public class FileStringUtility
* @param dirPath starting directory
* @param recursive goes into the subdirectories
**************************************************************************/
- static public ArrayList listDir(String dirPath, boolean withDirs, boolean recursive)
+ static public ArrayList<String> listDir(String dirPath, boolean withDirs, boolean recursive)
{
- ArrayList fileNames = new ArrayList();
+ ArrayList<String> fileNames = new ArrayList<String>();
File dir = new File(dirPath);
File files[];
String fileName;
@@ -339,7 +339,7 @@ public class FileStringUtility
try
{
String language = FileStringUtility.file2String(configFile);
- Hashtable props = new Hashtable();
+ Hashtable<String, String> props = new Hashtable<String, String>();
StringTokenizer tok = new StringTokenizer(language, "\n");
while (tok.hasMoreTokens())
{