changed all occurrences of 'Color.BLACK' to 'Color.black', since the former causes a runtime error on Mac OS X (for Java 1.3.1 at least). not sure why this is, but may be related to the bug mentioned at http://www.oxygenxml.com/forum/viewtopic.php?p=239
This commit is contained in:
parent
afd3a95a21
commit
a39d5c2ba3
2 changed files with 11 additions and 11 deletions
|
@ -164,7 +164,7 @@ public class TibetanDocument extends DefaultStyledDocument {
|
|||
* @see #setTibetanFontSize(int size)
|
||||
*/
|
||||
public void appendDuff(int offset, String s, MutableAttributeSet attr) {
|
||||
appendDuff(tibetanFontSize, offset, s, attr, Color.BLACK);
|
||||
appendDuff(tibetanFontSize, offset, s, attr, Color.black);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -223,7 +223,7 @@ public class TibetanDocument extends DefaultStyledDocument {
|
|||
}
|
||||
|
||||
public int insertDuff(int pos, DuffData[] glyphs) {
|
||||
return insertDuff(tibetanFontSize, pos, glyphs, true, Color.BLACK);
|
||||
return insertDuff(tibetanFontSize, pos, glyphs, true, Color.black);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -307,7 +307,7 @@ public class TibetanDocument extends DefaultStyledDocument {
|
|||
|
||||
|
||||
private int insertDuff(int fontSize, int pos, DuffData[] glyphs, boolean asTMW) {
|
||||
return insertDuff(fontSize, pos, glyphs, asTMW, Color.BLACK);
|
||||
return insertDuff(fontSize, pos, glyphs, asTMW, Color.black);
|
||||
}
|
||||
private int insertDuff(int fontSize, int pos, DuffData[] glyphs, boolean asTMW, Color color) {
|
||||
if (glyphs == null)
|
||||
|
|
|
@ -339,8 +339,8 @@ public class ACIPConverter {
|
|||
= new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
|
||||
boolean lastGuyWasNonPunct = false;
|
||||
TStackList lastGuy = null;
|
||||
Color lastColor = Color.BLACK;
|
||||
Color color = Color.BLACK;
|
||||
Color lastColor = Color.black;
|
||||
Color color = Color.black;
|
||||
boolean outputCurlyBracketsAroundFolioMarkers
|
||||
= ThdlOptions.getBooleanOption("thdl.acip.to.x.output.curly.brackets.around.folio.markers");
|
||||
|
||||
|
@ -377,7 +377,7 @@ public class ACIPConverter {
|
|||
} else {
|
||||
tdoc.appendDuffCode(tdocLocation[0]++,
|
||||
TibetanMachineWeb.getGlyph(wylie),
|
||||
Color.BLACK);
|
||||
Color.black);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
@ -413,7 +413,7 @@ public class ACIPConverter {
|
|||
&& stype == TString.FOLIO_MARKER) ? "}" : ""));
|
||||
if (null != writer) writer.write(text);
|
||||
if (null != tdoc) {
|
||||
tdoc.appendRoman(tdocLocation[0], text, Color.BLACK);
|
||||
tdoc.appendRoman(tdocLocation[0], text, Color.black);
|
||||
tdocLocation[0] += text.length();
|
||||
}
|
||||
} else {
|
||||
|
@ -560,7 +560,7 @@ public class ACIPConverter {
|
|||
if (colors && sl.isLegalTshegBar(true).isLegal && !sl.isLegalTshegBar(false).isLegal) {
|
||||
color = Color.YELLOW;
|
||||
} else if (colors && (bt = sl.isLegalTshegBar(false)).isLegal && !bt.isLegalButSanskrit()) {
|
||||
color = Color.BLACK;
|
||||
color = Color.black;
|
||||
} else {
|
||||
// Sanskrit.
|
||||
|
||||
|
@ -581,7 +581,7 @@ public class ACIPConverter {
|
|||
}
|
||||
}
|
||||
} else {
|
||||
color = Color.BLACK;
|
||||
color = Color.black;
|
||||
if (stype == TString.START_SLASH) {
|
||||
if (null != writer) unicode = "\u0F3C";
|
||||
if (null != tdoc) duff = new Object[] { TibetanMachineWeb.getGlyph("(") };
|
||||
|
@ -626,7 +626,7 @@ public class ACIPConverter {
|
|||
DuffCode spaceDuff = TibetanMachineWeb.getGlyph("_");
|
||||
if (null == spaceDuff) throw new Error("whitespace duff");
|
||||
tdoc.appendDuffCode(tdocLocation[0]++,
|
||||
spaceDuff, Color.BLACK);
|
||||
spaceDuff, Color.black);
|
||||
continue; // FIXME: if null != writer, output was just dropped.
|
||||
}
|
||||
}
|
||||
|
@ -657,7 +657,7 @@ public class ACIPConverter {
|
|||
|| s.getText().equals("\n")
|
||||
|| s.getText().equals("\r\n")) {
|
||||
tdoc.appendRoman(tdocLocation[0], s.getText(),
|
||||
Color.BLACK);
|
||||
Color.black);
|
||||
tdocLocation[0] += s.getText().length();
|
||||
continue; // FIXME: this means the unicode above doesn't go into the output if null != writer && null != tdoc?
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue