You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by al...@apache.org on 2006/11/28 23:25:57 UTC

svn commit: r480252 [9/16] - in /incubator/uima/uimaj/trunk/uimaj-core/src: main/java/org/apache/uima/ main/java/org/apache/uima/analysis_component/ main/java/org/apache/uima/analysis_engine/ main/java/org/apache/uima/analysis_engine/annotator/ main/ja...

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/LocalInstallationAgent.java Tue Nov 28 14:25:39 2006
@@ -106,7 +106,7 @@
    *         installation descriptor, <code>false</code> otherwise.
    */
   public static boolean checkPackageConfig(Properties packageConfig,
-                  InstallationDescriptor insdObject) {
+          InstallationDescriptor insdObject) {
     boolean isOk = false;
     if (packageConfig.getProperty(MAIN_ROOT) != null) {
       Hashtable dlgTable = insdObject.getDelegateComponents();
@@ -138,7 +138,7 @@
    *           if any I/O exception occurred.
    */
   public static void localizeComponentFile(File file, InstallationDescriptor insdObject,
-                  Properties packageConfig) throws IOException {
+          Properties packageConfig) throws IOException {
     // substitute $main_root macros in the file
     String mainRootPath = packageConfig.getProperty(MAIN_ROOT);
     if (mainRootPath != null) {
@@ -157,18 +157,18 @@
       String compRootPath = packageConfig.getProperty(idRoot);
       // substitute '$dlg_comp_id$root_rel'
       String regExp = InstallationProcessor.componentIdRootRegExp(id,
-                      InstallationProcessor.DELEGATE_ROOT_REL_SUFFIX_REGEX);
+              InstallationProcessor.DELEGATE_ROOT_REL_SUFFIX_REGEX);
       String replacement = FileUtil.computeRelativePath(file.getParentFile(),
-                      new File(compRootPath));
+              new File(compRootPath));
       FileUtil.replaceStringInFile(file, regExp, replacement);
       // substitute '$dlg_comp_id$root_url'
       regExp = InstallationProcessor.componentIdRootRegExp(id,
-                      InstallationProcessor.DELEGATE_ROOT_URL_SUFFIX_REGEX);
+              InstallationProcessor.DELEGATE_ROOT_URL_SUFFIX_REGEX);
       replacement = FileUtil.localPathToFileUrl(compRootPath);
       FileUtil.replaceStringInFile(file, regExp, replacement);
       // substitute '$dlg_comp__id$root'
       regExp = InstallationProcessor.componentIdRootRegExp(id,
-                      InstallationProcessor.DELEGATE_ROOT_SUFFIX_REGEX);
+              InstallationProcessor.DELEGATE_ROOT_SUFFIX_REGEX);
       replacement = compRootPath;
       FileUtil.replaceStringInFile(file, regExp, replacement);
     }
@@ -182,7 +182,7 @@
    * @param packageConfig
    */
   public static void localizeInstallationDescriptor(InstallationDescriptor insdObject,
-                  Properties packageConfig) {
+          Properties packageConfig) {
     // set main root
     String mainRootPath = packageConfig.getProperty(MAIN_ROOT);
     insdObject.setMainComponentRoot(mainRootPath);
@@ -233,7 +233,7 @@
       } catch (Throwable e) {
         System.err.println("Error trying to undo component localization: " + e);
         System.out.println("> Please, make sure that all *.$ files " + "in conf and desc dirs\n"
-                        + "> are renamed back to their original names");
+                + "> are renamed back to their original names");
       }
     }
   }
@@ -304,7 +304,7 @@
       completed = true;
     } else
       System.err.println("[LocalInstallationAgent]: "
-                      + "PEAR properties do not comply with installation descriptor");
+              + "PEAR properties do not comply with installation descriptor");
     return completed;
   }
 
@@ -375,7 +375,7 @@
         counter++;
       } else {
         System.err.println("[LocalInstallationAgent]: " + "failed to undo changes for the file "
-                        + orgFile.getAbsolutePath());
+                + orgFile.getAbsolutePath());
       }
     }
     completed = (counter == _localizedFiles.length);
@@ -408,7 +408,7 @@
       throw new RuntimeException(InstallationController.UIMA_HOME_ENV + " variable not specified");
     // build component classpath
     String compClassPath = InstallationController.buildComponentClassPath(mainRootDirPath,
-                    _insdObject);
+            _insdObject);
     // build UIMA classpath
     String uimaClassPath = InstallationController.buildUIMAClassPath(_uimaHomePath);
     // set java.library.path
@@ -424,8 +424,8 @@
     }
     // deploy and run installation verification test
     InstallationController.TestStatus status = InstallationController
-                    .deployInstallationVerificationTest(mainRootDirPath, _insdObject, mainDescPath,
-                                    compClassPath, javaLibPath, tableOfEnvVars, uimaClassPath);
+            .deployInstallationVerificationTest(mainRootDirPath, _insdObject, mainDescPath,
+                    compClassPath, javaLibPath, tableOfEnvVars, uimaClassPath);
     if (status.retCode != 0) {
       System.err.println("[LocalInstallationAgent]: " + "localization test failed =>");
       System.out.println("> Error message: " + status.message);

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageBrowser.java Tue Nov 28 14:25:39 2006
@@ -43,33 +43,33 @@
   public static final String BINARY_DIR = File.separator + InstallationController.PACKAGE_BIN_DIR;
 
   public static final String CONFIGURATION_DIR = File.separator
-                  + InstallationController.PACKAGE_CONF_DIR;
+          + InstallationController.PACKAGE_CONF_DIR;
 
   public static final String DATA_DIR = File.separator + InstallationController.PACKAGE_DATA_DIR;
 
   public static final String DESCRIPTORS_DIR = File.separator
-                  + InstallationController.PACKAGE_DESC_DIR;
+          + InstallationController.PACKAGE_DESC_DIR;
 
   public static final String DOCUMENTATION_DIR = File.separator
-                  + InstallationController.PACKAGE_DOC_DIR;
+          + InstallationController.PACKAGE_DOC_DIR;
 
   public static final String LIBRARY_DIR = File.separator + InstallationController.PACKAGE_LIB_DIR;
 
   public static final String METADATA_DIR = File.separator
-                  + InstallationController.PACKAGE_METADATA_DIR;
+          + InstallationController.PACKAGE_METADATA_DIR;
 
   public static final String RESOURCES_DIR = File.separator
-                  + InstallationController.PACKAGE_RESOURCES_DIR;
+          + InstallationController.PACKAGE_RESOURCES_DIR;
 
   public static final String SOURCES_DIR = File.separator
-                  + InstallationController.PACKAGE_SOURCES_DIR;
+          + InstallationController.PACKAGE_SOURCES_DIR;
 
   // standard files
   public static final String INSTALLATION_DESCRIPTOR_FILE = File.separator
-                  + InstallationProcessor.INSD_FILE_PATH;
+          + InstallationProcessor.INSD_FILE_PATH;
 
   public static final String PEAR_PROPERTIES_FILE = File.separator
-                  + InstallationController.PACKAGE_CONFIG_FILE;
+          + InstallationController.PACKAGE_CONFIG_FILE;
 
   public static final String SUBMISSION_PROPERTIES_FILE = METADATA_DIR + "/submission.properties";
 
@@ -100,7 +100,7 @@
     int nameEndIndex = _pearFile.getAbsolutePath().lastIndexOf('.');
     // set root dir = PEAR file path (w/o file name extension)
     String rootDirPath = (nameEndIndex > 0) ? _pearFile.getAbsolutePath()
-                    .substring(0, nameEndIndex) : _pearFile.getAbsolutePath();
+            .substring(0, nameEndIndex) : _pearFile.getAbsolutePath();
     _rootDir = new File(rootDirPath);
     _archived = true;
     // add directories and files to the lists
@@ -160,11 +160,11 @@
       InstallationDescriptor insdObject = getInstallationDescriptor();
       if (insdObject != null) {
         String absoluteClassPath = InstallationController.buildComponentClassPath(
-                        getRootDirectory().getAbsolutePath(), insdObject);
+                getRootDirectory().getAbsolutePath(), insdObject);
         String absoluteRootDirPathExp = StringUtil.toRegExpReplacement(getRootDirectory()
-                        .getAbsolutePath().replace('\\', '/'));
+                .getAbsolutePath().replace('\\', '/'));
         return relativePath ? absoluteClassPath.replaceAll(absoluteRootDirPathExp, "\\.")
-                        : absoluteClassPath;
+                : absoluteClassPath;
       }
     }
     return null;
@@ -204,9 +204,9 @@
       InstallationDescriptor insdObject = getInstallationDescriptor();
       if (insdObject != null) {
         String absolutePath = InstallationController.buildComponentPath(getRootDirectory()
-                        .getAbsolutePath(), insdObject);
+                .getAbsolutePath(), insdObject);
         String absoluteRootDirPathExp = StringUtil.toRegExpReplacement(getRootDirectory()
-                        .getAbsolutePath().replace('\\', '/'));
+                .getAbsolutePath().replace('\\', '/'));
         return relativePath ? absolutePath.replaceAll(absoluteRootDirPathExp, "\\.") : absolutePath;
       }
     }
@@ -231,7 +231,7 @@
     while (list.hasNext()) {
       File dir = (File) list.next();
       String dirName = dir.getAbsolutePath().substring(_rootDir.getAbsolutePath().length())
-                      .replace('\\', '/');
+              .replace('\\', '/');
       if (pattern.startsWith(File.separator)) {
         if (dirName.startsWith(pattern))
           foundDirList.add(dir);
@@ -263,7 +263,7 @@
     while (list.hasNext()) {
       File file = (File) list.next();
       String fileName = file.getAbsolutePath().substring(_rootDir.getAbsolutePath().length())
-                      .replace('\\', '/');
+              .replace('\\', '/');
       if (pattern.startsWith(File.separator)) {
         if (fileName.startsWith(pattern))
           foundFileList.add(file);
@@ -305,7 +305,7 @@
    */
   public File findStandardFile(String stdFileName) {
     String fileName = stdFileName.replace('\\', File.separatorChar)
-                    .replace('/', File.separatorChar);
+            .replace('/', File.separatorChar);
     File file = new File(_rootDir, fileName);
     File foundFile = (_allFiles.contains(file)) ? file : null;
     return foundFile;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/PackageSelectorGUI.java Tue Nov 28 14:25:39 2006
@@ -132,9 +132,9 @@
     fileChooser.setDialogTitle("Select " + componentId + " root directory");
     // show information dialog
     String message = "Select the root directory of installed\n" + "\n" + componentId + "\n"
-                    + "\ncomponent using the following file dialog,\n"
-                    + "or press 'Cancel' in the file dialog, if this\n"
-                    + "component is not installed in your file system.";
+            + "\ncomponent using the following file dialog,\n"
+            + "or press 'Cancel' in the file dialog, if this\n"
+            + "component is not installed in your file system.";
     JOptionPane.showMessageDialog(_dialogFrame, message);
     // open dialog window
     File selectedDir = null;
@@ -173,7 +173,7 @@
     fileChooser.setDialogTitle("Select " + componentId + " PEAR file");
     // show information dialog
     String message = "Select the PEAR file of the\n" + "\n" + componentId + "\n"
-                    + "\ncomponent using the following file dialog.";
+            + "\ncomponent using the following file dialog.";
     JOptionPane.showMessageDialog(_dialogFrame, message);
     // open dialog window
     File selectedFile = null;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/tools/SimplePackageSelector.java Tue Nov 28 14:25:39 2006
@@ -74,12 +74,12 @@
   public File selectPackageDirectory(String componentId) {
     if (_stdOut != null) {
       _stdOut.println("> If the " + componentId
-                      + " component is already installed in your file system,");
+              + " component is already installed in your file system,");
       _stdOut.print("> enter the " + componentId + " root directory: ");
       _stdOut.flush();
     } else {
       System.out.println("> If the " + componentId
-                      + " component is already installed in your file system,");
+              + " component is already installed in your file system,");
       System.out.print("> enter the " + componentId + " root directory: ");
       System.out.flush();
     }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/FileUtil.java Tue Nov 28 14:25:39 2006
@@ -525,7 +525,7 @@
     // set root_dir_path = archive_file_path (w/o file name extension)
     int nameEndIndex = archive.getName().lastIndexOf('.');
     String rootDirPath = (nameEndIndex > 0) ? archive.getName().substring(0, nameEndIndex)
-                    : archive.getName();
+            : archive.getName();
     File rootDir = new File(rootDirPath);
     // add directories to the list
     Enumeration entries = archive.entries();
@@ -609,7 +609,7 @@
     // set root_dir_path = archive_file_path (w/o file name extension)
     int nameEndIndex = archive.getName().lastIndexOf('.');
     String rootDirPath = (nameEndIndex > 0) ? archive.getName().substring(0, nameEndIndex)
-                    : archive.getName();
+            : archive.getName();
     File rootDir = new File(rootDirPath);
     // add directories to the list
     Enumeration entries = archive.entries();
@@ -698,7 +698,7 @@
    *           If any I/O exception occurred.
    */
   public static long extractDirectoryFromJar(JarFile jarFile, String dirPath, File targetDir)
-                  throws IOException {
+          throws IOException {
     return extractFilesFromJar(jarFile, targetDir, new DirFileFilter(dirPath, null));
   }
 
@@ -718,7 +718,7 @@
    *           If any I/O exception occurred.
    */
   public static long extractFilesWithExtFromJar(JarFile jarFile, String fileExt, File targetDir)
-                  throws IOException {
+          throws IOException {
     return extractFilesFromJar(jarFile, targetDir, new DirFileFilter(null, fileExt));
   }
 
@@ -752,7 +752,7 @@
    *           If any I/O exception occurred.
    */
   public static long extractFilesFromJar(JarFile jarFile, File targetDir, FileFilter filter)
-                  throws IOException {
+          throws IOException {
     long totalBytes = 0;
     byte[] block = new byte[4096];
     Enumeration jarList = jarFile.entries();
@@ -1073,7 +1073,7 @@
    *           If any I/O exception occurred.
    */
   public static Properties loadPropertiesFromJar(String propFilePath, JarFile jarFile)
-                  throws IOException {
+          throws IOException {
     Properties properties = null;
     String name = propFilePath.replace('\\', '/');
     JarEntry jarEntry = jarFile.getJarEntry(name);
@@ -1323,7 +1323,7 @@
    *           If any I/O exception occurs.
    */
   public static int replaceStringInFile(File textFile, String subStringRegex, String replacement)
-                  throws IOException {
+          throws IOException {
     int counter = 0;
     // for general text file - supporting ASCII encoding only
     String encoding = "ASCII";
@@ -1337,7 +1337,7 @@
         encoding = xmlEncoding;
       else
         throw new UnsupportedEncodingException("can't detect encoding in "
-                        + textFile.getAbsolutePath());
+                + textFile.getAbsolutePath());
     }
     // load text file, using supported encoding
     String fileContent = loadTextFile(textFile, encoding);
@@ -1481,7 +1481,7 @@
    *           If any I/O exception occurred.
    */
   public static ZipOutputStream zipDirectory(File dir2zip, ZipOutputStream zoStream,
-                  File referenceDir, File[] excludeFiles) throws IOException {
+          File referenceDir, File[] excludeFiles) throws IOException {
     byte[] block = new byte[4096];
     int inBytes = 0;
     FileInputStream iStream = null;
@@ -1507,7 +1507,7 @@
           iStream = new FileInputStream(entry);
           // put ZipEntry for the file
           String zipEntryName = (referenceDir != null) ? getRelativePath(referenceDir, entry
-                          .getAbsolutePath()) : getRelativePath(dir2zip, entry.getAbsolutePath());
+                  .getAbsolutePath()) : getRelativePath(dir2zip, entry.getAbsolutePath());
           ZipEntry zipEntry = new ZipEntry(zipEntryName);
           zoStream.putNextEntry(zipEntry);
           // read input stream and write to output stream
@@ -1544,7 +1544,7 @@
     String zipFileName = file2zip.getName();
     int extIndex = zipFileName.lastIndexOf('.');
     zipFileName = (extIndex >= 0) ? zipFileName.substring(0, extIndex) + ".zip" : zipFileName
-                    + ".zip";
+            + ".zip";
     File zipFile = new File(file2zip.getParentFile(), zipFileName);
     return zipFile(file2zip, zipFile);
   }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/ProcessUtil.java Tue Nov 28 14:25:39 2006
@@ -198,8 +198,8 @@
       try {
         // create appropriate standard stream reader
         reader = (threadId.equals("ERR")) ? new BufferedReader(new InputStreamReader(_process
-                        .getErrorStream())) : new BufferedReader(new InputStreamReader(_process
-                        .getInputStream()));
+                .getErrorStream())) : new BufferedReader(new InputStreamReader(_process
+                .getInputStream()));
         // create appropriate string writer
         StringWriter sWriter = (threadId.equals("ERR")) ? _stdErr : _stdOut;
         writer = new PrintWriter(sWriter);

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/UIMAUtil.java Tue Nov 28 14:25:39 2006
@@ -121,7 +121,7 @@
    *           If any I/O exception occurred.
    */
   public static synchronized String identifyUimaComponentCategory(File xmlDescFile)
-                  throws IOException {
+          throws IOException {
     return identifyUimaComponentCategory(xmlDescFile, null);
   }
 
@@ -140,7 +140,7 @@
    *           If any I/O exception occurred.
    */
   public static synchronized String identifyUimaComponentCategory(URL xmlDescUrl)
-                  throws IOException {
+          throws IOException {
     return identifyUimaComponentCategory(null, xmlDescUrl);
   }
 
@@ -161,19 +161,19 @@
    *           If any I/O exception occurred.
    */
   private static synchronized String identifyUimaComponentCategory(File xmlDescFile, URL xmlDescUrl)
-                  throws IOException {
+          throws IOException {
     String uimaCompCtg = null;
     XMLInputSource xmlSource = null;
     try {
       String xmlDescUri = (xmlDescFile != null) ? xmlDescFile.getAbsolutePath() : xmlDescUrl
-                      .toString();
+              .toString();
       // clean error message
       __errTableByUri.remove(xmlDescUri);
       // get XMLParser
       XMLParser xmlParser = UIMAFramework.getXMLParser();
       // create XML source
       xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(
-                      xmlDescUrl);
+              xmlDescUrl);
       // parse XML source and create resource specifier
       ResourceSpecifier resourceSpec = null;
       try {
@@ -202,7 +202,7 @@
         } catch (Exception e) {
         }
         xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(
-                        xmlDescUrl);
+                xmlDescUrl);
         try {
           // try parsing CPE configuration
           xmlParser.parseCpeDescription(xmlSource);
@@ -221,7 +221,7 @@
         } catch (Exception e) {
         }
         xmlSource = (xmlDescFile != null) ? new XMLInputSource(xmlDescFile) : new XMLInputSource(
-                        xmlDescUrl);
+                xmlDescUrl);
         try {
           // try parsing TS description
           xmlParser.parseTypeSystemDescription(xmlSource);

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/pear/util/XMLUtil.java Tue Nov 28 14:25:39 2006
@@ -174,10 +174,10 @@
         if (nextByte < 0)
           throw new IOException("cannot read file");
       } while (nextByte == 0xEF || nextByte == 0xBB || nextByte == 0xBF || nextByte == 0xFE
-                      || nextByte == 0xFF || nextByte == 0x00);
+              || nextByte == 0xFF || nextByte == 0x00);
       int prefixLength = byteCounter < 17 ? byteCounter - 1 : 16;
       String utfSignature = (prefixLength > 0) ? FileUtil
-                      .identifyUtfSignature(prefix, prefixLength) : null;
+              .identifyUtfSignature(prefix, prefixLength) : null;
       boolean utf8Signature = false;
       boolean utf16Signature = false;
       boolean utf32Signature = false;
@@ -270,7 +270,7 @@
         if (encoding == null) {
           // check 1st non-space XML character for UTF-16
           fReader = new BufferedReader(
-                          new InputStreamReader(new FileInputStream(xmlFile), "UTF-16"));
+                  new InputStreamReader(new FileInputStream(xmlFile), "UTF-16"));
           try {
             while ((line = fReader.readLine()) != null) {
               String xmlLine = line.trim();
@@ -378,7 +378,7 @@
    *           if any I/O exception occurred.
    */
   public static void printAllXMLElements(Properties elements, PrintWriter oWriter, int level)
-                  throws IOException {
+          throws IOException {
     printAllXMLElements(elements, null, oWriter, level);
   }
 
@@ -402,7 +402,7 @@
    *           if any I/O exception occurred.
    */
   public static void printAllXMLElements(Properties elements, String valueDelimiter,
-                  String[] tagOrder, PrintWriter oWriter, int level) throws IOException {
+          String[] tagOrder, PrintWriter oWriter, int level) throws IOException {
     // check if elements might be multi- valued
     boolean multiValue = valueDelimiter != null && valueDelimiter.length() > 0;
     if (elements != null) {
@@ -468,7 +468,7 @@
    *           if any I/O exception occurred.
    */
   public static void printAllXMLElements(Properties elements, String[] tagOrder,
-                  PrintWriter oWriter, int level) throws IOException {
+          PrintWriter oWriter, int level) throws IOException {
     printAllXMLElements(elements, null, tagOrder, oWriter, level);
   }
 
@@ -488,7 +488,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, Properties attributes, PrintWriter oWriter,
-                  int level) throws IOException {
+          int level) throws IOException {
     printXMLElement(tag, attributes, null, oWriter, level);
   }
 
@@ -511,7 +511,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, Properties attributes, String elemValue,
-                  PrintWriter oWriter, int level) throws IOException {
+          PrintWriter oWriter, int level) throws IOException {
     printXMLElement(tag, attributes, elemValue, false, oWriter, level, false);
   }
 
@@ -538,7 +538,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, Properties attributes, String elemValue,
-                  boolean putInCdataSection, PrintWriter oWriter, int level) throws IOException {
+          boolean putInCdataSection, PrintWriter oWriter, int level) throws IOException {
     printXMLElement(tag, attributes, elemValue, putInCdataSection, oWriter, level, false);
   }
 
@@ -570,8 +570,8 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, Properties attributes, String elemValue,
-                  boolean putInCdataSection, PrintWriter oWriter, int level,
-                  boolean useNewLine4Value) throws IOException {
+          boolean putInCdataSection, PrintWriter oWriter, int level, boolean useNewLine4Value)
+          throws IOException {
     // print XML tag beginning
     printXMLTag(tag, attributes, oWriter, false, level);
     if (useNewLine4Value) {
@@ -606,7 +606,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, String elemValue, PrintWriter oWriter, int level)
-                  throws IOException {
+          throws IOException {
     printXMLElement(tag, null, elemValue, oWriter, level);
   }
 
@@ -631,7 +631,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElement(String tag, String elemValue, boolean putInCdataSection,
-                  PrintWriter oWriter, int level) throws IOException {
+          PrintWriter oWriter, int level) throws IOException {
     printXMLElement(tag, null, elemValue, putInCdataSection, oWriter, level);
   }
 
@@ -654,7 +654,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElements(String tag, String elemValue, String valueDelimiter,
-                  PrintWriter oWriter, int level) throws IOException {
+          PrintWriter oWriter, int level) throws IOException {
     if (elemValue != null) {
       // get list of tokens in the element value
       StringTokenizer elemTokens = new StringTokenizer(elemValue, valueDelimiter);
@@ -682,7 +682,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElementValue(String elemValue, PrintWriter oWriter, int level)
-                  throws IOException {
+          throws IOException {
     printXMLElementValue(elemValue, false, oWriter, level);
   }
 
@@ -705,7 +705,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLElementValue(String elemValue, boolean putInCdataSection,
-                  PrintWriter oWriter, int level) throws IOException {
+          PrintWriter oWriter, int level) throws IOException {
     // add marginal tabs
     for (int l = 0; l < level; l++)
       oWriter.print('\t');
@@ -756,7 +756,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLTag(String tag, PrintWriter oWriter, boolean tagEnd, int level)
-                  throws IOException {
+          throws IOException {
     printXMLTag(tag, null, oWriter, tagEnd, level);
   }
 
@@ -779,7 +779,7 @@
    *           if any I/O exception occurred.
    */
   public static void printXMLTag(String tag, Properties attributes, PrintWriter oWriter,
-                  boolean tagEnd, int level) throws IOException {
+          boolean tagEnd, int level) throws IOException {
     // add marginal tabs
     for (int l = 0; l < level; l++)
       oWriter.print('\t');

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasDefinition.java Tue Nov 28 14:25:39 2006
@@ -45,8 +45,8 @@
   private ResourceManager resourceManager;
 
   public CasDefinition(TypeSystemDescription aTypeSystem, TypePriorities aTypePriorities,
-                  FsIndexDescription[] aFsIndexes, ResourceManager aResourceManager,
-                  Properties aPerformanceTuningSettings) {
+          FsIndexDescription[] aFsIndexes, ResourceManager aResourceManager,
+          Properties aPerformanceTuningSettings) {
     this.typeSystemDescription = aTypeSystem;
     this.typePriorities = aTypePriorities;
     this.fsIndexDescriptions = aFsIndexes;
@@ -54,7 +54,7 @@
   }
 
   public CasDefinition(Collection aMetaDataToMerge, ResourceManager aResourceManager)
-                  throws ResourceInitializationException {
+          throws ResourceInitializationException {
     // extract TypeSystems, TypePriorities, and FsIndexes from metadata
     List typeSystems = new ArrayList();
     List typePrioritiesList = new ArrayList();
@@ -72,10 +72,10 @@
 
     // merge TypePriorities and FsIndexes
     TypePriorities aggTypePriorities = CasCreationUtils.mergeTypePriorities(typePrioritiesList,
-                    aResourceManager);
+            aResourceManager);
     FsIndexCollection aggIndexColl = CasCreationUtils.mergeFsIndexes(fsIndexes, aResourceManager);
     TypeSystemDescription aggTypeDesc = CasCreationUtils.mergeTypeSystems(typeSystems,
-                    aResourceManager);
+            aResourceManager);
 
     this.typeSystemDescription = aggTypeDesc;
     this.typePriorities = aggTypePriorities;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/CasManager.java Tue Nov 28 14:25:39 2006
@@ -64,7 +64,7 @@
    *           if a CAS could not be created.
    */
   void defineCasPool(String aRequestorContextName, int aSize, Properties aPerformanceTuningSettings)
-                  throws ResourceInitializationException;
+          throws ResourceInitializationException;
 
   /**
    * Gets an empty CAS. An AnalysisEngine may only call this method after it has first called

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurableResource_ImplBase.java Tue Nov 28 14:25:39 2006
@@ -28,7 +28,7 @@
  * 
  */
 public abstract class ConfigurableResource_ImplBase extends Resource_ImplBase implements
-                ConfigurableResource {
+        ConfigurableResource {
 
   /**
    * @see org.apache.uima.resource.ConfigurableResource#getConfigParameterValue(java.lang.String)
@@ -51,7 +51,7 @@
    */
   public void setConfigParameterValue(String aParamName, Object aValue) {
     getUimaContextAdmin().getConfigurationManager().setConfigParameterValue(
-                    getUimaContextAdmin().getQualifiedContextName() + aParamName, aValue);
+            getUimaContextAdmin().getQualifiedContextName() + aParamName, aValue);
   }
 
   /**
@@ -60,8 +60,7 @@
    */
   public void setConfigParameterValue(String aGroupName, String aParamName, Object aValue) {
     getUimaContextAdmin().getConfigurationManager().setConfigParameterValue(
-                    getUimaContextAdmin().getQualifiedContextName() + aParamName, aGroupName,
-                    aValue);
+            getUimaContextAdmin().getQualifiedContextName() + aParamName, aGroupName, aValue);
   }
 
   /**
@@ -69,7 +68,7 @@
    */
   public void reconfigure() throws ResourceConfigurationException {
     getUimaContextAdmin().getConfigurationManager().reconfigure(
-                    getUimaContextAdmin().getQualifiedContextName());
+            getUimaContextAdmin().getQualifiedContextName());
   }
 
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ConfigurationManager.java Tue Nov 28 14:25:39 2006
@@ -49,7 +49,7 @@
    *           if the configuration settings are invalid
    */
   public void createContext(String aContextName, ResourceMetaData aResourceMetaData)
-                  throws ResourceConfigurationException;
+          throws ResourceConfigurationException;
 
   /**
    * Sets the current <code>Session</code>. The Configuration Manager uses the

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource.java Tue Nov 28 14:25:39 2006
@@ -73,7 +73,7 @@
    *           if this method is called more than once on a single Resource instance.
    */
   public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-                  throws ResourceInitializationException;
+          throws ResourceInitializationException;
 
   /**
    * Gets the metadata that describes this <code>Resource</code>.

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceAccessException.java Tue Nov 28 14:25:39 2006
@@ -41,7 +41,7 @@
    * parameters."
    */
   public static final String PARAMETERS_NOT_ALLOWED = "parameters_not_allowed";
-  
+
   /**
    * Creates a new exception with a null message.
    */
@@ -94,7 +94,7 @@
    *          the original exception that caused this exception to be thrown, if any
    */
   public ResourceAccessException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments, Throwable aCause) {
+          Object[] aArguments, Throwable aCause) {
     super(aResourceBundleName, aMessageKey, aArguments, aCause);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceConfigurationException.java Tue Nov 28 14:25:39 2006
@@ -123,7 +123,7 @@
    *          arguments.
    */
   public ResourceConfigurationException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments) {
+          Object[] aArguments) {
     super(aResourceBundleName, aMessageKey, aArguments);
   }
 
@@ -144,7 +144,7 @@
    *          the original exception that caused this exception to be thrown, if any
    */
   public ResourceConfigurationException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments, Throwable aCause) {
+          Object[] aArguments, Throwable aCause) {
     super(aResourceBundleName, aMessageKey, aArguments, aCause);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceCreationSpecifier.java Tue Nov 28 14:25:39 2006
@@ -149,7 +149,7 @@
    *          are bound to actual resources.
    */
   public void setResourceManagerConfiguration(
-                  ResourceManagerConfiguration aResourceManagerConfiguration);
+          ResourceManagerConfiguration aResourceManagerConfiguration);
 
   /**
    * Checks that this specifier is valid. An exception is thrown if it is not valid. This only does
@@ -187,6 +187,6 @@
    *           if validation failed
    */
   public void doFullValidation(ResourceManager aResourceManager)
-                  throws ResourceInitializationException;
+          throws ResourceInitializationException;
 
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceInitializationException.java Tue Nov 28 14:25:39 2006
@@ -434,7 +434,7 @@
    *          arguments.
    */
   public ResourceInitializationException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments) {
+          Object[] aArguments) {
     super(aResourceBundleName, aMessageKey, aArguments);
   }
 
@@ -455,7 +455,7 @@
    *          the original exception that caused this exception to be thrown, if any
    */
   public ResourceInitializationException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments, Throwable aCause) {
+          Object[] aArguments, Throwable aCause) {
     super(aResourceBundleName, aMessageKey, aArguments, aCause);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceManager.java Tue Nov 28 14:25:39 2006
@@ -200,7 +200,7 @@
    *           if a failure occurs in accessing the resource
    */
   public InputStream getResourceAsStream(String aKey, String[] aParams)
-                  throws ResourceAccessException;
+          throws ResourceAccessException;
 
   /**
    * Initializes all external resources declared in a ResourceCreationSpecifier.
@@ -217,8 +217,8 @@
    *           if an initialization failure occurs
    */
   public void initializeExternalResources(ResourceManagerConfiguration aConfiguration,
-                  String aQualifiedContextName, Map aAdditionalParams)
-                  throws ResourceInitializationException;
+          String aQualifiedContextName, Map aAdditionalParams)
+          throws ResourceInitializationException;
 
   /**
    * Resolves a component's external resource dependencies using this resource manager. Throws an
@@ -234,7 +234,7 @@
    *           if a required dependency is not satisfied
    */
   public void resolveAndValidateResourceDependencies(ExternalResourceDependency[] aDependencies,
-                  String aQualifiedContextName) throws ResourceInitializationException;
+          String aQualifiedContextName) throws ResourceInitializationException;
 
   /**
    * Sets the classpath for the UIMA extension ClassLoader and specifies if the extension
@@ -249,7 +249,7 @@
    *           if a malformed URL has occurred in the classpath string.
    */
   public void setExtensionClassPath(String classpath, boolean resolveResource)
-                  throws MalformedURLException;
+          throws MalformedURLException;
 
   /**
    * Sets the classpath for the UIMA extension ClassLoader and specifies if the extension
@@ -267,7 +267,7 @@
    *           if a malformed URL has occurred in the classpath string.
    */
   public void setExtensionClassPath(ClassLoader parent, String classpath, boolean resolveResource)
-                  throws MalformedURLException;
+          throws MalformedURLException;
 
   /**
    * Returns the UIMA extension class loader.

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceProcessException.java Tue Nov 28 14:25:39 2006
@@ -73,7 +73,7 @@
    *          arguments.
    */
   public ResourceProcessException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments) {
+          Object[] aArguments) {
     super(aResourceBundleName, aMessageKey, aArguments);
   }
 
@@ -94,7 +94,7 @@
    *          the original exception that caused this exception to be thrown, if any
    */
   public ResourceProcessException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments, Throwable aCause) {
+          Object[] aArguments, Throwable aCause) {
     super(aResourceBundleName, aMessageKey, aArguments, aCause);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/ResourceServiceException.java Tue Nov 28 14:25:39 2006
@@ -87,7 +87,7 @@
    *          arguments.
    */
   public ResourceServiceException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments) {
+          Object[] aArguments) {
     super(aResourceBundleName, aMessageKey, aArguments);
   }
 
@@ -108,7 +108,7 @@
    *          the original exception that caused this exception to be thrown, if any
    */
   public ResourceServiceException(String aResourceBundleName, String aMessageKey,
-                  Object[] aArguments, Throwable aCause) {
+          Object[] aArguments, Throwable aCause) {
     super(aResourceBundleName, aMessageKey, aArguments, aCause);
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/Resource_ImplBase.java Tue Nov 28 14:25:39 2006
@@ -53,13 +53,13 @@
    * Whether this Resource's {@link #initialize(ResourceSpecifier,Map)} method has been called.
    */
   private boolean mInitialized = false;
-  
+
   /**
    * @see org.apache.uima.resource.Resource#initialize(org.apache.uima.resource.ResourceSpecifier,
    *      java.util.Map)
    */
   public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-                  throws ResourceInitializationException {
+          throws ResourceInitializationException {
 
     // get name of resource, to be used in error messages
     String name;
@@ -72,7 +72,7 @@
     // check for repeat initialization
     if (mInitialized) {
       throw new UIMA_IllegalStateException(UIMA_IllegalStateException.RESOURCE_ALREADY_INITIALIZED,
-                      new Object[] { name });
+              new Object[] { name });
     }
 
     // is there a UIMAContext provided in the aAdditionalParams map?
@@ -97,7 +97,7 @@
 
       // create and initialize UIMAContext
       mUimaContextAdmin = UIMAFramework.newUimaContext(logger, resMgr, UIMAFramework
-                      .newConfigurationManager());
+              .newConfigurationManager());
 
     } else {
       // configure logger of the UIMA context so that class-specific logging
@@ -126,17 +126,17 @@
       // initialize configuration
       try {
         mUimaContextAdmin.getConfigurationManager().createContext(
-                        mUimaContextAdmin.getQualifiedContextName(), getMetaData());
+                mUimaContextAdmin.getQualifiedContextName(), getMetaData());
         mUimaContextAdmin.getConfigurationManager().setSession(mUimaContextAdmin.getSession());
       } catch (ResourceConfigurationException e) {
         throw new ResourceInitializationException(
-                        ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR,
-                        new Object[] { name, metadata.getSourceUrlString() }, e);
+                ResourceInitializationException.ERROR_INITIALIZING_FROM_DESCRIPTOR, new Object[] {
+                    name, metadata.getSourceUrlString() }, e);
       }
 
       // initialize any external resource declared in this descriptor
       ResourceManagerConfiguration resMgrCfg = ((ResourceCreationSpecifier) aSpecifier)
-                      .getResourceManagerConfiguration();
+              .getResourceManagerConfiguration();
       if (resMgrCfg != null) {
         try {
           resMgrCfg.resolveImports(getResourceManager());
@@ -144,15 +144,15 @@
           throw new ResourceInitializationException(e);
         }
         mUimaContextAdmin.getResourceManager().initializeExternalResources(resMgrCfg,
-                        mUimaContextAdmin.getQualifiedContextName(), aAdditionalParams);
+                mUimaContextAdmin.getQualifiedContextName(), aAdditionalParams);
       }
 
       // resolve and validate this component's external resource dependencies
       ExternalResourceDependency[] resourceDependencies = ((ResourceCreationSpecifier) aSpecifier)
-                      .getExternalResourceDependencies();
+              .getExternalResourceDependencies();
       if (resourceDependencies != null) {
         mUimaContextAdmin.getResourceManager().resolveAndValidateResourceDependencies(
-                        resourceDependencies, mUimaContextAdmin.getQualifiedContextName());
+                resourceDependencies, mUimaContextAdmin.getQualifiedContextName());
       }
     }
     mInitialized = true;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/CasManager_impl.java Tue Nov 28 14:25:39 2006
@@ -88,7 +88,7 @@
     CasPool pool = (CasPool) mRequestorToCasPoolMap.get(aRequestorContextName);
     if (pool == null) {
       throw new UIMARuntimeException(UIMARuntimeException.REQUESTED_TOO_MANY_CAS_INSTANCES,
-                      new Object[] { aRequestorContextName, "1", "0" });
+              new Object[] { aRequestorContextName, "1", "0" });
     }
     return pool.getCas(0);
   }
@@ -103,7 +103,7 @@
     if (pool == null) {
       // CAS doesn't belong to this CasManager!
       throw new UIMARuntimeException(UIMARuntimeException.CAS_RELEASED_TO_WRONG_CAS_MANAGER,
-                      new Object[0]);
+              new Object[0]);
     } else {
       pool.releaseCas((CAS) aCAS);
     }
@@ -115,7 +115,7 @@
    * @see org.apache.uima.resource.CasManager#setMinimumCasPoolSize(java.lang.String, int)
    */
   public void defineCasPool(String aRequestorContextName, int aSize,
-                  Properties aPerformanceTuningSettings) throws ResourceInitializationException {
+          Properties aPerformanceTuningSettings) throws ResourceInitializationException {
     if (aSize > 0) {
       CasPool pool = (CasPool) mRequestorToCasPoolMap.get(aRequestorContextName);
       if (pool == null) {
@@ -125,7 +125,7 @@
         mRequestorToCasPoolMap.put(aRequestorContextName, pool);
       } else {
         throw new UIMARuntimeException(UIMARuntimeException.DEFINE_CAS_POOL_CALLED_TWICE,
-                        new Object[] { aRequestorContextName });
+                new Object[] { aRequestorContextName });
       }
     }
   }
@@ -153,7 +153,7 @@
     }
     {
       throw new UIMARuntimeException(UIMARuntimeException.UNSUPPORTED_CAS_INTERFACE,
-                      new Object[] { requiredInterface });
+              new Object[] { requiredInterface });
     }
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResourceSpecifier_impl.java Tue Nov 28 14:25:39 2006
@@ -31,7 +31,7 @@
  * 
  */
 public class ConfigurableDataResourceSpecifier_impl extends MetaDataObject_impl implements
-                ConfigurableDataResourceSpecifier {
+        ConfigurableDataResourceSpecifier {
   private static final long serialVersionUID = -5414343447386950507L;
 
   /** URL of the data. */
@@ -83,6 +83,6 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo(
-                  "configurableDataResourceSpecifier", new PropertyXmlInfo[] {
-                      new PropertyXmlInfo("url"), new PropertyXmlInfo("metaData", null) });
+          "configurableDataResourceSpecifier", new PropertyXmlInfo[] { new PropertyXmlInfo("url"),
+              new PropertyXmlInfo("metaData", null) });
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurableDataResource_impl.java Tue Nov 28 14:25:39 2006
@@ -49,7 +49,7 @@
 
   /** URL of file. This is formed from the URI, if possible. */
   private URL mFileUrl;
-  
+
   /**
    * Initializes this DataResource.
    * 
@@ -65,7 +65,7 @@
    * @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier)
    */
   public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-                  throws ResourceInitializationException {
+          throws ResourceInitializationException {
     // aSpecifier must be a ConfigurableDataResourceSpecifier
     if (!(aSpecifier instanceof ConfigurableDataResourceSpecifier)) {
       return false;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManagerImplBase.java Tue Nov 28 14:25:39 2006
@@ -96,7 +96,7 @@
    *      org.apache.uima.resource.metadata.ResourceMetaData)
    */
   public void createContext(String aContextName, ResourceMetaData aResourceMetaData)
-                  throws ResourceConfigurationException {
+          throws ResourceConfigurationException {
     // first internally validate settings in the ResourceMetaData (catches data type problems,
     // settings for undefined parameters, etc.)
     aResourceMetaData.validateConfigurationParameterSettings();
@@ -105,7 +105,7 @@
     // concrete ConfigurationManager implementations to set up data structures to
     // provide access to the parameter values
     ConfigurationParameterDeclarations paramDecls = aResourceMetaData
-                    .getConfigurationParameterDeclarations();
+            .getConfigurationParameterDeclarations();
     String parentContext = computeParentContextName(aContextName);
     ConfigurationParameterSettings settings = aResourceMetaData.getConfigurationParameterSettings();
 
@@ -161,7 +161,7 @@
     // if that fails, look up in default group if one is defined
     String defaultGroup = null;
     ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
-                    .get(computeParentContextName(aQualifiedParameterName));
+            .get(computeParentContextName(aQualifiedParameterName));
     if (decls != null) {
       defaultGroup = decls.getDefaultGroupName();
     }
@@ -180,10 +180,10 @@
   public Object getConfigParameterValue(String aQualifiedParameterName, String aGroupName) {
     // get parameter search strategy for this context
     ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
-                    .get(computeParentContextName(aQualifiedParameterName));
+            .get(computeParentContextName(aQualifiedParameterName));
     if (decls != null) {
       return getConfigParameterValue(aQualifiedParameterName, aGroupName,
-                      decls.getSearchStrategy(), decls.getDefaultGroupName());
+              decls.getSearchStrategy(), decls.getDefaultGroupName());
     } else {
       return getConfigParameterValue(aQualifiedParameterName, aGroupName, null, null);
     }
@@ -253,10 +253,10 @@
   public ConfigurationParameterSettings getCurrentConfigParameterSettings(String aContextName) {
     // get declarations
     ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
-                    .get(aContextName);
+            .get(aContextName);
 
     ConfigurationParameterSettings settings = UIMAFramework.getResourceSpecifierFactory()
-                    .createConfigurationParameterSettings();
+            .createConfigurationParameterSettings();
 
     ConfigurationParameter[] paramsInNoGroup = decls.getConfigurationParameters();
     if (paramsInNoGroup.length > 0) // no groups declared
@@ -273,15 +273,15 @@
             for (int j = 0; j < names.length; j++) {
               // common params
               NameValuePair[] commonParamSettings = getParamSettings(names[j], decls
-                              .getCommonParameters(), aContextName);
+                      .getCommonParameters(), aContextName);
               NameValuePair[] specificParamSettings = getParamSettings(names[j], groups[i]
-                              .getConfigurationParameters(), aContextName);
+                      .getConfigurationParameters(), aContextName);
               NameValuePair[] mergedSettings = new NameValuePair[commonParamSettings.length
-                              + specificParamSettings.length];
+                      + specificParamSettings.length];
               System.arraycopy(commonParamSettings, 0, mergedSettings, 0,
-                              commonParamSettings.length);
+                      commonParamSettings.length);
               System.arraycopy(specificParamSettings, 0, mergedSettings,
-                              commonParamSettings.length, specificParamSettings.length);
+                      commonParamSettings.length, specificParamSettings.length);
               settings.getSettingsForGroups().put(names[j], mergedSettings);
             }
           }
