commit ae5f311e192c1ea6bf638871c26a95fbe1770df3
author Jeffrey Overbey <jeffreyoverbey@acm.org> Thu Jul 15 19:15:39 2010 +0000
committer Jeffrey Overbey <jeffreyoverbey@acm.org> Thu Jul 15 19:15:39 2010 +0000
tree 848e49176b94c986bfe137ab199a09891bb659c0
parent 759af2a5d9412762b7334078f8e3b14a362b999b

Fixed Bug 320030

org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/vpg/PhotranVPGBuilder.java

diff --git a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/vpg/PhotranVPGBuilder.java b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/vpg/PhotranVPGBuilder.java
index 18510aa..02eca3d 100644
--- a/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/vpg/PhotranVPGBuilder.java
+++ b/org.eclipse.photran.core.vpg/src/org/eclipse/photran/internal/core/vpg/PhotranVPGBuilder.java
@@ -322,7 +322,7 @@
         return parse(filename, null);
     }
 
-    private IFortranAST parse(final String filename, Reader stream)
+    private IFortranAST parse(String filename, Reader stream)
     {
         if (filename == null || isVirtualFile(filename)) return null;
 
@@ -343,33 +343,34 @@
             catch (SyntaxException e)
             {
                 if (e.getFile() != null && e.getFile().getIFile() != null)
-                {
-                    log.clearEntriesFor(PhotranVPG.getFilenameForIFile(e.getFile().getIFile()));
-                    log.logError(
-                        Messages.bind(
-                            Messages.PhotranVPGBuilder_ErrorParsingFileMessage,
-                            filename,
-                            e.getMessage()),
-                        new PhotranTokenRef(e.getFile().getIFile(), e.getTokenOffset(), e.getTokenLength()));
-                }
-                else
-                    logError(file, Messages.bind(Messages.PhotranVPGBuilder_ErrorParsingFile, filename), e);
+                    filename = PhotranVPG.getFilenameForIFile(e.getFile().getIFile());
+
+                log.clearEntriesFor(PhotranVPG.getFilenameForIFile(e.getFile().getIFile()));
+                log.logError(
+                    Messages.bind(
+                        Messages.PhotranVPGBuilder_ErrorParsingFileMessage,
+                        filename,
+                        e.getMessage()),
+                    new PhotranTokenRef(filename, e.getTokenOffset(), e.getTokenLength()));
+//              else
+//                  logError(file, Messages.bind(Messages.PhotranVPGBuilder_ErrorParsingFile, filename), e);
                 return null;
             }
             catch (LexerException e)
             {
                 if (e.getFile() != null && e.getFile().getIFile() != null)
-                {
-                    log.clearEntriesFor(PhotranVPG.getFilenameForIFile(e.getFile().getIFile()));
-                    log.logError(
-                        Messages.bind(
-                            Messages.PhotranVPGBuilder_ErrorParsingFileMessage,
-                            filename,
-                            e.getMessage()),
-                        new PhotranTokenRef(e.getFile().getIFile(), e.getTokenOffset(), e.getTokenLength()));
-                }
-                else
-                    logError(file, Messages.bind(Messages.PhotranVPGBuilder_ErrorParsingFile, filename), e);
+                    filename = PhotranVPG.getFilenameForIFile(e.getFile().getIFile());
+
+                log.clearEntriesFor(filename);
+                log.logError(
+                    Messages.bind(
+                        Messages.PhotranVPGBuilder_ErrorParsingFileMessage,
+                        filename,
+                        e.getMessage()),
+                    new PhotranTokenRef(filename, e.getTokenOffset(), e.getTokenLength()));
+//              }
+//              else
+//                  logError(file, Messages.bind(Messages.PhotranVPGBuilder_ErrorParsingFile, filename), e);
                 return null;
             }
     //        catch (CoreException e)