You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/10/10 04:35:34 UTC
git commit: [flex-falcon] [refs/heads/develop] - copy problem
formatter to COMPC handler
Repository: flex-falcon
Updated Branches:
refs/heads/develop 09b76c2f6 -> 4a2a54244
copy problem formatter to COMPC handler
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/4a2a5424
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/4a2a5424
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/4a2a5424
Branch: refs/heads/develop
Commit: 4a2a54244eb88c598d578e1f2f176172ce054461
Parents: 09b76c2
Author: Alex Harui <ah...@apache.org>
Authored: Sun Oct 9 21:35:11 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Oct 9 21:35:11 2016 -0700
----------------------------------------------------------------------
.../src/main/java/flex2/tools/oem/Library.java | 48 +++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/4a2a5424/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
index d4f1a19..bdcb3be 100644
--- a/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
+++ b/flex-compiler-oem/src/main/java/flex2/tools/oem/Library.java
@@ -38,6 +38,7 @@ import java.lang.annotation.Annotation;
import java.net.URI;
import org.apache.flex.compiler.clients.COMPC;
+import org.apache.flex.compiler.clients.problems.ProblemFormatter;
import org.apache.flex.compiler.clients.problems.ProblemQuery;
import org.apache.flex.compiler.problems.CompilerProblemSeverity;
import org.apache.flex.compiler.problems.ICompilerProblem;
@@ -1142,16 +1143,7 @@ public class Library implements Builder, Cloneable
prob.getColumn());
try
{
- String errText = (String) aClass.getField("DESCRIPTION").get(aClass);
- while (errText.contains("${"))
- {
- int start = errText.indexOf("${");
- int end = errText.indexOf("}", start);
- String token = errText.substring(start + 2, end);
- String value = (String) aClass.getField(token).get(prob);
- token = "${" + token + "}";
- errText = errText.replace(token, value);
- }
+ String errText = ProblemFormatter.DEFAULT_FORMATTER.format(prob);
msg.setMessage(errText);
}
catch (IllegalArgumentException e1)
@@ -1164,16 +1156,6 @@ public class Library implements Builder, Cloneable
// TODO Auto-generated catch block
e1.printStackTrace();
}
- catch (IllegalAccessException e1)
- {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
- catch (NoSuchFieldException e1)
- {
- // TODO Auto-generated catch block
- e1.printStackTrace();
- }
messages.add(msg);
try
@@ -1197,8 +1179,30 @@ public class Library implements Builder, Cloneable
}
catch (NoSuchFieldException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ try
+ {
+ logger.log(msg, aClass.getField("warningCode").getInt(null), prob.getSourcePath());
+ }
+ catch (IllegalArgumentException e1)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (SecurityException e1)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (IllegalAccessException e1)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ catch (NoSuchFieldException e1)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
}
}