thdltools/Jskad
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
eg3p 2004-08-19 14:59:06 +00:00
parent afd3a95a21
commit a39d5c2ba3
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/org/thdl/tib/text/TibetanDocument.java
View file

@ -164,7 +164,7 @@ public class TibetanDocument extends DefaultStyledDocument {
* @see #setTibetanFontSize(int size) * @see #setTibetanFontSize(int size)
*/ */
public void appendDuff(int offset, String s, MutableAttributeSet attr) { 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) { 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) { 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) { private int insertDuff(int fontSize, int pos, DuffData[] glyphs, boolean asTMW, Color color) {
if (glyphs == null) if (glyphs == null)

16
source/org/thdl/tib/text/ttt/ACIPConverter.java
View file

@ -339,8 +339,8 @@ public class ACIPConverter {
= new BufferedWriter(new OutputStreamWriter(out, "UTF-8")); = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
boolean lastGuyWasNonPunct = false; boolean lastGuyWasNonPunct = false;
TStackList lastGuy = null; TStackList lastGuy = null;
Color lastColor = Color.BLACK; Color lastColor = Color.black;
Color color = Color.BLACK; Color color = Color.black;
boolean outputCurlyBracketsAroundFolioMarkers boolean outputCurlyBracketsAroundFolioMarkers
= ThdlOptions.getBooleanOption("thdl.acip.to.x.output.curly.brackets.around.folio.markers"); = ThdlOptions.getBooleanOption("thdl.acip.to.x.output.curly.brackets.around.folio.markers");
@ -377,7 +377,7 @@ public class ACIPConverter {
} else { } else {
tdoc.appendDuffCode(tdocLocation[0]++, tdoc.appendDuffCode(tdocLocation[0]++,
TibetanMachineWeb.getGlyph(wylie), TibetanMachineWeb.getGlyph(wylie),
Color.BLACK); Color.black);
} }
} }
} else { } else {
@ -413,7 +413,7 @@ public class ACIPConverter {
&& stype == TString.FOLIO_MARKER) ? "}" : "")); && stype == TString.FOLIO_MARKER) ? "}" : ""));
if (null != writer) writer.write(text); if (null != writer) writer.write(text);
if (null != tdoc) { if (null != tdoc) {
tdoc.appendRoman(tdocLocation[0], text, Color.BLACK); tdoc.appendRoman(tdocLocation[0], text, Color.black);
tdocLocation[0] += text.length(); tdocLocation[0] += text.length();
} }
} else { } else {
@ -560,7 +560,7 @@ public class ACIPConverter {
if (colors && sl.isLegalTshegBar(true).isLegal && !sl.isLegalTshegBar(false).isLegal) { if (colors && sl.isLegalTshegBar(true).isLegal && !sl.isLegalTshegBar(false).isLegal) {
color = Color.YELLOW; color = Color.YELLOW;
} else if (colors && (bt = sl.isLegalTshegBar(false)).isLegal && !bt.isLegalButSanskrit()) { } else if (colors && (bt = sl.isLegalTshegBar(false)).isLegal && !bt.isLegalButSanskrit()) {
color = Color.BLACK; color = Color.black;
} else { } else {
// Sanskrit. // Sanskrit.
@ -581,7 +581,7 @@ public class ACIPConverter {
} }
} }
} else { } else {
color = Color.BLACK; color = Color.black;
if (stype == TString.START_SLASH) { if (stype == TString.START_SLASH) {
if (null != writer) unicode = "\u0F3C"; if (null != writer) unicode = "\u0F3C";
if (null != tdoc) duff = new Object[] { TibetanMachineWeb.getGlyph("(") }; if (null != tdoc) duff = new Object[] { TibetanMachineWeb.getGlyph("(") };
@ -626,7 +626,7 @@ public class ACIPConverter {
DuffCode spaceDuff = TibetanMachineWeb.getGlyph("_"); DuffCode spaceDuff = TibetanMachineWeb.getGlyph("_");
if (null == spaceDuff) throw new Error("whitespace duff"); if (null == spaceDuff) throw new Error("whitespace duff");
tdoc.appendDuffCode(tdocLocation[0]++, tdoc.appendDuffCode(tdocLocation[0]++,
spaceDuff, Color.BLACK); spaceDuff, Color.black);
continue; // FIXME: if null != writer, output was just dropped. continue; // FIXME: if null != writer, output was just dropped.
} }
} }
@ -657,7 +657,7 @@ public class ACIPConverter {
|| s.getText().equals("\n") || s.getText().equals("\n")
|| s.getText().equals("\r\n")) { || s.getText().equals("\r\n")) {
tdoc.appendRoman(tdocLocation[0], s.getText(), tdoc.appendRoman(tdocLocation[0], s.getText(),
Color.BLACK); Color.black);
tdocLocation[0] += s.getText().length(); tdocLocation[0] += s.getText().length();
continue; // FIXME: this means the unicode above doesn't go into the output if null != writer && null != tdoc? continue; // FIXME: this means the unicode above doesn't go into the output if null != writer && null != tdoc?
} else { } else {