Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-07-26 05:51:47 +0000
committerEike Stepper2012-07-26 05:51:47 +0000
commit1734aeaae08c9204fbbae064afc075aec07a8a6c (patch)
tree05262d3bf5988d6df7363939f51120c4e09b9177 /plugins/org.eclipse.emf.cdo.releng.version
parente224e60cc286e109e06a375c550f9a94406d88e0 (diff)
downloadcdo-1734aeaae08c9204fbbae064afc075aec07a8a6c.tar.gz
cdo-1734aeaae08c9204fbbae064afc075aec07a8a6c.tar.xz
cdo-1734aeaae08c9204fbbae064afc075aec07a8a6c.zip
Fix encoding
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.releng.version')
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Markers.java17
1 files changed, 15 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Markers.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Markers.java
index 0e76c650df..dadc1d4f3b 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Markers.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/version/Markers.java
@@ -32,7 +32,7 @@ public final class Markers
public static final String QUICK_FIX_PATTERN = "quickFixPattern";
- public static final String QUICK_FIX_REPLACEMENT = "quickReplacement";
+ public static final String QUICK_FIX_REPLACEMENT = "quickReplacement";
private static final Pattern NL_PATTERN = Pattern.compile("([\\n][\\r]?|[\\r][\\n]?)", Pattern.MULTILINE);
@@ -40,6 +40,19 @@ public final class Markers
{
}
+ public static boolean hasQuickFixes(IMarker marker)
+ {
+ try
+ {
+ return marker.getAttribute(QUICK_FIX_PATTERN) != null;
+ }
+ catch (CoreException ex)
+ {
+ Activator.log(ex);
+ return false;
+ }
+ }
+
public static IMarker addMarker(IResource resource, String message) throws CoreException
{
return addMarker(resource, message, IMarker.SEVERITY_ERROR);
@@ -93,7 +106,7 @@ public final class Markers
try
{
contents = file.getContents();
- BufferedReader reader = new BufferedReader(new InputStreamReader(contents));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(contents, file.getCharset()));
CharArrayWriter caw = new CharArrayWriter();
int c;

Back to the top