summaryrefslogtreecommitdiff
path: root/qadevOOo/runner/graphical
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-04 13:49:16 +0200
committerNoel Grandin <noel@peralex.com>2014-08-04 14:50:58 +0200
commit66c34ff3e7cb940536b7257033c097491862d04f (patch)
tree2a4dd2b90cdd52f76b239af22c315bfce868beb6 /qadevOOo/runner/graphical
parentd352735a7f2f74d3524adaa2f4d8cff61f60c5c6 (diff)
java: remove workarounds for missing functionality pre java 1.5
Since we now require java 1.5 Change-Id: I9e195f77c81bd9447f8e29c1862c68a57846c8a3
Diffstat (limited to 'qadevOOo/runner/graphical')
-rw-r--r--qadevOOo/runner/graphical/JPEGComparator.java2
-rw-r--r--qadevOOo/runner/graphical/JPEGCreator.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/qadevOOo/runner/graphical/JPEGComparator.java b/qadevOOo/runner/graphical/JPEGComparator.java
index d7a2bc3cd0d6..a3a886975298 100644
--- a/qadevOOo/runner/graphical/JPEGComparator.java
+++ b/qadevOOo/runner/graphical/JPEGComparator.java
@@ -344,7 +344,7 @@ public class JPEGComparator extends EnhancedComplexTestCase
}
else
{
- String sResultFilenamePDF = util.utils.replaceAll13(sResultFilename, ".ps_", ".pdf_");
+ String sResultFilenamePDF = sResultFilename.replace(".ps_", ".pdf_");
File aResultPDFFile = new File(sResultFilenamePDF);
if (aResultPDFFile.exists())
{
diff --git a/qadevOOo/runner/graphical/JPEGCreator.java b/qadevOOo/runner/graphical/JPEGCreator.java
index cb3ee7f34cc7..6a53bca2d16b 100644
--- a/qadevOOo/runner/graphical/JPEGCreator.java
+++ b/qadevOOo/runner/graphical/JPEGCreator.java
@@ -131,7 +131,7 @@ public static void convertToNearSameFileWithWidth340(String _sJPEGFilename)
}
String sJPEGFilename = _sJPEGFilename.replaceAll("\\\\", "/");
String sNewJPEGFilename;
- sNewJPEGFilename = util.utils.replaceAll13(sJPEGFilename, ".jpg", "_w340.jpg");
+ sNewJPEGFilename = sJPEGFilename.replace(".jpg", "_w340.jpg");
convertToWidth340(sJPEGFilename, sNewJPEGFilename);
}
@@ -333,7 +333,7 @@ private static void convertToWidth340(String _sFrom, String _To)
{
return "";
}
- final String sFilename = util.utils.replaceAll13(_sJPEGSchema, m_sGS_PageOutput, StringHelper.createValueString(_nPage, 4));
+ final String sFilename = _sJPEGSchema.replace(m_sGS_PageOutput, StringHelper.createValueString(_nPage, 4));
return sFilename;
}