Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java Tue Oct 31 00:05:44 2006
@@ -347,65 +347,65 @@
* strings in language_country format we have to add manually just
* language strings that Java locale support with LCID values (0x04**).
*/
- ht.put(new String("ar"), new Short((short)0x0401)); // ar-dz
- ht.put(new String("bg"), new Short((short)0x0402));
- ht.put(new String("ca"), new Short((short)0x0403));
- ht.put(new String("zh"), new Short((short)0x0404)); // zh-tw
- ht.put(new String("cs"), new Short((short)0x0405));
- ht.put(new String("da"), new Short((short)0x0406));
- ht.put(new String("de"), new Short((short)0x0407)); // de-de
- ht.put(new String("el"), new Short((short)0x0408));
- ht.put(new String("fi"), new Short((short)0x040b));
- ht.put(new String("fr"), new Short((short)0x040c)); // fr-fr
- ht.put(new String("iw"), new Short((short)0x040d)); // "he"
- ht.put(new String("hu"), new Short((short)0x040e));
- ht.put(new String("is"), new Short((short)0x040f));
- ht.put(new String("it"), new Short((short)0x0410)); // it-it
- ht.put(new String("ja"), new Short((short)0x0411));
- ht.put(new String("ko"), new Short((short)0x0412));
- ht.put(new String("nl"), new Short((short)0x0413)); // nl-nl
- ht.put(new String("no"), new Short((short)0x0414)); // no_no
- ht.put(new String("pl"), new Short((short)0x0415));
- ht.put(new String("pt"), new Short((short)0x0416)); // pt-br
- ht.put(new String("rm"), new Short((short)0x0417));
- ht.put(new String("ro"), new Short((short)0x0418));
- ht.put(new String("ru"), new Short((short)0x0419));
- ht.put(new String("hr"), new Short((short)0x041a));
- ht.put(new String("sk"), new Short((short)0x041b));
- ht.put(new String("sq"), new Short((short)0x041c));
- ht.put(new String("sv"), new Short((short)0x041d)); // sv-se
- ht.put(new String("th"), new Short((short)0x041e));
- ht.put(new String("tr"), new Short((short)0x041f));
- ht.put(new String("ur"), new Short((short)0x0420));
- ht.put(new String("in"), new Short((short)0x0421)); // "id"
- ht.put(new String("uk"), new Short((short)0x0422));
- ht.put(new String("be"), new Short((short)0x0423));
- ht.put(new String("sl"), new Short((short)0x0424));
- ht.put(new String("et"), new Short((short)0x0425));
- ht.put(new String("lv"), new Short((short)0x0426));
- ht.put(new String("lt"), new Short((short)0x0427));
- ht.put(new String("fa"), new Short((short)0x0429));
- ht.put(new String("vi"), new Short((short)0x042a));
- ht.put(new String("hy"), new Short((short)0x042b));
- ht.put(new String("eu"), new Short((short)0x042d));
- ht.put(new String("sb"), new Short((short)0x042e));
- ht.put(new String("mk"), new Short((short)0x042f));
- ht.put(new String("sx"), new Short((short)0x0430));
- ht.put(new String("ts"), new Short((short)0x0431));
- ht.put(new String("tn"), new Short((short)0x0432));
- ht.put(new String("xh"), new Short((short)0x0434));
- ht.put(new String("zu"), new Short((short)0x0435));
- ht.put(new String("af"), new Short((short)0x0436));
- ht.put(new String("fo"), new Short((short)0x0438));
- ht.put(new String("hi"), new Short((short)0x0439));
- ht.put(new String("mt"), new Short((short)0x043a));
- ht.put(new String("gd"), new Short((short)0x043c));
- ht.put(new String("yi"), new Short((short)0x043d));
- ht.put(new String("sw"), new Short((short)0x0441));
- ht.put(new String("tt"), new Short((short)0x0444));
- ht.put(new String("ta"), new Short((short)0x0449));
- ht.put(new String("mr"), new Short((short)0x044e));
- ht.put(new String("sa"), new Short((short)0x044f));
+ ht.put(new String("ar"), new Short((short)0x0401)); // ar-dz //$NON-NLS-1$
+ ht.put(new String("bg"), new Short((short)0x0402)); //$NON-NLS-1$
+ ht.put(new String("ca"), new Short((short)0x0403)); //$NON-NLS-1$
+ ht.put(new String("zh"), new Short((short)0x0404)); // zh-tw //$NON-NLS-1$
+ ht.put(new String("cs"), new Short((short)0x0405)); //$NON-NLS-1$
+ ht.put(new String("da"), new Short((short)0x0406)); //$NON-NLS-1$
+ ht.put(new String("de"), new Short((short)0x0407)); // de-de //$NON-NLS-1$
+ ht.put(new String("el"), new Short((short)0x0408)); //$NON-NLS-1$
+ ht.put(new String("fi"), new Short((short)0x040b)); //$NON-NLS-1$
+ ht.put(new String("fr"), new Short((short)0x040c)); // fr-fr //$NON-NLS-1$
+ ht.put(new String("iw"), new Short((short)0x040d)); // "he" //$NON-NLS-1$
+ ht.put(new String("hu"), new Short((short)0x040e)); //$NON-NLS-1$
+ ht.put(new String("is"), new Short((short)0x040f)); //$NON-NLS-1$
+ ht.put(new String("it"), new Short((short)0x0410)); // it-it //$NON-NLS-1$
+ ht.put(new String("ja"), new Short((short)0x0411)); //$NON-NLS-1$
+ ht.put(new String("ko"), new Short((short)0x0412)); //$NON-NLS-1$
+ ht.put(new String("nl"), new Short((short)0x0413)); // nl-nl //$NON-NLS-1$
+ ht.put(new String("no"), new Short((short)0x0414)); // no_no //$NON-NLS-1$
+ ht.put(new String("pl"), new Short((short)0x0415)); //$NON-NLS-1$
+ ht.put(new String("pt"), new Short((short)0x0416)); // pt-br //$NON-NLS-1$
+ ht.put(new String("rm"), new Short((short)0x0417)); //$NON-NLS-1$
+ ht.put(new String("ro"), new Short((short)0x0418)); //$NON-NLS-1$
+ ht.put(new String("ru"), new Short((short)0x0419)); //$NON-NLS-1$
+ ht.put(new String("hr"), new Short((short)0x041a)); //$NON-NLS-1$
+ ht.put(new String("sk"), new Short((short)0x041b)); //$NON-NLS-1$
+ ht.put(new String("sq"), new Short((short)0x041c)); //$NON-NLS-1$
+ ht.put(new String("sv"), new Short((short)0x041d)); // sv-se //$NON-NLS-1$
+ ht.put(new String("th"), new Short((short)0x041e)); //$NON-NLS-1$
+ ht.put(new String("tr"), new Short((short)0x041f)); //$NON-NLS-1$
+ ht.put(new String("ur"), new Short((short)0x0420)); //$NON-NLS-1$
+ ht.put(new String("in"), new Short((short)0x0421)); // "id" //$NON-NLS-1$
+ ht.put(new String("uk"), new Short((short)0x0422)); //$NON-NLS-1$
+ ht.put(new String("be"), new Short((short)0x0423)); //$NON-NLS-1$
+ ht.put(new String("sl"), new Short((short)0x0424)); //$NON-NLS-1$
+ ht.put(new String("et"), new Short((short)0x0425)); //$NON-NLS-1$
+ ht.put(new String("lv"), new Short((short)0x0426)); //$NON-NLS-1$
+ ht.put(new String("lt"), new Short((short)0x0427)); //$NON-NLS-1$
+ ht.put(new String("fa"), new Short((short)0x0429)); //$NON-NLS-1$
+ ht.put(new String("vi"), new Short((short)0x042a)); //$NON-NLS-1$
+ ht.put(new String("hy"), new Short((short)0x042b)); //$NON-NLS-1$
+ ht.put(new String("eu"), new Short((short)0x042d)); //$NON-NLS-1$
+ ht.put(new String("sb"), new Short((short)0x042e)); //$NON-NLS-1$
+ ht.put(new String("mk"), new Short((short)0x042f)); //$NON-NLS-1$
+ ht.put(new String("sx"), new Short((short)0x0430)); //$NON-NLS-1$
+ ht.put(new String("ts"), new Short((short)0x0431)); //$NON-NLS-1$
+ ht.put(new String("tn"), new Short((short)0x0432)); //$NON-NLS-1$
+ ht.put(new String("xh"), new Short((short)0x0434)); //$NON-NLS-1$
+ ht.put(new String("zu"), new Short((short)0x0435)); //$NON-NLS-1$
+ ht.put(new String("af"), new Short((short)0x0436)); //$NON-NLS-1$
+ ht.put(new String("fo"), new Short((short)0x0438)); //$NON-NLS-1$
+ ht.put(new String("hi"), new Short((short)0x0439)); //$NON-NLS-1$
+ ht.put(new String("mt"), new Short((short)0x043a)); //$NON-NLS-1$
+ ht.put(new String("gd"), new Short((short)0x043c)); //$NON-NLS-1$
+ ht.put(new String("yi"), new Short((short)0x043d)); //$NON-NLS-1$
+ ht.put(new String("sw"), new Short((short)0x0441)); //$NON-NLS-1$
+ ht.put(new String("tt"), new Short((short)0x0444)); //$NON-NLS-1$
+ ht.put(new String("ta"), new Short((short)0x0449)); //$NON-NLS-1$
+ ht.put(new String("mr"), new Short((short)0x044e)); //$NON-NLS-1$
+ ht.put(new String("sa"), new Short((short)0x044f)); //$NON-NLS-1$
}
}
@@ -528,7 +528,7 @@
AccessController.doPrivileged(
new PrivilegedAction<Void>() {
public Void run() {
- System.loadLibrary("fontlib");
+ System.loadLibrary("fontlib"); //$NON-NLS-1$
return null;
}
} );
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java Tue Oct 31 00:05:44 2006
@@ -47,11 +47,11 @@
/** Available windows charset names */
public static final String[] WINDOWS_CHARSET_NAMES = {
- "ANSI_CHARSET", "DEFAULT_CHARSET", "SYMBOL_CHARSET", "SHIFTJIS_CHARSET",
- "GB2312_CHARSET", "HANGEUL_CHARSET", "CHINESEBIG5_CHARSET",
- "OEM_CHARSET", "JOHAB_CHARSET", "HEBREW_CHARSET", "ARABIC_CHARSET",
- "GREEK_CHARSET", "TURKISH_CHARSET", "VIETNAMESE_CHARSET", "THAI_CHARSET",
- "EASTEUROPE_CHARSET", "RUSSIAN_CHARSET", "MAC_CHARSET", "BALTIC_CHARSET"
+ "ANSI_CHARSET", "DEFAULT_CHARSET", "SYMBOL_CHARSET", "SHIFTJIS_CHARSET", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "GB2312_CHARSET", "HANGEUL_CHARSET", "CHINESEBIG5_CHARSET", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "OEM_CHARSET", "JOHAB_CHARSET", "HEBREW_CHARSET", "ARABIC_CHARSET", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "GREEK_CHARSET", "TURKISH_CHARSET", "VIETNAMESE_CHARSET", "THAI_CHARSET", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "EASTEUROPE_CHARSET", "RUSSIAN_CHARSET", "MAC_CHARSET", "BALTIC_CHARSET" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
};
/** WinFontManager singleton instance */
@@ -97,40 +97,40 @@
while(moreEntries){
// Component Font Mappings property name
- String property = FONT_MAPPING_KEYS[0].replaceAll("LogicalFontName", element).replaceAll("StyleName", STYLE_NAMES[j]).replaceAll("ComponentIndex", String.valueOf(numComp));
+ String property = FONT_MAPPING_KEYS[0].replaceAll("LogicalFontName", element).replaceAll("StyleName", STYLE_NAMES[j]).replaceAll("ComponentIndex", String.valueOf(numComp)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
value = props.getProperty(property);
// If the StyleName is omitted, it's assumed to be plain
if ((j == 0) && (value == null)){
- property = FONT_MAPPING_KEYS[1].replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp));
+ property = FONT_MAPPING_KEYS[1].replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp)); //$NON-NLS-1$ //$NON-NLS-2$
value = props.getProperty(property);
}
if (value != null){
- String fontName = value.substring(0, value.indexOf(","));
- int ind = fontName.lastIndexOf("Bold");
+ String fontName = value.substring(0, value.indexOf(",")); //$NON-NLS-1$
+ int ind = fontName.lastIndexOf("Bold"); //$NON-NLS-1$
if (ind != -1){
fontName = fontName.substring(0, ind-1);
} else {
- ind = fontName.lastIndexOf("Italic");
+ ind = fontName.lastIndexOf("Italic"); //$NON-NLS-1$
if(ind != -1){
fontName = fontName.substring(0, ind-1);
}
}
- String charset = value.substring(value.indexOf(",") + 1, value.length());
+ String charset = value.substring(value.indexOf(",") + 1, value.length()); //$NON-NLS-1$
// Font File Names property value
- String fileName = props.getProperty(FONT_FILE_NAME.replaceAll("PlatformFontName", fontName).replaceAll(" ", "_"));
+ String fileName = props.getProperty(FONT_FILE_NAME.replaceAll("PlatformFontName", fontName).replaceAll(" ", "_")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
// Exclusion Ranges property value
- String exclString = props.getProperty(EXCLUSION_RANGES.replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp)));
+ String exclString = props.getProperty(EXCLUSION_RANGES.replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp))); //$NON-NLS-1$ //$NON-NLS-2$
int[] exclRange = parseIntervals(exclString);
// Component Font Character Encodings property value
- String encoding = props.getProperty(FONT_CHARACTER_ENCODING.replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp)));
+ String encoding = props.getProperty(FONT_CHARACTER_ENCODING.replaceAll("LogicalFontName", element).replaceAll("ComponentIndex", String.valueOf(numComp))); //$NON-NLS-1$ //$NON-NLS-2$
FontProperty fp = new WinFontProperty(fileName, fontName, charset, j, exclRange, encoding);
propsVector.add(fp);
@@ -139,7 +139,7 @@
moreEntries = false;
}
}
- fProperties.put(element + "." + j, propsVector);
+ fProperties.put(element + "." + j, propsVector); //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontProperty.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontProperty.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontProperty.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontProperty.java Tue Oct 31 00:05:44 2006
@@ -46,12 +46,12 @@
@Override
public String toString(){
return this.getClass().getName() +
- "[name=" + this.name +
- ",fileName="+ this.fileName +
- ",style=" + this.style +
- ",Charset=" + this.charset +
- ",exclRange=" + this.exclRange +
- ",encoding=" + this.encoding + "]";
+ "[name=" + this.name + //$NON-NLS-1$
+ ",fileName="+ this.fileName + //$NON-NLS-1$
+ ",style=" + this.style + //$NON-NLS-1$
+ ",Charset=" + this.charset + //$NON-NLS-1$
+ ",exclRange=" + this.exclRange + //$NON-NLS-1$
+ ",encoding=" + this.encoding + "]"; //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java Tue Oct 31 00:05:44 2006
@@ -36,6 +36,7 @@
import org.apache.harmony.awt.gl.font.FontPeerImpl;
import org.apache.harmony.awt.gl.font.Glyph;
import org.apache.harmony.awt.gl.font.LineMetricsImpl;
+import org.apache.harmony.awt.internal.nls.Messages;
/**
* Windows platform font peer implementation based on GDI font object.
@@ -106,8 +107,8 @@
public void addGlyphs(char uFirst, char uLast) {
char index = uFirst;
if (uLast < uFirst) {
- throw new IllegalArgumentException(
- "min range bound value is grater than max range bound");
+ // awt.09=min range bound value is grater than max range bound
+ throw new IllegalArgumentException(Messages.getString("awt.09")); //$NON-NLS-1$
}
while (index < uLast) {
addGlyph(index);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java Tue Oct 31 00:05:44 2006
@@ -36,6 +36,7 @@
import org.apache.harmony.awt.gl.XORComposite;
import org.apache.harmony.awt.gl.render.Blitter;
import org.apache.harmony.awt.gl.render.JavaBlitter;
+import org.apache.harmony.awt.internal.nls.Messages;
public class GDIBlitter implements Blitter {
@@ -141,8 +142,9 @@
matrix, clipRects, numVertex);
}
}else{
- throw new IllegalArgumentException("Unknown Composite type - " +
- comp.getClass());
+ // awt.17=Unknown Composite type : {0}
+ throw new IllegalArgumentException(Messages.getString("awt.17", //$NON-NLS-1$
+ comp.getClass()));
}
}else{
BufferedImage bi;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java Tue Oct 31 00:05:44 2006
@@ -33,6 +33,7 @@
import org.apache.harmony.awt.gl.font.Glyph;
import org.apache.harmony.awt.gl.font.NativeFont;
import org.apache.harmony.awt.gl.font.WindowsFont;
+import org.apache.harmony.awt.internal.nls.Messages;
/**
@@ -47,11 +48,11 @@
// GDI Pen object handle
long curPen;
- // curPen's �olor
+ // curPen's color
int curPenColor;
// Print debug output or not
- protected static final boolean debugOutput = "1".equals(System.getProperty("g2d.debug"));
+ protected static final boolean debugOutput = "1".equals(System.getProperty("g2d.debug")); //$NON-NLS-1$ //$NON-NLS-2$
public static final GDIPTextRenderer inst = new GDIPTextRenderer();
@@ -153,8 +154,8 @@
NativeFont.DriverStringOptionsCmapLookup,
fontMatrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
count = 0;
@@ -174,8 +175,8 @@
NativeFont.DriverStringOptionsCmapLookup,
matrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
@@ -191,8 +192,8 @@
NativeFont.DriverStringOptionsCmapLookup,
fontMatrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
@@ -224,7 +225,8 @@
}
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " + status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
@@ -295,9 +297,8 @@
NativeFont.DriverStringOptionsCmapLookup,
fontMatrix);
if (status != 0 && debugOutput){
- System.err.println("gdipDrawCompositeGlyphVector: " +
- "GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.03=gdipDrawCompositeGlyphVector: GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.03", status)); //$NON-NLS-1$
}
count = 0;
@@ -326,8 +327,8 @@
NativeFont.DriverStringOptionsCmapLookup,
fontMatrix);
if (status != 0 && debugOutput){
- System.err.println("gdipDrawCompositeGlyphVector: GDIPlus " +
- "DrawDriverString error status = " + status);
+ // awt.err.04=gdipDrawCompositeGlyphVector: GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.04", status)); //$NON-NLS-1$
}
count = 0;
}
@@ -347,8 +348,8 @@
matrix);
if (status != 0 && debugOutput){
- System.err.println("gdipDrawCompositeGlyphVector: GDIPlus " +
- "DrawDriverChar error status = " + status);
+ // awt.err.04=gdipDrawCompositeGlyphVector: GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.04", status)); //$NON-NLS-1$
}
}
@@ -438,8 +439,8 @@
matrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
@@ -502,8 +503,8 @@
matrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
@@ -569,8 +570,8 @@
NativeFont.DriverStringOptionsCmapLookup,
matrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " +
- status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
count = 0;
@@ -594,7 +595,8 @@
NativeFont.DriverStringOptionsCmapLookup,
matrix);
if (status != 0 && debugOutput){
- System.err.println("GDIPlus DrawDriverString error status = " + status);
+ // awt.err.02=GDIPlus DrawDriverString error status = {0}
+ System.err.println(Messages.getString("awt.err.02", status)); //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java Tue Oct 31 00:05:44 2006
@@ -74,7 +74,7 @@
private static final long gdipToken;
static {
- System.loadLibrary("gl");
+ System.loadLibrary("gl"); //$NON-NLS-1$
// GDI+ startup
gdipToken = gdiPlusStartup();
@@ -112,7 +112,7 @@
dstSurf = new GDISurface(gi);
blitter = GDIBlitter.getInstance();
if (debugOutput) {
- System.err.println("WinGDIPGraphics2D("+nw+", "+tx+", "+ty+", "+width+", "+height+")");
+ System.err.println("WinGDIPGraphics2D("+nw+", "+tx+", "+ty+", "+width+", "+height+")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$
}
setTransform(getTransform());
@@ -157,7 +157,7 @@
@Override
public Graphics create() {
if (debugOutput) {
- System.err.println("WinGDIPGraphics2D.create()");
+ System.err.println("WinGDIPGraphics2D.create()"); //$NON-NLS-1$
}
WinGDIPGraphics2D res = null;
@@ -251,7 +251,7 @@
gi = 0;
super.dispose();
if (debugOutput) {
- System.err.println("WinGDIPGraphics2D.dispose()");
+ System.err.println("WinGDIPGraphics2D.dispose()"); //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java Tue Oct 31 00:05:44 2006
@@ -29,6 +29,7 @@
import java.awt.image.DirectColorModel;
import java.awt.image.VolatileImage;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.windows.Win32;
import org.apache.harmony.awt.nativebridge.windows.WindowsDefs;
@@ -146,7 +147,8 @@
public BufferedImage createCompatibleImage(int width, int height, int transparency) {
ColorModel cmt = getColorModel(transparency);
if (cmt == null) {
- throw new IllegalArgumentException("Transparency is not supported.");
+ // awt.18=Transparency is not supported.
+ throw new IllegalArgumentException(Messages.getString("awt.18")); //$NON-NLS-1$
}
return new BufferedImage(cmt, cmt.createCompatibleWritableRaster(width, height), false, null);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java Tue Oct 31 00:05:44 2006
@@ -27,6 +27,7 @@
import java.util.Vector;
import org.apache.harmony.awt.gl.GLGraphicsDevice;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.windows.Win32;
import org.apache.harmony.awt.nativebridge.windows.WindowsDefs;
@@ -66,7 +67,8 @@
Win32.MONITORINFOEXW mi = win32.createMONITORINFOEXW(false);
mi.get_MONITORINFO().set_cbSize(mi.size());
if (win32.GetMonitorInfoW(hmon, mi.shortLockPointer()) == 0) {
- throw new RuntimeException("Can not get monitor info");
+ // awt.15=Can not get monitor info
+ throw new RuntimeException(Messages.getString("awt.15")); //$NON-NLS-1$
}
Win32.RECT rect = mi.get_MONITORINFO().get_rcMonitor();
int x = rect.get_left();
@@ -91,7 +93,8 @@
if (defaultConfig == null) {
long hdc = win32.CreateDCW(null, id, null, null);
if (hdc == 0) {
- throw new RuntimeException("Can not create DC for device");
+ // awt.16=Can not create DC for device
+ throw new RuntimeException(Messages.getString("awt.16")); //$NON-NLS-1$
}
int dci = win32.GetPixelFormat(hdc);
@@ -112,7 +115,8 @@
if (configs == null) {
long hdc = win32.CreateDCW(null, id, null, null);
if (hdc == 0) {
- throw new RuntimeException("Can not create DC for device");
+ // awt.16=Can not create DC for device
+ throw new RuntimeException(Messages.getString("awt.16")); //$NON-NLS-1$
}
// If we created DC why do not ask it about resolution?
@@ -182,12 +186,12 @@
@Override
public String toString() {
- return getClass().getName()+"[Bounds: "+bounds+", ID: "+id+", primary: "+primary+"]";
+ return getClass().getName()+"[Bounds: "+bounds+", ID: "+id+", primary: "+primary+"]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
byte[] getIDBytes() {
if (idBytes == null) {
- idBytes = (id + "\0x00").getBytes();
+ idBytes = (id + "\0x00").getBytes(); //$NON-NLS-1$
}
return idBytes;
@@ -209,7 +213,8 @@
if (resolution == null) {
long hdc = win32.CreateDCW(null, id, null, null);
if (hdc == 0) {
- throw new RuntimeException("Can not create DC for device");
+ // awt.16=Can not create DC for device
+ throw new RuntimeException(Messages.getString("awt.16")); //$NON-NLS-1$
}
if (resolution == null) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsEnvironment.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsEnvironment.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsEnvironment.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsEnvironment.java Tue Oct 31 00:05:44 2006
@@ -36,7 +36,7 @@
WinGraphicsDevice []devices = null;
static {
- System.loadLibrary("gl");
+ System.loadLibrary("gl"); //$NON-NLS-1$
}
public WinGraphicsEnvironment(WindowFactory wf) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java Tue Oct 31 00:05:44 2006
@@ -29,6 +29,7 @@
import org.apache.harmony.awt.gl.GLVolatileImage;
import org.apache.harmony.awt.gl.Surface;
import org.apache.harmony.awt.gl.windows.BitmapSurface;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.wtk.NativeWindow;
@@ -52,7 +53,8 @@
***************************************************************************/
public WinVolatileImage(NativeWindow nw, int width, int height) {
if (width <= 0 || height <= 0) {
- throw new IllegalArgumentException("Illegal size of volatile image.");
+ // awt.19=Illegal size of volatile image.
+ throw new IllegalArgumentException(Messages.getString("awt.19")); //$NON-NLS-1$
}
hwnd = nw.getId();
this.width = width;
@@ -63,7 +65,8 @@
public WinVolatileImage(WinGraphicsConfiguration gc, int width, int height) {
if (width <= 0 || height <= 0) {
- throw new IllegalArgumentException("Illegal size of volatile image.");
+ // awt.19=Illegal size of volatile image.
+ throw new IllegalArgumentException(Messages.getString("awt.19")); //$NON-NLS-1$
}
hwnd = 0;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java Tue Oct 31 00:05:44 2006
@@ -20,6 +20,8 @@
*/
package org.apache.harmony.awt.nativebridge.windows;
+import org.apache.harmony.awt.internal.nls.Messages;
+
public class Callback {
public interface Handler {
@@ -35,7 +37,7 @@
private static Handler handlerDataTransfer;
static {
- System.loadLibrary("Win32Wrapper");
+ System.loadLibrary("Win32Wrapper"); //$NON-NLS-1$
callbackWNDPROC = initCallBackWNDPROC();
callbackOFNHOOKPROC = initCallBackOFNHOOKPROC();
callbackDataTransferProc = initCallBackDataTransferProc();
@@ -43,7 +45,8 @@
public static long registerCallback(Handler h) {
if (handler != null && handler != h) {
- throw new RuntimeException("Attempt to replace WindowProc handler");
+ // awt.1E=Attempt to replace WindowProc handler
+ throw new RuntimeException(Messages.getString("awt.1E")); //$NON-NLS-1$
}
handler = h;
return callbackWNDPROC;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java Tue Oct 31 00:05:44 2006
@@ -37,7 +37,7 @@
}
private Win32() {
- System.loadLibrary("Win32Wrapper");
+ System.loadLibrary("Win32Wrapper"); //$NON-NLS-1$
init();
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java Tue Oct 31 00:05:44 2006
@@ -28,6 +28,7 @@
import org.apache.harmony.awt.datatransfer.RawBitmap;
import org.apache.harmony.awt.datatransfer.windows.WinDragSource;
import org.apache.harmony.awt.datatransfer.windows.WinDropTarget;
+import org.apache.harmony.awt.internal.nls.Messages;
/**
* Native support for data transfer on Windows
@@ -35,7 +36,7 @@
public final class WinDataTransfer {
static {
- System.loadLibrary("Win32Wrapper");
+ System.loadLibrary("Win32Wrapper"); //$NON-NLS-1$
}
/**
@@ -50,8 +51,8 @@
public IDataObject(long p) {
if (p == 0) {
- throw new RuntimeException(
- "Cannot get data from OLE clipboard");
+ // awt.1D=Cannot get data from OLE clipboard
+ throw new RuntimeException(Messages.getString("awt.1D")); //$NON-NLS-1$
}
pointer = p;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinButton.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinButton.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinButton.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinButton.java Tue Oct 31 00:05:44 2006
@@ -39,7 +39,7 @@
WinThemeGraphics wgr = new WinThemeGraphics(g);
if (t.isXpThemeActive()) {
- wgr.setTheme(t.getXpTheme("Button"));
+ wgr.setTheme(t.getXpTheme("Button")); //$NON-NLS-1$
wgr.fillBackground(size, s.getBackground(), false);
wgr.drawXpBackground(size, WindowsConsts.BP_PUSHBUTTON,
getXpState(s));
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinCheckbox.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinCheckbox.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinCheckbox.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinCheckbox.java Tue Oct 31 00:05:44 2006
@@ -51,7 +51,7 @@
wgr.fillBackground(size, s.getBackground(), true);
if (t.isXpThemeActive()) {
- wgr.setTheme(t.getXpTheme("Button"));
+ wgr.setTheme(t.getXpTheme("Button")); //$NON-NLS-1$
wgr.drawXpBackground(bounds, getXpType(s), getXpState(s));
} else {
wgr.drawClassicBackground(bounds, WindowsDefs.DFC_BUTTON,
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinChoice.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinChoice.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinChoice.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinChoice.java Tue Oct 31 00:05:44 2006
@@ -44,11 +44,11 @@
if (t.isXpThemeActive()) {
- wgr.setTheme(t.getXpTheme("Edit"));
+ wgr.setTheme(t.getXpTheme("Edit")); //$NON-NLS-1$
wgr.drawXpBackground(size,
WindowsConsts.EP_EDITTEXT, WindowsConsts.ETS_NORMAL);
- wgr.setTheme(t.getXpTheme("Combobox"));
+ wgr.setTheme(t.getXpTheme("Combobox")); //$NON-NLS-1$
Rectangle r = s.getButtonBounds();
r.grow(1, 1);
wgr.drawXpBackground(r,
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java Tue Oct 31 00:05:44 2006
@@ -32,6 +32,7 @@
import java.util.Map;
import org.apache.harmony.awt.ComponentInternals;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.Int16Pointer;
import org.apache.harmony.awt.nativebridge.NativeBridge;
import org.apache.harmony.awt.nativebridge.PointerPointer;
@@ -79,7 +80,7 @@
File file = new File(fullName);
String fName = file.getName();
boolean res = true;
- if (!"".equals(fName)) {
+ if (!"".equals(fName)) { //$NON-NLS-1$
res = ff.accept(file.getParentFile(), fName);
}
return (res ? 1 : 0);
@@ -180,7 +181,8 @@
}
}
if (error != null) {
- System.err.println("file dialog " + error + " error!");
+ // awt.err.00=file dialog {0} error!
+ System.err.println(Messages.getString("awt.err.00", error )); //$NON-NLS-1$
}
}
@@ -190,7 +192,7 @@
setFile(fileDialog.getFile());
setDir(fileDialog.getDirectory());
setTitle(fileDialog.getTitle());
- setFilter("All Files (*.*)\0*.*\0");
+ setFilter("All Files (*.*)"); //$NON-NLS-1$
ofn.set_Flags(OFN_ENABLEHOOK | OFN_ENABLEINCLUDENOTIFY | OFN_EXPLORER |
OFN_ENABLESIZING);
@@ -221,7 +223,7 @@
private void setDir(String dirName) {
if (dirName == null) {
- dirName = System.getProperty("user.dir");
+ dirName = System.getProperty("user.dir"); //$NON-NLS-1$
}
ofn.set_lpstrInitialDir(nb.createInt16Pointer(dirName, false));
}
@@ -272,31 +274,31 @@
private String getExtendedError(int code) {
switch (code) {
case CDERR_GENERALCODES:
- return "general";
+ return "general"; //$NON-NLS-1$
case CDERR_STRUCTSIZE:
- return "structure size";
+ return "structure size"; //$NON-NLS-1$
case CDERR_INITIALIZATION:
- return "init";
+ return "init"; //$NON-NLS-1$
case CDERR_NOTEMPLATE:
- return "no template";
+ return "no template"; //$NON-NLS-1$
case CDERR_NOHINSTANCE:
- return "no hInstance";
+ return "no hInstance"; //$NON-NLS-1$
case CDERR_LOADSTRFAILURE:
- return "load string failure";
+ return "load string failure"; //$NON-NLS-1$
case CDERR_FINDRESFAILURE:
- return "find resource failure";
+ return "find resource failure"; //$NON-NLS-1$
case CDERR_LOADRESFAILURE:
- return "load resource failure";
+ return "load resource failure"; //$NON-NLS-1$
case CDERR_LOCKRESFAILURE:
- return "lock resource failure";
+ return "lock resource failure"; //$NON-NLS-1$
case CDERR_MEMALLOCFAILURE:
- return "mem alloc failure";
+ return "mem alloc failure"; //$NON-NLS-1$
case CDERR_MEMLOCKFAILURE:
- return "mem lock failure";
+ return "mem lock failure"; //$NON-NLS-1$
case CDERR_NOHOOK:
- return "no hook";
+ return "no hook"; //$NON-NLS-1$
}
- return "unknown";
+ return "unknown"; //$NON-NLS-1$
}
private void postEvent(AWTEvent e) {
@@ -311,7 +313,8 @@
long res = win32.PostMessageW(hwnd, WM_COMMAND, IDCANCEL, 0);
if (res == 0) {
- System.err.println("error:" + win32.GetLastError());
+ // awt.err.01=error: {0}
+ System.err.println(Messages.getString("awt.err.01", win32.GetLastError())); //$NON-NLS-1$
}
return res;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinScrollbar.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinScrollbar.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinScrollbar.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinScrollbar.java Tue Oct 31 00:05:44 2006
@@ -36,7 +36,7 @@
public static void draw(Graphics g, ScrollbarState s, WinTheme t) {
WinThemeGraphics wgr = new WinThemeGraphics(g);
if (t.isXpThemeActive()) {
- wgr.setTheme(t.getXpTheme("Scrollbar"));
+ wgr.setTheme(t.getXpTheme("Scrollbar")); //$NON-NLS-1$
drawXp(wgr, s);
} else {
drawClassic(wgr, s);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTextComponent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTextComponent.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTextComponent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTextComponent.java Tue Oct 31 00:05:44 2006
@@ -43,7 +43,7 @@
if (t.isXpThemeActive()) {
- wgr.setTheme(t.getXpTheme("Edit"));
+ wgr.setTheme(t.getXpTheme("Edit")); //$NON-NLS-1$
int flags = (s.isEnabled() ? WindowsConsts.ETS_NORMAL :
WindowsConsts.ETS_DISABLED);
wgr.drawXpBackground(s.getSize(),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java Tue Oct 31 00:05:44 2006
@@ -194,7 +194,7 @@
@Override
public String toString() {
- return "hwnd=0x" + Long.toHexString(windowId) + ", msg=0x" + Integer.toHexString(msg);
+ return "hwnd=0x" + Long.toHexString(windowId) + ", msg=0x" + Integer.toHexString(msg); //$NON-NLS-1$ //$NON-NLS-2$
}
private void processChar() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java Tue Oct 31 00:05:44 2006
@@ -27,6 +27,7 @@
import java.util.LinkedList;
import java.util.Map;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.Int16Pointer;
import org.apache.harmony.awt.nativebridge.NativeBridge;
import org.apache.harmony.awt.nativebridge.windows.Win32;
@@ -380,13 +381,14 @@
*/
private static long createJavaWindow() {
long hwnd = win32.CreateWindowExW(0,
- WindowProcHandler.windowClassName, "JavaWindow",
+ WindowProcHandler.windowClassName, "JavaWindow", //$NON-NLS-1$
0, 0, 0, 0, 0, 0, 0, 0, null);
int winError = win32.GetLastError();
if (hwnd == 0) {
- throw new InternalError("Failure to create JavaWindow "
- + "GetLastError returned " + winError);
+ // awt.1C=Failure to create JavaWindow GetLastError returned {0}
+ throw new InternalError(Messages.getString("awt.1C", //$NON-NLS-1$
+ winError));
}
return hwnd;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java Tue Oct 31 00:05:44 2006
@@ -259,7 +259,6 @@
Int8Pointer lpBuf = nb.createInt8Pointer(size, false);
win32.ImmGetCompositionStringW(hIMC, WindowsDefs.GCS_COMPATTR,
lpBuf, size);
- System.out.print("attrs:");
processAttributes(size - 2, lpBuf);
}
if ((idx & WindowsDefs.GCS_COMPCLAUSE) != 0) {
@@ -294,30 +293,28 @@
// AttributedCharacterIterator attributes
for (int i=0; i < size; i++) {
byte attr = lpBuf.get(i);
- String strAttr = "";
+ String strAttr = ""; //$NON-NLS-1$
switch(attr) {
case WindowsDefs.ATTR_INPUT:
- strAttr = "INP";
+ strAttr = "INP"; //$NON-NLS-1$
break;
case WindowsDefs.ATTR_INPUT_ERROR:
- strAttr = "IE";
+ strAttr = "IE"; //$NON-NLS-1$
break;
case WindowsDefs.ATTR_TARGET_CONVERTED:
- strAttr = "T_CONV";
+ strAttr = "T_CONV"; //$NON-NLS-1$
break;
case WindowsDefs.ATTR_CONVERTED:
- strAttr = "CONV";
+ strAttr = "CONV"; //$NON-NLS-1$
break;
case WindowsDefs.ATTR_TARGET_NOTCONVERTED:
- strAttr = "T_NCONV";
+ strAttr = "T_NCONV"; //$NON-NLS-1$
break;
case WindowsDefs.ATTR_FIXEDCONVERTED:
- strAttr = "FIX_CONV";
+ strAttr = "FIX_CONV"; //$NON-NLS-1$
break;
}
- System.out.print( strAttr + ",");
}
- System.out.println();
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java Tue Oct 31 00:05:44 2006
@@ -27,6 +27,7 @@
import java.awt.event.KeyEvent;
import java.awt.image.BufferedImage;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.Int32Pointer;
import org.apache.harmony.awt.nativebridge.NativeBridge;
import org.apache.harmony.awt.nativebridge.windows.Win32;
@@ -206,7 +207,8 @@
(vKey >= 0xC1) && (vKey <= 0xDA) || (vKey >= 0xE0) && (vKey <= 0xE1) ||
(vKey >= 0xE3) && (vKey <= 0xE4) || (vKey == 0xE6) ||
(vKey >= 0xE8) && (vKey <= 0xF5)) {
- throw new IllegalArgumentException("Invalid key code");
+ // awt.1B=Invalid key code
+ throw new IllegalArgumentException(Messages.getString("awt.1B")); //$NON-NLS-1$
}
return (byte) vKey;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java Tue Oct 31 00:05:44 2006
@@ -84,38 +84,38 @@
};
private static final String sysColorProps[] = { // color property names
- "win.desktop.backgroundColor", // 0 DESKTOP
- "win.frame.activeCaptionColor", // 1 ACTIVE_CAPTION
- "win.frame.captionTextColor", // 2 ACTIVE_CAPTION_TEXT
- "win.frame.activeBorderColor", // 3 ACTIVE_CAPTION_BORDER
- "win.frame.inactiveCaptionColor", // 4 INACTIVE_CAPTION
- "win.frame.inactiveCaptionTextColor", // 5 INACTIVE_CAPTION_TEXT
- "win.frame.inactiveBorderColor", // 6 INACTIVE_CAPTION_BORDER
- "win.frame.backgroundColor", // 7 WINDOW
- "win.frame.color", //? 8 WINDOW_BORDER
- "win.frame.textColor", // 9 WINDOW_TEXT
- "win.menu.backgroundColor", // 10 MENU
- "win.menu.textColor", // 11 MENU_TEXT
- "win.frame.backgroundColor", // 12 TEXT
- "win.frame.textColor", // 13 TEXT_TEXT
- "win.item.highlightColor", // 14 TEXT_HIGHLIGHT
- "win.item.highlightTextColor", // 15 TEXT_HIGHLIGHT_TEXT
- "win.text.grayedTextColor", // 16 TEXT_INACTIVE_TEXT
- "win.3d.backgroundColor", // 17 CONTROL
- "win.button.textColor", // 18 CONTROL_TEXT
- "win.3d.lightColor", // 19 CONTROL_HIGHLIGHT
- "win.3d.highlightColor", // 20 CONTROL_LT_HIGHLIGHT
- "win.3d.shadowColor", // 21 CONTROL_SHADOW
- "win.3d.darkShadowColor", // 22 CONTROL_DK_SHADOW
- "win.scrollbar.backgroundColor", // 23 SCROLLBAR
- "win.tooltip.backgroundColor", // 24 INFO
- "win.tooltip.textColor", // 25 INFO_TEXT
+ "win.desktop.backgroundColor", // 0 DESKTOP //$NON-NLS-1$
+ "win.frame.activeCaptionColor", // 1 ACTIVE_CAPTION //$NON-NLS-1$
+ "win.frame.captionTextColor", // 2 ACTIVE_CAPTION_TEXT //$NON-NLS-1$
+ "win.frame.activeBorderColor", // 3 ACTIVE_CAPTION_BORDER //$NON-NLS-1$
+ "win.frame.inactiveCaptionColor", // 4 INACTIVE_CAPTION //$NON-NLS-1$
+ "win.frame.inactiveCaptionTextColor", // 5 INACTIVE_CAPTION_TEXT //$NON-NLS-1$
+ "win.frame.inactiveBorderColor", // 6 INACTIVE_CAPTION_BORDER //$NON-NLS-1$
+ "win.frame.backgroundColor", // 7 WINDOW //$NON-NLS-1$
+ "win.frame.color", //? 8 WINDOW_BORDER //$NON-NLS-1$
+ "win.frame.textColor", // 9 WINDOW_TEXT //$NON-NLS-1$
+ "win.menu.backgroundColor", // 10 MENU //$NON-NLS-1$
+ "win.menu.textColor", // 11 MENU_TEXT //$NON-NLS-1$
+ "win.frame.backgroundColor", // 12 TEXT //$NON-NLS-1$
+ "win.frame.textColor", // 13 TEXT_TEXT //$NON-NLS-1$
+ "win.item.highlightColor", // 14 TEXT_HIGHLIGHT //$NON-NLS-1$
+ "win.item.highlightTextColor", // 15 TEXT_HIGHLIGHT_TEXT //$NON-NLS-1$
+ "win.text.grayedTextColor", // 16 TEXT_INACTIVE_TEXT //$NON-NLS-1$
+ "win.3d.backgroundColor", // 17 CONTROL //$NON-NLS-1$
+ "win.button.textColor", // 18 CONTROL_TEXT //$NON-NLS-1$
+ "win.3d.lightColor", // 19 CONTROL_HIGHLIGHT //$NON-NLS-1$
+ "win.3d.highlightColor", // 20 CONTROL_LT_HIGHLIGHT //$NON-NLS-1$
+ "win.3d.shadowColor", // 21 CONTROL_SHADOW //$NON-NLS-1$
+ "win.3d.darkShadowColor", // 22 CONTROL_DK_SHADOW //$NON-NLS-1$
+ "win.scrollbar.backgroundColor", // 23 SCROLLBAR //$NON-NLS-1$
+ "win.tooltip.backgroundColor", // 24 INFO //$NON-NLS-1$
+ "win.tooltip.textColor", // 25 INFO_TEXT //$NON-NLS-1$
// colors not present in SystemColor class:
- "win.frame.activeCaptionGradientColor",
- "win.frame.inactiveCaptionGradientColor",
- "win.item.hotTrackedColor",
- "win.mdi.backgroundColor",
- "win.menubar.backgroundColor",
+ "win.frame.activeCaptionGradientColor", //$NON-NLS-1$
+ "win.frame.inactiveCaptionGradientColor", //$NON-NLS-1$
+ "win.item.hotTrackedColor", //$NON-NLS-1$
+ "win.mdi.backgroundColor", //$NON-NLS-1$
+ "win.menubar.backgroundColor", //$NON-NLS-1$
};
@@ -132,13 +132,13 @@
};
private static final String sysFontDesktopProps[] = { // color property names
- "win.ansiFixed.font", // 0 ANSI_FIXED_FONT
- "win.ansiVar.font", // 1 ANSI_VAR_FONT
- "win.defaultGUI.font", // 2 DEFAULT_GUI_FONT
- "win.deviceDefault.font", // 3 DEVICE_DEFAULT_FONT
- "win.oemFixed.font", // 4 OEM_FIXED_FONT
- "win.system.font", // 5 SYSTEM_FONT
- "win.systemFixed.font", // 6 SYSTEM_FIXED_FONT
+ "win.ansiFixed.font", // 0 ANSI_FIXED_FONT //$NON-NLS-1$
+ "win.ansiVar.font", // 1 ANSI_VAR_FONT //$NON-NLS-1$
+ "win.defaultGUI.font", // 2 DEFAULT_GUI_FONT //$NON-NLS-1$
+ "win.deviceDefault.font", // 3 DEVICE_DEFAULT_FONT //$NON-NLS-1$
+ "win.oemFixed.font", // 4 OEM_FIXED_FONT //$NON-NLS-1$
+ "win.system.font", // 5 SYSTEM_FONT //$NON-NLS-1$
+ "win.systemFixed.font", // 6 SYSTEM_FIXED_FONT //$NON-NLS-1$
};
private class WinPlaySound implements Runnable {
@@ -162,7 +162,7 @@
@Override
public String toString() {
- return ("WinPlaySound(" + sndName + ")");
+ return ("WinPlaySound(" + sndName + ")"); //$NON-NLS-1$ //$NON-NLS-2$
}
};
@@ -225,7 +225,7 @@
synchronized (cacheLock) {
if (defaultFont == null) {
defaultFont = (Font) Toolkit.getDefaultToolkit().
- getDesktopProperty("win.defaultGUI.font");
+ getDesktopProperty("win.defaultGUI.font"); //$NON-NLS-1$
}
return defaultFont;
}
@@ -269,10 +269,10 @@
private void setFontProperty(String propName, Font font, Map<String, Object> props) {
setDesktopProperty(propName, font, props);
- setIntProperty(propName + ".height", font.getSize(), props);
+ setIntProperty(propName + ".height", font.getSize(), props); //$NON-NLS-1$
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("unchecked") //$NON-NLS-1$
public void init(Map<String, ?> deskProps) {
Map<String, Object> desktopProperties = (Map<String, Object>)deskProps;
synchronized (cacheLock) {
@@ -299,9 +299,9 @@
getXPTheme(desktopProperties);
initSoundProps(desktopProperties);
TreeSet<String> keySet = new TreeSet<String>(desktopProperties.keySet());
- keySet.add("awt.dynamicLayoutSupported");
+ keySet.add("awt.dynamicLayoutSupported"); //$NON-NLS-1$
String[] propNames = keySet.toArray(new String[0]);
- desktopProperties.put("win.propNames", propNames);
+ desktopProperties.put("win.propNames", propNames); //$NON-NLS-1$
}
@@ -352,44 +352,44 @@
}
private void getFullWindowDrags(Map<String, Object> props) {
- getBoolSPI("win.frame.fullWindowDragsOn",
+ getBoolSPI("win.frame.fullWindowDragsOn", //$NON-NLS-1$
WindowsDefs.SPI_GETDRAGFULLWINDOWS, props);
}
private void getGradientCaptions(Map<String, Object> props) {
- getBoolSPI("win.frame.captionGradientsOn",
+ getBoolSPI("win.frame.captionGradientsOn", //$NON-NLS-1$
WindowsDefs.SPI_GETGRADIENTCAPTIONS, props);
}
private void getHotTracking(Map<String, Object> props) {
- getBoolSPI("win.item.hotTrackingOn",
+ getBoolSPI("win.item.hotTrackingOn", //$NON-NLS-1$
WindowsDefs.SPI_GETHOTTRACKING, props);
}
private void getKeyboardCues(Map<String, Object> props) {
- getBoolSPI("win.menu.keyboardCuesOn",
+ getBoolSPI("win.menu.keyboardCuesOn", //$NON-NLS-1$
WindowsDefs.SPI_GETKEYBOARDCUES, props);
}
private void getFontSmooth(Map<String, Object> props) {
- getBoolSPI("win.text.fontSmoothingOn",
+ getBoolSPI("win.text.fontSmoothingOn", //$NON-NLS-1$
WindowsDefs.SPI_GETFONTSMOOTHING, props);
}
private void getFontSmoothContrast(Map<String, Object> props) {
- getIntSPI("win.text.fontSmoothingContrast",
+ getIntSPI("win.text.fontSmoothingContrast", //$NON-NLS-1$
SPI_GETFONTSMOOTHINGCONTRAST, props);
}
private void getFontSmoothType(Map<String, Object> props) {
- getIntSPI("win.text.fontSmoothingType", SPI_GETFONTSMOOTHINGTYPE, props);
+ getIntSPI("win.text.fontSmoothingType", SPI_GETFONTSMOOTHINGTYPE, props); //$NON-NLS-1$
}
private void getDragSize(boolean cx, Map<String, Object> props) {
int sm_idx = (cx ? WindowsDefs.SM_CXDRAG : WindowsDefs.SM_CYDRAG);
- String propName = "win.drag";
- propName += (cx ? ".width" : ".height");
+ String propName = "win.drag"; //$NON-NLS-1$
+ propName += (cx ? ".width" : ".height"); //$NON-NLS-1$ //$NON-NLS-2$
getSM(propName, sm_idx, props);
}
@@ -398,37 +398,37 @@
ncm.set_cbSize(ncm.size());
win32.SystemParametersInfoW(WindowsDefs.SPI_GETNONCLIENTMETRICS,
ncm.size(), ncm.getElementPointer(0), 0);
- setFontProperty("win.frame.captionFont",
+ setFontProperty("win.frame.captionFont", //$NON-NLS-1$
getFont(ncm.get_lfCaptionFont()), props);
- setFontProperty("win.frame.smallCaptionFont",
+ setFontProperty("win.frame.smallCaptionFont", //$NON-NLS-1$
getFont(ncm.get_lfSmCaptionFont()), props);
- setFontProperty("win.menu.font", getFont(ncm.get_lfMenuFont()), props);
- setFontProperty("win.messagebox.font",
+ setFontProperty("win.menu.font", getFont(ncm.get_lfMenuFont()), props); //$NON-NLS-1$
+ setFontProperty("win.messagebox.font", //$NON-NLS-1$
getFont(ncm.get_lfMessageFont()), props);
- setFontProperty("win.status.font", getFont(ncm.get_lfStatusFont()),
+ setFontProperty("win.status.font", getFont(ncm.get_lfStatusFont()), //$NON-NLS-1$
props);
- setFontProperty("win.tooltip.font", getFont(ncm.get_lfStatusFont()),
+ setFontProperty("win.tooltip.font", getFont(ncm.get_lfStatusFont()), //$NON-NLS-1$
props);
- setIntProperty("win.frame.sizingBorderWidth", ncm.get_iBorderWidth(),
+ setIntProperty("win.frame.sizingBorderWidth", ncm.get_iBorderWidth(), //$NON-NLS-1$
props);
- setIntProperty("win.scrollbar.width", ncm.get_iScrollWidth(),
+ setIntProperty("win.scrollbar.width", ncm.get_iScrollWidth(), //$NON-NLS-1$
props);
- setIntProperty("win.scrollbar.height", ncm.get_iScrollHeight(),
+ setIntProperty("win.scrollbar.height", ncm.get_iScrollHeight(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.captionButtonWidth", ncm.get_iCaptionWidth(),
+ setIntProperty("win.frame.captionButtonWidth", ncm.get_iCaptionWidth(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.captionButtonHeight", ncm.get_iCaptionHeight(),
+ setIntProperty("win.frame.captionButtonHeight", ncm.get_iCaptionHeight(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.captionHeight", ncm.get_iCaptionHeight(),
+ setIntProperty("win.frame.captionHeight", ncm.get_iCaptionHeight(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.smallCaptionButtonWidth", ncm.get_iSmCaptionWidth(),
+ setIntProperty("win.frame.smallCaptionButtonWidth", ncm.get_iSmCaptionWidth(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.smallCaptionButtonHeight", ncm.get_iSmCaptionHeight(),
+ setIntProperty("win.frame.smallCaptionButtonHeight", ncm.get_iSmCaptionHeight(), //$NON-NLS-1$
props);
- setIntProperty("win.frame.smallCaptionHeight", ncm.get_iSmCaptionHeight(),
+ setIntProperty("win.frame.smallCaptionHeight", ncm.get_iSmCaptionHeight(), //$NON-NLS-1$
props);
- setIntProperty("win.menu.buttonWidth", ncm.get_iMenuWidth(), props);
- setIntProperty("win.menu.height", ncm.get_iMenuHeight(), props);
+ setIntProperty("win.menu.buttonWidth", ncm.get_iMenuWidth(), props); //$NON-NLS-1$
+ setIntProperty("win.menu.height", ncm.get_iMenuHeight(), props); //$NON-NLS-1$
}
private void getIconMetrics(Map<String, Object> props) {
@@ -436,10 +436,10 @@
im.set_cbSize(im.size());
win32.SystemParametersInfoW(WindowsDefs.SPI_GETICONMETRICS,
im.size(), im.getElementPointer(0), 0);
- setFontProperty("win.icon.font", getFont(im.get_lfFont()), props);
- setIntProperty("win.icon.hspacing", im.get_iHorzSpacing(), props);
- setBoolProperty("win.icon.titleWrappingOn", im.get_iTitleWrap(), props);
- setIntProperty("win.icon.vspacing", im.get_iVertSpacing(), props);
+ setFontProperty("win.icon.font", getFont(im.get_lfFont()), props); //$NON-NLS-1$
+ setIntProperty("win.icon.hspacing", im.get_iHorzSpacing(), props); //$NON-NLS-1$
+ setBoolProperty("win.icon.titleWrappingOn", im.get_iTitleWrap(), props); //$NON-NLS-1$
+ setIntProperty("win.icon.vspacing", im.get_iVertSpacing(), props); //$NON-NLS-1$
}
private void getHighContrast(Map<String, Object> props) {
@@ -447,7 +447,7 @@
hc.set_cbSize(hc.size());
win32.SystemParametersInfoW(WindowsDefs.SPI_GETHIGHCONTRAST,
hc.size(), hc.getElementPointer(0), 0);
- setBoolProperty("win.highContrast.on",
+ setBoolProperty("win.highContrast.on", //$NON-NLS-1$
hc.get_dwFlags() & WindowsDefs.HCF_HIGHCONTRASTON,
props);
}
@@ -472,17 +472,17 @@
}
void getXPTheme(Map<String, Object> props) {
- setBoolProperty("win.xpstyle.themeActive", win32.IsThemeActive(), props);
+ setBoolProperty("win.xpstyle.themeActive", win32.IsThemeActive(), props); //$NON-NLS-1$
}
private void getDnDProps(Map<String, Object> props) {
- String propName = "DnD";
- setIntProperty(propName + ".gestureMotionThreshold",
+ String propName = "DnD"; //$NON-NLS-1$
+ setIntProperty(propName + ".gestureMotionThreshold", //$NON-NLS-1$
WindowsDefs.DD_DEFDRAGMINDIST, props);
- propName += ".Autoscroll";
- setIntProperty(propName + ".initialDelay",
+ propName += ".Autoscroll"; //$NON-NLS-1$
+ setIntProperty(propName + ".initialDelay", //$NON-NLS-1$
WindowsDefs.DD_DEFSCROLLDELAY, props);
- setIntProperty(propName + ".interval",
+ setIntProperty(propName + ".interval", //$NON-NLS-1$
WindowsDefs.DD_DEFSCROLLINTERVAL, props);
}
@@ -492,47 +492,47 @@
int flags = (WindowsDefs.SSF_SHOWATTRIBCOL |
WindowsDefs.SSF_SHOWALLOBJECTS);
win32.SHGetSettings(sfs, flags);
- String propName = "awt.file";
- setBoolProperty(propName + ".showAttribCol",
+ String propName = "awt.file"; //$NON-NLS-1$
+ setBoolProperty(propName + ".showAttribCol", //$NON-NLS-1$
sfs.get_fShowAttribCol(), props);
- setBoolProperty(propName + ".showHiddenFiles",
+ setBoolProperty(propName + ".showHiddenFiles", //$NON-NLS-1$
(sfs.get_fShowAllObjects()), props);
}
private void getMouseProps(Map<String, Object> props) {
- String propName = "awt.";
- getSM(propName + "mouse.numButtons", WindowsDefs.SM_CMOUSEBUTTONS, props);
- setIntProperty(propName + "multiClickInterval",
+ String propName = "awt."; //$NON-NLS-1$
+ getSM(propName + "mouse.numButtons", WindowsDefs.SM_CMOUSEBUTTONS, props); //$NON-NLS-1$
+ setIntProperty(propName + "multiClickInterval", //$NON-NLS-1$
win32.GetDoubleClickTime(), props);
- setBoolProperty(propName + "wheelMousePresent",
+ setBoolProperty(propName + "wheelMousePresent", //$NON-NLS-1$
win32.GetSystemMetrics(WindowsDefs.SM_MOUSEWHEELPRESENT),
props);
- getIntSPI(propName + "wheelScrollLines",
+ getIntSPI(propName + "wheelScrollLines", //$NON-NLS-1$
WindowsDefs.SPI_GETWHEELSCROLLLINES, props);
}
private void setSoundProperty(String propName, String sndName, Map<String, Object> props) {
- String base = "win.sound.";
+ String base = "win.sound."; //$NON-NLS-1$
setDesktopProperty(base + propName, new WinPlaySound(sndName), props);
}
private void initSoundProps(Map<String, Object> props) {
- setSoundProperty("asterisk", "SystemAsterisk", props);
- setSoundProperty("close", "Close", props);
- setSoundProperty("default", ".Default", props);
- setSoundProperty("exclamation", "SystemExclamation", props);
- setSoundProperty("exit", "SystemExit", props);
- setSoundProperty("hand", "SystemHand", props);
- setSoundProperty("maximize", "Maximize", props);
- setSoundProperty("menuCommand", "MenuCommand", props);
- setSoundProperty("menuPopup", "MenuPopup", props);
- setSoundProperty("minimize", "Minimize", props);
- setSoundProperty("open", "Open", props);
- setSoundProperty("question", "SystemQuestion", props);
- setSoundProperty("restoreDown", "RestoreDown", props);
- setSoundProperty("restoreUp", "RestoreUp", props);
- setSoundProperty("start", "SystemStart", props);
+ setSoundProperty("asterisk", "SystemAsterisk", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("close", "Close", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("default", ".Default", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("exclamation", "SystemExclamation", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("exit", "SystemExit", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("hand", "SystemHand", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("maximize", "Maximize", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("menuCommand", "MenuCommand", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("menuPopup", "MenuPopup", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("minimize", "Minimize", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("open", "Open", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("question", "SystemQuestion", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("restoreDown", "RestoreDown", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("restoreUp", "RestoreUp", props); //$NON-NLS-1$ //$NON-NLS-2$
+ setSoundProperty("start", "SystemStart", props); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java Tue Oct 31 00:05:44 2006
@@ -59,7 +59,7 @@
WinEventQueue.Task task = new WinEventQueue.Task () {
@Override
public void perform() {
- String title = (p.name != null) ? p.name : "";
+ String title = (p.name != null) ? p.name : ""; //$NON-NLS-1$
Rectangle rect = new Rectangle(p.x, p.y, p.w, p.h);
int style = getStyle(p);
int styleEx = getStyleEx(p);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java Tue Oct 31 00:05:44 2006
@@ -20,6 +20,7 @@
*/
package org.apache.harmony.awt.wtk.windows;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.Int16Pointer;
import org.apache.harmony.awt.nativebridge.windows.Callback;
import org.apache.harmony.awt.nativebridge.windows.Win32;
@@ -39,7 +40,7 @@
private static WindowProcHandler instance;
- static final String windowClassName = "org.apache.harmony.awt.wtk.window";
+ static final String windowClassName = "org.apache.harmony.awt.wtk.window"; //$NON-NLS-1$
private final long windowProcPtr;
@@ -83,8 +84,9 @@
namePtr.unlock();
if (classAtom == 0) {
- throw new InternalError("Failed to register window class "
- + className + " GetLastError returned " + winError);
+ // awt.1A=Failed to register window class {0} GetLastError returned {1}
+ throw new InternalError(Messages.getString("awt.1A", //$NON-NLS-1$
+ className, winError));
}
}
}
|