Revision: 18886
http://jedit.svn.sourceforge.net/jedit/?rev=18886&view=rev
Author: ezust
Date: 2010-10-29 22:46:46 +0000 (Fri, 29 Oct 2010)
Log Message:
-----------
Got rid of java 1.5 conditional code in chunk.java (we're always using 1.5 now).
Modified Paths:
--------------
jEdit/branches/4.4.x/org/gjt/sp/jedit/syntax/Chunk.java
Modified: jEdit/branches/4.4.x/org/gjt/sp/jedit/syntax/Chunk.java
===================================================================
--- jEdit/branches/4.4.x/org/gjt/sp/jedit/syntax/Chunk.java 2010-10-29 15:08:38 UTC (rev 18885)
+++ jEdit/branches/4.4.x/org/gjt/sp/jedit/syntax/Chunk.java 2010-10-29 22:46:46 UTC (rev 18886)
@@ -369,7 +369,6 @@
int textStart = seg.offset + offset;
// {{{ Workaround for a bug in Sun Java 5
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6266084
- if (SUN_JAVA_5)
{
// textLimit is used as a text count in
// layoutGlyphVector(). So it works only the
@@ -379,7 +378,7 @@
copy, 0, length);
textArray = copy;
textStart = 0;
- } //}}}
+ } // }}}
width = layoutGlyphs(fontRenderContext,
textArray,
textStart,
@@ -400,28 +399,6 @@
private static Font[] preferredFonts;
private static Font[] fontSubstList;
- // Flag to enable a workaround for a bug in most known implementations of Java 5.
- private static final boolean SUN_JAVA_5;
- static
- {
- boolean sun_java_5 = false;
- String vendor = System.getProperty("java.vendor");
- // Enable the workaround on Apple and IBM JVM, too,
- // because the same problem was reported on them.
- if (vendor != null &&
- (vendor.startsWith("Sun") ||
- vendor.startsWith("Apple") ||
- vendor.startsWith("IBM")))
- {
- String version = System.getProperty("java.version");
- if (version != null && version.startsWith("1.5"))
- {
- sun_java_5 = true;
- }
- }
- SUN_JAVA_5 = sun_java_5;
- }
-
//{{{ getFonts() method
/**
* Returns a list of fonts to be searched when applying font
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