@@ -335,8 +335,7 @@
    *          name of parent context, null if none
    */
   protected void declareParameters(String aGroupName, ConfigurationParameter[] aParams,
-                  ConfigurationParameterSettings aSettings, String aContextName,
-                  String aParentContextName) {
+          ConfigurationParameterSettings aSettings, String aContextName, String aParentContextName) {
     // iterate over config. param _declarations_
     if (aParams != null) {
       for (int i = 0; i < aParams.length; i++) {
@@ -349,9 +348,9 @@
           // no explicit override. Check for implicit override (a parameter with same
           // name declared in parent aggregate with no explicit overrides)
           String nameInParentContext = makeQualifiedName(aParentContextName, param.getName(),
-                          aGroupName);
+                  aGroupName);
           if (lookup(nameInParentContext) != null
-                          && !mExplicitlyOverridingParameters.contains(nameInParentContext)) {
+                  && !mExplicitlyOverridingParameters.contains(nameInParentContext)) {
             // create a link (but collapse multiple links)
             // String parentLink = getLink(nameInParentContext);
             // overriddenBy = parentLink != null ? parentLink : nameInParentContext;
@@ -413,7 +412,7 @@
    * @return array containing settings of the specific parameters
    */
   private NameValuePair[] getParamSettings(String aGroupName, ConfigurationParameter[] aParams,
-                  String aContextName) {
+          String aContextName) {
     ArrayList result = new ArrayList();
     // iterate over config. param _declarations_
     if (aParams != null) {
@@ -481,10 +480,10 @@
    *           if the configuration parameter settings are invalid
    */
   private void validateConfigurationParameterSettings(String aContext)
-                  throws ResourceConfigurationException {
+          throws ResourceConfigurationException {
     // get declarations
     ConfigurationParameterDeclarations decls = (ConfigurationParameterDeclarations) mContextNameToParamDeclsMap
-                    .get(aContext);
+            .get(aContext);
     // check that all required parameters have values
     ConfigurationParameter[] params = decls.getConfigurationParameters();
     if (params.length > 0) {
@@ -525,8 +524,8 @@
    *           if the configuration parameter settings are invalid
    */
   private void validateConfigurationParameterSettings(String aContext,
-                  ConfigurationParameter[] aParams, String aGroupName)
-                  throws ResourceConfigurationException {
+          ConfigurationParameter[] aParams, String aGroupName)
+          throws ResourceConfigurationException {
     for (int i = 0; i < aParams.length; i++) {
       // get value
       Object val = this.getConfigParameterValue(aContext + aParams[i].getName(), aGroupName);
@@ -534,12 +533,12 @@
       if (val == null && aParams[i].isMandatory()) {
         if (aGroupName != null) {
           throw new ResourceConfigurationException(
-                          ResourceConfigurationException.MANDATORY_VALUE_MISSING_IN_GROUP,
-                          new Object[] { aParams[i].getName(), aGroupName, aContext });
+                  ResourceConfigurationException.MANDATORY_VALUE_MISSING_IN_GROUP, new Object[] {
+                      aParams[i].getName(), aGroupName, aContext });
         } else {
           throw new ResourceConfigurationException(
-                          ResourceConfigurationException.MANDATORY_VALUE_MISSING, new Object[] {
-                              aParams[i].getName(), aContext });
+                  ResourceConfigurationException.MANDATORY_VALUE_MISSING, new Object[] {
+                      aParams[i].getName(), aContext });
         }
       }
       // check datatype
@@ -561,18 +560,18 @@
    *           if the data types do not match
    */
   private void validateConfigurationParameterDataTypeMatch(ConfigurationParameter aParam,
-                  Object aValue, String aContextName) throws ResourceConfigurationException {
+          Object aValue, String aContextName) throws ResourceConfigurationException {
     if (aValue != null) {
       Class valClass = aValue.getClass();
       if (aParam.isMultiValued() && !valClass.isArray()) {
         throw new ResourceConfigurationException(ResourceConfigurationException.ARRAY_REQUIRED,
-                        new Object[] { aParam.getName(), aContextName });
+                new Object[] { aParam.getName(), aContextName });
       }
 
       if (!valClass.equals(getParameterExpectedValueClass(aParam))) {
         throw new ResourceConfigurationException(
-                        ResourceConfigurationException.PARAMETER_TYPE_MISMATCH, new Object[] {
-                            aContextName, valClass.getName(), aParam.getName(), aParam.getType() });
+                ResourceConfigurationException.PARAMETER_TYPE_MISMATCH, new Object[] {
+                    aContextName, valClass.getName(), aParam.getName(), aParam.getType() });
       }
     }
   }
@@ -630,22 +629,22 @@
    * @return the value of the specified parameter, <code>null</code> if none
    */
   private Object getConfigParameterValue(String aQualifiedParameterName, String aGroupName,
-                  String aSearchStrategy, String aDefaultGroup) {
+          String aSearchStrategy, String aDefaultGroup) {
     if (ConfigurationParameterDeclarations.SEARCH_STRATEGY_DEFAULT_FALLBACK.equals(aSearchStrategy)) {
       // try in specified group then in default group
       Object value = getConfigParameterValue(aQualifiedParameterName, aGroupName,
-                      ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
+              ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
       if (value != null) {
         return value;
       } else {
         return getConfigParameterValue(aQualifiedParameterName, aDefaultGroup,
-                        ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
+                ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
       }
     } else if (ConfigurationParameterDeclarations.SEARCH_STRATEGY_LANGUAGE_FALLBACK
-                    .equals(aSearchStrategy)) {
+            .equals(aSearchStrategy)) {
       // try in specified group first
       Object value = getConfigParameterValue(aQualifiedParameterName, aGroupName,
-                      ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
+              ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
 
       while (value == null && aGroupName != null) {
         // truncate group name at the last _ or - character
@@ -659,13 +658,13 @@
         }
         if (aGroupName != null) {
           value = getConfigParameterValue(aQualifiedParameterName, aGroupName,
-                          ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
+                  ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
         }
       }
       // if we still haen't found a value, try the default group
       if (value == null) {
         value = getConfigParameterValue(aQualifiedParameterName, aDefaultGroup,
-                        ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
+                ConfigurationParameterDeclarations.SEARCH_STRATEGY_NONE, null);
       }
       return value;
     } else
@@ -673,7 +672,7 @@
     {
       // just to direct look up in the specified group
       return lookup(aGroupName == null ? aQualifiedParameterName : (aQualifiedParameterName
-                      + GROUP_SEPARATOR + aGroupName));
+              + GROUP_SEPARATOR + aGroupName));
     }
   }
 

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ConfigurationManager_impl.java Tue Nov 28 14:25:39 2006
@@ -47,8 +47,7 @@
    *      java.lang.String)
    */
   protected void declareParameters(String aGroupName, ConfigurationParameter[] aParams,
-                  ConfigurationParameterSettings aSettings, String aContextName,
-                  String aParentContextName) {
+          ConfigurationParameterSettings aSettings, String aContextName, String aParentContextName) {
     super.declareParameters(aGroupName, aParams, aSettings, aContextName, aParentContextName);
     // iterate over config. param _declarations_ and build mSharedParamNap
     if (aParams != null) {

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/DataResource_impl.java Tue Nov 28 14:25:39 2006
@@ -65,7 +65,7 @@
    * @see org.apache.uima.resource.Resource#initialize(ResourceSpecifier)
    */
   public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-                  throws ResourceInitializationException {
+          throws ResourceInitializationException {
     // aSpecifier must be a FileResourceSpecifier
     if (!(aSpecifier instanceof FileResourceSpecifier))
       return false;
@@ -99,8 +99,8 @@
     }
     if (mFileUrl == null) {
       throw new ResourceInitializationException(
-                      ResourceInitializationException.COULD_NOT_ACCESS_DATA, new Object[] { spec
-                                      .getFileUrl() }, ioEx);
+              ResourceInitializationException.COULD_NOT_ACCESS_DATA, new Object[] { spec
+                      .getFileUrl() }, ioEx);
     }
 
     return true;

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDependency_impl.java Tue Nov 28 14:25:39 2006
@@ -30,7 +30,7 @@
  * 
  */
 public class ExternalResourceDependency_impl extends MetaDataObject_impl implements
-                ExternalResourceDependency {
+        ExternalResourceDependency {
 
   static final long serialVersionUID = 8416783152191685356L;
 
@@ -104,7 +104,7 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo(
-                  "externalResourceDependency", new PropertyXmlInfo[] { new PropertyXmlInfo("key"),
-                      new PropertyXmlInfo("description", false),
-                      new PropertyXmlInfo("interfaceName"), new PropertyXmlInfo("optional"), });
+          "externalResourceDependency", new PropertyXmlInfo[] { new PropertyXmlInfo("key"),
+              new PropertyXmlInfo("description", false), new PropertyXmlInfo("interfaceName"),
+              new PropertyXmlInfo("optional"), });
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/ExternalResourceDescription_impl.java Tue Nov 28 14:25:39 2006
@@ -34,7 +34,7 @@
  * 
  */
 public class ExternalResourceDescription_impl extends MetaDataObject_impl implements
-                ExternalResourceDescription {
+        ExternalResourceDescription {
 
   static final long serialVersionUID = -6995615796561255268L;
 
@@ -107,8 +107,8 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("externalResource",
-                  new PropertyXmlInfo[] { new PropertyXmlInfo("name"),
-                      new PropertyXmlInfo("description", false),
-                      new PropertyXmlInfo("resourceSpecifier", null),
-                      new PropertyXmlInfo("implementationName") });
+          new PropertyXmlInfo[] { new PropertyXmlInfo("name"),
+              new PropertyXmlInfo("description", false),
+              new PropertyXmlInfo("resourceSpecifier", null),
+              new PropertyXmlInfo("implementationName") });
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResourceSpecifier_impl.java Tue Nov 28 14:25:39 2006
@@ -30,7 +30,7 @@
  * 
  */
 public class FileLanguageResourceSpecifier_impl extends MetaDataObject_impl implements
-                FileLanguageResourceSpecifier {
+        FileLanguageResourceSpecifier {
 
   static final long serialVersionUID = 4660680936104675527L;
 
@@ -79,6 +79,6 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo(
-                  "fileLanguageResourceSpecifier", new PropertyXmlInfo[] {
-                      new PropertyXmlInfo("fileUrlPrefix"), new PropertyXmlInfo("fileUrlSuffix"), });
+          "fileLanguageResourceSpecifier", new PropertyXmlInfo[] {
+              new PropertyXmlInfo("fileUrlPrefix"), new PropertyXmlInfo("fileUrlSuffix"), });
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileLanguageResource_impl.java Tue Nov 28 14:25:39 2006
@@ -38,7 +38,7 @@
  * 
  */
 public class FileLanguageResource_impl extends Resource_ImplBase implements
-                ParameterizedDataResource {
+        ParameterizedDataResource {
 
   /** URL prefix */
   private String mFileUrlPrefix;
@@ -48,13 +48,13 @@
 
   /** Initialization parameters to be passed to DataResources. */
   private Map mResourceInitParams;
-  
+
   /**
    * @see org.apache.uima.resource.Resource#initialize(org.apache.uima.resource.ResourceSpecifier,
    *      java.util.Map)
    */
   public boolean initialize(ResourceSpecifier aSpecifier, Map aAdditionalParams)
-                  throws ResourceInitializationException {
+          throws ResourceInitializationException {
     // aSpecifier must be a FileLanguageResourceSpecifier
     if (!(aSpecifier instanceof FileLanguageResourceSpecifier))
       return false;
@@ -68,7 +68,7 @@
 
     // store initialization parameters to be passed on to DataReources
     mResourceInitParams = (aAdditionalParams == null) ? new HashMap() : new HashMap(
-                    aAdditionalParams);
+            aAdditionalParams);
 
     return true;
   }
@@ -86,8 +86,7 @@
     // one parameter - the language - is required
     if (aParams.length != 1) {
       throw new ResourceInitializationException(
-                      ResourceInitializationException.INCORRECT_NUMBER_OF_PARAMETERS,
-                      new Object[] { "1" });
+              ResourceInitializationException.INCORRECT_NUMBER_OF_PARAMETERS, new Object[] { "1" });
     }
 
     String lang = aParams[0];
@@ -99,12 +98,12 @@
       String urlString = mFileUrlPrefix + lang + mFileUrlSuffix;
       // build FileResource specifier and attempt to create DataResource
       FileResourceSpecifier fileSpec = UIMAFramework.getResourceSpecifierFactory()
-                      .createFileResourceSpecifier();
+              .createFileResourceSpecifier();
       fileSpec.setFileUrl(urlString);
 
       try {
         resource = (DataResource) UIMAFramework.produceResource(DataResource.class, fileSpec,
-                        mResourceInitParams);
+                mResourceInitParams);
       } catch (ResourceInitializationException e) {
         // this is expected if the data file cannot be found - record first
         // such exception only
@@ -131,8 +130,8 @@
       return resource;
     } else {
       throw new ResourceInitializationException(
-                      ResourceInitializationException.NO_RESOURCE_FOR_PARAMETERS,
-                      new Object[] { "[" + aParams[0] + "]" }, firstException);
+              ResourceInitializationException.NO_RESOURCE_FOR_PARAMETERS, new Object[] { "["
+                      + aParams[0] + "]" }, firstException);
     }
   }
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/FileResourceSpecifier_impl.java Tue Nov 28 14:25:39 2006
@@ -30,7 +30,7 @@
  * 
  */
 public class FileResourceSpecifier_impl extends MetaDataObject_impl implements
-                FileResourceSpecifier {
+        FileResourceSpecifier {
 
   static final long serialVersionUID = -4595981135298755811L;
 
@@ -79,6 +79,6 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("fileResourceSpecifier",
-                  new PropertyXmlInfo[] { new PropertyXmlInfo("fileUrl"),
-                      new PropertyXmlInfo("localCache"), });
+          new PropertyXmlInfo[] { new PropertyXmlInfo("fileUrl"),
+              new PropertyXmlInfo("localCache"), });
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/Parameter_impl.java Tue Nov 28 14:25:39 2006
@@ -68,7 +68,7 @@
    *      org.apache.uima.util.XMLParser, org.apache.uima.util.XMLParser.ParsingOptions)
    */
   public void buildFromXMLElement(Element aElement, XMLParser aParser, ParsingOptions aOptions)
-                  throws InvalidXMLException {
+          throws InvalidXMLException {
     super.buildFromXMLElement(aElement, aParser, aOptions);
     setName(aElement.getAttribute("name"));
     setValue(aElement.getAttribute("value"));
@@ -91,5 +91,5 @@
   }
 
   static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("parameter",
-                  new PropertyXmlInfo[0]);
+          new PropertyXmlInfo[0]);
 }

Modified: incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java?view=diff&rev=480252&r1=480251&r2=480252
==============================================================================
--- incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java (original)
+++ incubator/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java Tue Nov 28 14:25:39 2006
@@ -142,7 +142,7 @@
     if (mClassLoader != null) {
       absURL = mClassLoader.getResource(f);
     } else // if no ClassLoader specified (could be the bootstrap classloader), try the system
-            // classloader
+    // classloader
     {
       absURL = ClassLoader.getSystemClassLoader().getResource(f);
     }