You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/10/31 09:05:47 UTC
svn commit: r469404 [1/2] - in
/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java:
common/org/apache/harmony/awt/internal/nls/
linux/org/apache/harmony/awt/datatransfer/linux/
linux/org/apache/harmony/awt/gl/font/ linux/org/apache/har...
Author: hindessm
Date: Tue Oct 31 00:05:44 2006
New Revision: 469404
URL: http://svn.apache.org/viewvc?view=rev&rev=469404
Log:
Applied patch from "[#HARMONY-1313] [classlib][internationalization]
Internationalization of the awt module".
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontProperty.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XVolatileImage.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/Xft.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/ContentWindow.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/WindowManager.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XServerConnection.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/NativeFont.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontManager.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WinFontProperty.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/font/WindowsFont.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIBlitter.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGDIPGraphics2D.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsConfiguration.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsEnvironment.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinVolatileImage.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Callback.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/Win32.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/nativebridge/windows/WinDataTransfer.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinButton.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinCheckbox.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinChoice.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinScrollbar.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinTextComponent.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEvent.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinEventQueue.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinIM.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinRobot.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinSystemProperties.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WinWindowFactory.java
incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/wtk/windows/WindowProcHandler.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/internal/nls/messages.properties Tue Oct 31 00:05:44 2006
@@ -22,3 +22,33 @@
awt.04='{0}' iterator parameter has zero length
awt.05=Operation cannot be null
awt.06=Unexpected type of the internal data buffer
+awt.07=Transfer data is not available
+awt.08=xfld parse string error: {0}
+awt.09=min range bound value is grater than max range bound
+awt.0A=Cannot use SinglePixedPackedSampleModel for bpp = {0}
+awt.0B=Wrong color model created for drawable
+awt.0C=Unknown visual class
+awt.0D=Invalid transparency
+awt.0E=Dimensions of the image should be positive
+awt.0F=Cannot open display '{0}'
+awt.10=Only 32-bit format is supported for window state operations.
+awt.11=Invalid key code
+awt.12=XTest is not supported by your X server\!
+awt.13=Cannot allocate color named '{0}'
+awt.14=Transfer data is not available
+awt.15=Can not get monitor info
+awt.16=Can not create DC for device
+awt.17=Unknown Composite type : {0}
+awt.18=Transparency is not supported.
+awt.19=Illegal size of volatile image.
+awt.1A=Failed to register window class {0} GetLastError returned {1}
+awt.1B=Invalid key code
+awt.1C=Failure to create JavaWindow GetLastError returned {0}
+awt.1D=Cannot get data from OLE clipboard
+awt.1E=Attempt to replace WindowProc handler
+
+awt.err.00=file dialog {0} error!
+awt.err.01=error: {0}
+awt.err.02=GDIPlus DrawDriverString error status = {0}
+awt.err.03=gdipDrawCompositeGlyphVector: GDIPlus DrawDriverString error status = {0}
+awt.err.04=gdipDrawCompositeGlyphVector: GDIPlus DrawDriverString error status = {0}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDTK.java Tue Oct 31 00:05:44 2006
@@ -31,11 +31,11 @@
public final class LinuxDTK extends DTK {
protected NativeClipboard newNativeClipboard() {
- return new LinuxSelection("CLIPBOARD");
+ return new LinuxSelection("CLIPBOARD"); //$NON-NLS-1$
}
protected NativeClipboard newNativeSelection() {
- return new LinuxSelection("PRIMARY");
+ return new LinuxSelection("PRIMARY"); //$NON-NLS-1$
}
public void initDragAndDrop() {
@@ -55,6 +55,6 @@
}
public String getDefaultCharset() {
- return "iso-10646-ucs-2";
+ return "iso-10646-ucs-2"; //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxDropTarget.java Tue Oct 31 00:05:44 2006
@@ -28,6 +28,7 @@
import java.awt.dnd.peer.DropTargetContextPeer;
import org.apache.harmony.awt.ContextStorage;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.wtk.linux.LinuxEventQueue;
public class LinuxDropTarget implements DropTargetContextPeer {
@@ -68,8 +69,9 @@
public Transferable getTransferable() throws InvalidDnDOperationException {
if (transferable == null) {
+ // awt.07=Transfer data is not available
throw new InvalidDnDOperationException(
- "Transfer data is not available");
+ Messages.getString("awt.07")); //$NON-NLS-1$
}
return transferable;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/datatransfer/linux/LinuxSelection.java Tue Oct 31 00:05:44 2006
@@ -39,16 +39,16 @@
private final long xaSTRING;
public LinuxSelection(String selection) {
- super("System");
+ super("System"); //$NON-NLS-1$
factory = (LinuxWindowFactory)ContextStorage.getWindowFactory();
xaSelection = factory.internAtom(selection);
- xaTargets = factory.internAtom("TARGETS");
- xaMultiple = factory.internAtom("MULTIPLE");
- xaText = factory.internAtom("TEXT");
- xaUTF8 = factory.internAtom("UTF8_STRING");
- xaSTRING = factory.internAtom("STRING");
+ xaTargets = factory.internAtom("TARGETS"); //$NON-NLS-1$
+ xaMultiple = factory.internAtom("MULTIPLE"); //$NON-NLS-1$
+ xaText = factory.internAtom("TEXT"); //$NON-NLS-1$
+ xaUTF8 = factory.internAtom("UTF8_STRING"); //$NON-NLS-1$
+ xaSTRING = factory.internAtom("STRING"); //$NON-NLS-1$
}
public boolean preprocess(XEvent event) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFont.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;
import org.apache.harmony.awt.wtk.linux.LinuxWindowFactory;
@@ -84,7 +85,7 @@
this.italicAngle = LinuxNativeFont.getItalicAngleNative(pFont, this.fontType);
}
- this.nlm = new LinuxLineMetrics(this, null, " ");
+ this.nlm = new LinuxLineMetrics(this, null, " "); //$NON-NLS-1$
this.ascent = nlm.getLogicalAscent();
this.descent = nlm.getLogicalDescent();
@@ -246,8 +247,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/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontManager.java Tue Oct 31 00:05:44 2006
@@ -29,6 +29,7 @@
import org.apache.harmony.awt.gl.font.FontManager;
import org.apache.harmony.awt.gl.font.FontProperty;
+import org.apache.harmony.awt.internal.nls.Messages;
public class LinuxFontManager extends FontManager {
@@ -37,12 +38,12 @@
// weight names according to xlfd structure
public static final String[] LINUX_WEIGHT_NAMES = {
- "black", "bold", "demibold", "medium", "light"
+ "black", "bold", "demibold", "medium", "light" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
};
// slant names according to xlfd structure
public static final String[] LINUX_SLANT_NAMES = {
- "i", "o", "r"
+ "i", "o", "r" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
};
/** Singleton LinuxFontManager instance */
@@ -65,7 +66,7 @@
* font files should be installed.
*/
public File getTempFontFile()throws IOException{
- File fontFile = File.createTempFile("jFont", ".ttf", new File(System.getProperty("user.home") +"/.fonts"));
+ File fontFile = File.createTempFile("jFont", ".ttf", new File(System.getProperty("user.home") +"/.fonts")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
fontFile.deleteOnExit();
return fontFile;
@@ -106,12 +107,12 @@
while(moreEntries){
// Component Font Mappings property name
- String property = FONT_MAPPING_KEYS[0].replaceAll("LogicalFontName", lName).replaceAll("StyleName", styleName).replaceAll("ComponentIndex", String.valueOf(numComp));
+ String property = FONT_MAPPING_KEYS[0].replaceAll("LogicalFontName", lName).replaceAll("StyleName", styleName).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", lName).replaceAll("ComponentIndex", String.valueOf(numComp));
+ property = FONT_MAPPING_KEYS[1].replaceAll("LogicalFontName", lName).replaceAll("ComponentIndex", String.valueOf(numComp)); //$NON-NLS-1$ //$NON-NLS-2$
value = props.getProperty(property);
}
@@ -119,7 +120,8 @@
String[] fields = parseXLFD(value);
if (fields == null){
- throw new RuntimeException("xfld parse string error: " + value);
+ // awt.08=xfld parse string error: {0}
+ throw new RuntimeException(Messages.getString("awt.08", value)); //$NON-NLS-1$
}
String fontName = fields[1];
@@ -128,10 +130,10 @@
int style = getBoldStyle(weight) | getItalicStyle(italic);
// Component Font Character Encodings property value
- String encoding = props.getProperty(FONT_CHARACTER_ENCODING.replaceAll("LogicalFontName", lName).replaceAll("ComponentIndex", String.valueOf(numComp)));
+ String encoding = props.getProperty(FONT_CHARACTER_ENCODING.replaceAll("LogicalFontName", lName).replaceAll("ComponentIndex", String.valueOf(numComp))); //$NON-NLS-1$ //$NON-NLS-2$
// Exclusion Ranges property value
- String exclString = props.getProperty(EXCLUSION_RANGES.replaceAll("LogicalFontName", lName).replaceAll("ComponentIndex", String.valueOf(numComp)));
+ String exclString = props.getProperty(EXCLUSION_RANGES.replaceAll("LogicalFontName", lName).replaceAll("ComponentIndex", String.valueOf(numComp))); //$NON-NLS-1$ //$NON-NLS-2$
int[] exclRange = parseIntervals(exclString);
FontProperty fp = new LinuxFontProperty(lName, styleName, null, fontName, value, style, exclRange, encoding);
@@ -142,7 +144,7 @@
moreEntries = false;
}
}
- fProperties.put(LOGICAL_FONT_NAMES[i] + "." + j, propsVector);
+ fProperties.put(LOGICAL_FONT_NAMES[i] + "." + j, propsVector); //$NON-NLS-1$
}
}
@@ -190,7 +192,7 @@
*/
public static String[] parseXLFD(String xlfd){
int fieldsCount = 14;
- String fieldsDelim = "-";
+ String fieldsDelim = "-"; //$NON-NLS-1$
String[] res = new String[fieldsCount];
if (!xlfd.startsWith(fieldsDelim)){
return null;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontProperty.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontProperty.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontProperty.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxFontProperty.java Tue Oct 31 00:05:44 2006
@@ -70,11 +70,11 @@
public String toString(){
return new String(this.getClass().getName() +
- "[name=" + name +
- ",fileName="+ fileName +
- ",Charset=" + encoding +
- ",exclRange=" + exclRange +
- ",xlfd=" + xlfd + "]");
+ "[name=" + name + //$NON-NLS-1$
+ ",fileName="+ fileName + //$NON-NLS-1$
+ ",Charset=" + encoding + //$NON-NLS-1$
+ ",exclRange=" + exclRange + //$NON-NLS-1$
+ ",xlfd=" + xlfd + "]"); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/font/LinuxNativeFont.java Tue Oct 31 00:05:44 2006
@@ -326,204 +326,204 @@
/*
* Language records 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$
/*
* Language-country records.
*/
- ht.put(new String("ar_SA"), new Short((short)0x401));
- ht.put(new String("bg_BG"), new Short((short)0x402));
- ht.put(new String("ca_ES"), new Short((short)0x403));
- ht.put(new String("zh_TW"), new Short((short)0x404));
- ht.put(new String("cs_CZ"), new Short((short)0x405));
- ht.put(new String("da_DK"), new Short((short)0x406));
- ht.put(new String("de_DE"), new Short((short)0x407));
- ht.put(new String("el_GR"), new Short((short)0x408));
- ht.put(new String("en_US"), new Short((short)0x409));
- ht.put(new String("es_ES"), new Short((short)0x40a));
- ht.put(new String("fi_FI"), new Short((short)0x40b));
- ht.put(new String("fr_FR"), new Short((short)0x40c));
- ht.put(new String("he_IL"), new Short((short)0x40d));
- ht.put(new String("hu_HU"), new Short((short)0x40e));
- ht.put(new String("is_IS"), new Short((short)0x40f));
- ht.put(new String("it_IT"), new Short((short)0x410));
- ht.put(new String("ja_JP"), new Short((short)0x411));
- ht.put(new String("ko_KR"), new Short((short)0x412));
- ht.put(new String("nl_NL"), new Short((short)0x413));
- ht.put(new String("nb_NO"), new Short((short)0x414));
- ht.put(new String("pl_PL"), new Short((short)0x415));
- ht.put(new String("pt_BR"), new Short((short)0x416));
- ht.put(new String("ro_RO"), new Short((short)0x418));
- ht.put(new String("ru_RU"), new Short((short)0x419));
- ht.put(new String("hr_HR"), new Short((short)0x41a));
- ht.put(new String("sk_SK"), new Short((short)0x41b));
- ht.put(new String("sq_AL"), new Short((short)0x41c));
- ht.put(new String("sv_SE"), new Short((short)0x41d));
- ht.put(new String("th_TH"), new Short((short)0x41e));
- ht.put(new String("tr_TR"), new Short((short)0x41f));
- ht.put(new String("ur_PK"), new Short((short)0x420));
- ht.put(new String("id_ID"), new Short((short)0x421));
- ht.put(new String("uk_UA"), new Short((short)0x422));
- ht.put(new String("be_BY"), new Short((short)0x423));
- ht.put(new String("sl_SI"), new Short((short)0x424));
- ht.put(new String("et_EE"), new Short((short)0x425));
- ht.put(new String("lv_LV"), new Short((short)0x426));
- ht.put(new String("lt_LT"), new Short((short)0x427));
- ht.put(new String("fa_IR"), new Short((short)0x429));
- ht.put(new String("vi_VN"), new Short((short)0x42a));
- ht.put(new String("hy_AM"), new Short((short)0x42b));
- ht.put(new String("az_AZ"), new Short((short)0x42c));
- ht.put(new String("eu_ES"), new Short((short)0x42d));
- ht.put(new String("mk_MK"), new Short((short)0x42f));
- ht.put(new String("af_ZA"), new Short((short)0x436));
- ht.put(new String("ka_GE"), new Short((short)0x437));
- ht.put(new String("fo_FO"), new Short((short)0x438));
- ht.put(new String("hi_IN"), new Short((short)0x439));
- ht.put(new String("ms_MY"), new Short((short)0x43e));
- ht.put(new String("kk_KZ"), new Short((short)0x43f));
- ht.put(new String("ky_KG"), new Short((short)0x440));
- ht.put(new String("sw_KE"), new Short((short)0x441));
- ht.put(new String("uz_UZ"), new Short((short)0x443));
- ht.put(new String("tt_TA"), new Short((short)0x444));
- ht.put(new String("pa_IN"), new Short((short)0x446));
- ht.put(new String("gu_IN"), new Short((short)0x447));
- ht.put(new String("ta_IN"), new Short((short)0x449));
- ht.put(new String("te_IN"), new Short((short)0x44a));
- ht.put(new String("kn_IN"), new Short((short)0x44b));
- ht.put(new String("mr_IN"), new Short((short)0x44e));
- ht.put(new String("sa_IN"), new Short((short)0x44f));
- ht.put(new String("mn_MN"), new Short((short)0x450));
- ht.put(new String("gl_ES"), new Short((short)0x456));
- ht.put(new String("ko_IN"), new Short((short)0x457));
- ht.put(new String("sy_SY"), new Short((short)0x45a));
- ht.put(new String("di_MV"), new Short((short)0x465));
- ht.put(new String("ar_IQ"), new Short((short)0x801));
- ht.put(new String("zh_CN"), new Short((short)0x804));
- ht.put(new String("de_CH"), new Short((short)0x807));
- ht.put(new String("en_GB"), new Short((short)0x809));
- ht.put(new String("es_MX"), new Short((short)0x80a));
- ht.put(new String("fr_BE"), new Short((short)0x80c));
- ht.put(new String("it_CH"), new Short((short)0x810));
- ht.put(new String("nl_BE"), new Short((short)0x813));
- ht.put(new String("nn_NO"), new Short((short)0x814));
- ht.put(new String("pt_PT"), new Short((short)0x816));
- ht.put(new String("sr_SP"), new Short((short)0x81a));
- ht.put(new String("sv_FI"), new Short((short)0x81d));
- ht.put(new String("az_AZ"), new Short((short)0x82c));
- ht.put(new String("ms_BN"), new Short((short)0x83e));
- ht.put(new String("uz_UZ"), new Short((short)0x843));
- ht.put(new String("ar_EG"), new Short((short)0xc01));
- ht.put(new String("zh_HK"), new Short((short)0xc04));
- ht.put(new String("de_AT"), new Short((short)0xc07));
- ht.put(new String("en_AU"), new Short((short)0xc09));
- ht.put(new String("es_ES"), new Short((short)0xc0a));
- ht.put(new String("fr_CA"), new Short((short)0xc0c));
- ht.put(new String("sr_SP"), new Short((short)0xc1a));
- ht.put(new String("ar_LY"), new Short((short)0x1001));
- ht.put(new String("zh_SG"), new Short((short)0x1004));
- ht.put(new String("de_LU"), new Short((short)0x1007));
- ht.put(new String("en_CA"), new Short((short)0x1009));
- ht.put(new String("es_GT"), new Short((short)0x100a));
- ht.put(new String("fr_CH"), new Short((short)0x100c));
- ht.put(new String("ar_DZ"), new Short((short)0x1401));
- ht.put(new String("zh_MO"), new Short((short)0x1404));
- ht.put(new String("de_LI"), new Short((short)0x1407));
- ht.put(new String("en_NZ"), new Short((short)0x1409));
- ht.put(new String("es_CR"), new Short((short)0x140a));
- ht.put(new String("fr_LU"), new Short((short)0x140c));
- ht.put(new String("ar_MA"), new Short((short)0x1801));
- ht.put(new String("en_IE"), new Short((short)0x1809));
- ht.put(new String("es_PA"), new Short((short)0x180a));
- ht.put(new String("fr_MC"), new Short((short)0x180c));
- ht.put(new String("ar_TN"), new Short((short)0x1c01));
- ht.put(new String("en_ZA"), new Short((short)0x1c09));
- ht.put(new String("es_DO"), new Short((short)0x1c0a));
- ht.put(new String("ar_OM"), new Short((short)0x2001));
- ht.put(new String("en_JM"), new Short((short)0x2009));
- ht.put(new String("es_VE"), new Short((short)0x200a));
- ht.put(new String("ar_YE"), new Short((short)0x2401));
- ht.put(new String("en_CB"), new Short((short)0x2409));
- ht.put(new String("es_CO"), new Short((short)0x240a));
- ht.put(new String("ar_SY"), new Short((short)0x2801));
- ht.put(new String("en_BZ"), new Short((short)0x2809));
- ht.put(new String("es_PE"), new Short((short)0x280a));
- ht.put(new String("ar_JO"), new Short((short)0x2c01));
- ht.put(new String("en_TT"), new Short((short)0x2c09));
- ht.put(new String("es_AR"), new Short((short)0x2c0a));
- ht.put(new String("ar_LB"), new Short((short)0x3001));
- ht.put(new String("en_ZW"), new Short((short)0x3009));
- ht.put(new String("es_EC"), new Short((short)0x300a));
- ht.put(new String("ar_KW"), new Short((short)0x3401));
- ht.put(new String("en_PH"), new Short((short)0x3409));
- ht.put(new String("es_CL"), new Short((short)0x340a));
- ht.put(new String("ar_AE"), new Short((short)0x3801));
- ht.put(new String("es_UY"), new Short((short)0x380a));
- ht.put(new String("ar_BH"), new Short((short)0x3c01));
- ht.put(new String("es_PY"), new Short((short)0x3c0a));
- ht.put(new String("ar_QA"), new Short((short)0x4001));
- ht.put(new String("es_BO"), new Short((short)0x400a));
- ht.put(new String("es_SV"), new Short((short)0x440a));
- ht.put(new String("es_HN"), new Short((short)0x480a));
- ht.put(new String("es_NI"), new Short((short)0x4c0a));
- ht.put(new String("es_PR"), new Short((short)0x500a));
+ ht.put(new String("ar_SA"), new Short((short)0x401)); //$NON-NLS-1$
+ ht.put(new String("bg_BG"), new Short((short)0x402)); //$NON-NLS-1$
+ ht.put(new String("ca_ES"), new Short((short)0x403)); //$NON-NLS-1$
+ ht.put(new String("zh_TW"), new Short((short)0x404)); //$NON-NLS-1$
+ ht.put(new String("cs_CZ"), new Short((short)0x405)); //$NON-NLS-1$
+ ht.put(new String("da_DK"), new Short((short)0x406)); //$NON-NLS-1$
+ ht.put(new String("de_DE"), new Short((short)0x407)); //$NON-NLS-1$
+ ht.put(new String("el_GR"), new Short((short)0x408)); //$NON-NLS-1$
+ ht.put(new String("en_US"), new Short((short)0x409)); //$NON-NLS-1$
+ ht.put(new String("es_ES"), new Short((short)0x40a)); //$NON-NLS-1$
+ ht.put(new String("fi_FI"), new Short((short)0x40b)); //$NON-NLS-1$
+ ht.put(new String("fr_FR"), new Short((short)0x40c)); //$NON-NLS-1$
+ ht.put(new String("he_IL"), new Short((short)0x40d)); //$NON-NLS-1$
+ ht.put(new String("hu_HU"), new Short((short)0x40e)); //$NON-NLS-1$
+ ht.put(new String("is_IS"), new Short((short)0x40f)); //$NON-NLS-1$
+ ht.put(new String("it_IT"), new Short((short)0x410)); //$NON-NLS-1$
+ ht.put(new String("ja_JP"), new Short((short)0x411)); //$NON-NLS-1$
+ ht.put(new String("ko_KR"), new Short((short)0x412)); //$NON-NLS-1$
+ ht.put(new String("nl_NL"), new Short((short)0x413)); //$NON-NLS-1$
+ ht.put(new String("nb_NO"), new Short((short)0x414)); //$NON-NLS-1$
+ ht.put(new String("pl_PL"), new Short((short)0x415)); //$NON-NLS-1$
+ ht.put(new String("pt_BR"), new Short((short)0x416)); //$NON-NLS-1$
+ ht.put(new String("ro_RO"), new Short((short)0x418)); //$NON-NLS-1$
+ ht.put(new String("ru_RU"), new Short((short)0x419)); //$NON-NLS-1$
+ ht.put(new String("hr_HR"), new Short((short)0x41a)); //$NON-NLS-1$
+ ht.put(new String("sk_SK"), new Short((short)0x41b)); //$NON-NLS-1$
+ ht.put(new String("sq_AL"), new Short((short)0x41c)); //$NON-NLS-1$
+ ht.put(new String("sv_SE"), new Short((short)0x41d)); //$NON-NLS-1$
+ ht.put(new String("th_TH"), new Short((short)0x41e)); //$NON-NLS-1$
+ ht.put(new String("tr_TR"), new Short((short)0x41f)); //$NON-NLS-1$
+ ht.put(new String("ur_PK"), new Short((short)0x420)); //$NON-NLS-1$
+ ht.put(new String("id_ID"), new Short((short)0x421)); //$NON-NLS-1$
+ ht.put(new String("uk_UA"), new Short((short)0x422)); //$NON-NLS-1$
+ ht.put(new String("be_BY"), new Short((short)0x423)); //$NON-NLS-1$
+ ht.put(new String("sl_SI"), new Short((short)0x424)); //$NON-NLS-1$
+ ht.put(new String("et_EE"), new Short((short)0x425)); //$NON-NLS-1$
+ ht.put(new String("lv_LV"), new Short((short)0x426)); //$NON-NLS-1$
+ ht.put(new String("lt_LT"), new Short((short)0x427)); //$NON-NLS-1$
+ ht.put(new String("fa_IR"), new Short((short)0x429)); //$NON-NLS-1$
+ ht.put(new String("vi_VN"), new Short((short)0x42a)); //$NON-NLS-1$
+ ht.put(new String("hy_AM"), new Short((short)0x42b)); //$NON-NLS-1$
+ ht.put(new String("az_AZ"), new Short((short)0x42c)); //$NON-NLS-1$
+ ht.put(new String("eu_ES"), new Short((short)0x42d)); //$NON-NLS-1$
+ ht.put(new String("mk_MK"), new Short((short)0x42f)); //$NON-NLS-1$
+ ht.put(new String("af_ZA"), new Short((short)0x436)); //$NON-NLS-1$
+ ht.put(new String("ka_GE"), new Short((short)0x437)); //$NON-NLS-1$
+ ht.put(new String("fo_FO"), new Short((short)0x438)); //$NON-NLS-1$
+ ht.put(new String("hi_IN"), new Short((short)0x439)); //$NON-NLS-1$
+ ht.put(new String("ms_MY"), new Short((short)0x43e)); //$NON-NLS-1$
+ ht.put(new String("kk_KZ"), new Short((short)0x43f)); //$NON-NLS-1$
+ ht.put(new String("ky_KG"), new Short((short)0x440)); //$NON-NLS-1$
+ ht.put(new String("sw_KE"), new Short((short)0x441)); //$NON-NLS-1$
+ ht.put(new String("uz_UZ"), new Short((short)0x443)); //$NON-NLS-1$
+ ht.put(new String("tt_TA"), new Short((short)0x444)); //$NON-NLS-1$
+ ht.put(new String("pa_IN"), new Short((short)0x446)); //$NON-NLS-1$
+ ht.put(new String("gu_IN"), new Short((short)0x447)); //$NON-NLS-1$
+ ht.put(new String("ta_IN"), new Short((short)0x449)); //$NON-NLS-1$
+ ht.put(new String("te_IN"), new Short((short)0x44a)); //$NON-NLS-1$
+ ht.put(new String("kn_IN"), new Short((short)0x44b)); //$NON-NLS-1$
+ ht.put(new String("mr_IN"), new Short((short)0x44e)); //$NON-NLS-1$
+ ht.put(new String("sa_IN"), new Short((short)0x44f)); //$NON-NLS-1$
+ ht.put(new String("mn_MN"), new Short((short)0x450)); //$NON-NLS-1$
+ ht.put(new String("gl_ES"), new Short((short)0x456)); //$NON-NLS-1$
+ ht.put(new String("ko_IN"), new Short((short)0x457)); //$NON-NLS-1$
+ ht.put(new String("sy_SY"), new Short((short)0x45a)); //$NON-NLS-1$
+ ht.put(new String("di_MV"), new Short((short)0x465)); //$NON-NLS-1$
+ ht.put(new String("ar_IQ"), new Short((short)0x801)); //$NON-NLS-1$
+ ht.put(new String("zh_CN"), new Short((short)0x804)); //$NON-NLS-1$
+ ht.put(new String("de_CH"), new Short((short)0x807)); //$NON-NLS-1$
+ ht.put(new String("en_GB"), new Short((short)0x809)); //$NON-NLS-1$
+ ht.put(new String("es_MX"), new Short((short)0x80a)); //$NON-NLS-1$
+ ht.put(new String("fr_BE"), new Short((short)0x80c)); //$NON-NLS-1$
+ ht.put(new String("it_CH"), new Short((short)0x810)); //$NON-NLS-1$
+ ht.put(new String("nl_BE"), new Short((short)0x813)); //$NON-NLS-1$
+ ht.put(new String("nn_NO"), new Short((short)0x814)); //$NON-NLS-1$
+ ht.put(new String("pt_PT"), new Short((short)0x816)); //$NON-NLS-1$
+ ht.put(new String("sr_SP"), new Short((short)0x81a)); //$NON-NLS-1$
+ ht.put(new String("sv_FI"), new Short((short)0x81d)); //$NON-NLS-1$
+ ht.put(new String("az_AZ"), new Short((short)0x82c)); //$NON-NLS-1$
+ ht.put(new String("ms_BN"), new Short((short)0x83e)); //$NON-NLS-1$
+ ht.put(new String("uz_UZ"), new Short((short)0x843)); //$NON-NLS-1$
+ ht.put(new String("ar_EG"), new Short((short)0xc01)); //$NON-NLS-1$
+ ht.put(new String("zh_HK"), new Short((short)0xc04)); //$NON-NLS-1$
+ ht.put(new String("de_AT"), new Short((short)0xc07)); //$NON-NLS-1$
+ ht.put(new String("en_AU"), new Short((short)0xc09)); //$NON-NLS-1$
+ ht.put(new String("es_ES"), new Short((short)0xc0a)); //$NON-NLS-1$
+ ht.put(new String("fr_CA"), new Short((short)0xc0c)); //$NON-NLS-1$
+ ht.put(new String("sr_SP"), new Short((short)0xc1a)); //$NON-NLS-1$
+ ht.put(new String("ar_LY"), new Short((short)0x1001)); //$NON-NLS-1$
+ ht.put(new String("zh_SG"), new Short((short)0x1004)); //$NON-NLS-1$
+ ht.put(new String("de_LU"), new Short((short)0x1007)); //$NON-NLS-1$
+ ht.put(new String("en_CA"), new Short((short)0x1009)); //$NON-NLS-1$
+ ht.put(new String("es_GT"), new Short((short)0x100a)); //$NON-NLS-1$
+ ht.put(new String("fr_CH"), new Short((short)0x100c)); //$NON-NLS-1$
+ ht.put(new String("ar_DZ"), new Short((short)0x1401)); //$NON-NLS-1$
+ ht.put(new String("zh_MO"), new Short((short)0x1404)); //$NON-NLS-1$
+ ht.put(new String("de_LI"), new Short((short)0x1407)); //$NON-NLS-1$
+ ht.put(new String("en_NZ"), new Short((short)0x1409)); //$NON-NLS-1$
+ ht.put(new String("es_CR"), new Short((short)0x140a)); //$NON-NLS-1$
+ ht.put(new String("fr_LU"), new Short((short)0x140c)); //$NON-NLS-1$
+ ht.put(new String("ar_MA"), new Short((short)0x1801)); //$NON-NLS-1$
+ ht.put(new String("en_IE"), new Short((short)0x1809)); //$NON-NLS-1$
+ ht.put(new String("es_PA"), new Short((short)0x180a)); //$NON-NLS-1$
+ ht.put(new String("fr_MC"), new Short((short)0x180c)); //$NON-NLS-1$
+ ht.put(new String("ar_TN"), new Short((short)0x1c01)); //$NON-NLS-1$
+ ht.put(new String("en_ZA"), new Short((short)0x1c09)); //$NON-NLS-1$
+ ht.put(new String("es_DO"), new Short((short)0x1c0a)); //$NON-NLS-1$
+ ht.put(new String("ar_OM"), new Short((short)0x2001)); //$NON-NLS-1$
+ ht.put(new String("en_JM"), new Short((short)0x2009)); //$NON-NLS-1$
+ ht.put(new String("es_VE"), new Short((short)0x200a)); //$NON-NLS-1$
+ ht.put(new String("ar_YE"), new Short((short)0x2401)); //$NON-NLS-1$
+ ht.put(new String("en_CB"), new Short((short)0x2409)); //$NON-NLS-1$
+ ht.put(new String("es_CO"), new Short((short)0x240a)); //$NON-NLS-1$
+ ht.put(new String("ar_SY"), new Short((short)0x2801)); //$NON-NLS-1$
+ ht.put(new String("en_BZ"), new Short((short)0x2809)); //$NON-NLS-1$
+ ht.put(new String("es_PE"), new Short((short)0x280a)); //$NON-NLS-1$
+ ht.put(new String("ar_JO"), new Short((short)0x2c01)); //$NON-NLS-1$
+ ht.put(new String("en_TT"), new Short((short)0x2c09)); //$NON-NLS-1$
+ ht.put(new String("es_AR"), new Short((short)0x2c0a)); //$NON-NLS-1$
+ ht.put(new String("ar_LB"), new Short((short)0x3001)); //$NON-NLS-1$
+ ht.put(new String("en_ZW"), new Short((short)0x3009)); //$NON-NLS-1$
+ ht.put(new String("es_EC"), new Short((short)0x300a)); //$NON-NLS-1$
+ ht.put(new String("ar_KW"), new Short((short)0x3401)); //$NON-NLS-1$
+ ht.put(new String("en_PH"), new Short((short)0x3409)); //$NON-NLS-1$
+ ht.put(new String("es_CL"), new Short((short)0x340a)); //$NON-NLS-1$
+ ht.put(new String("ar_AE"), new Short((short)0x3801)); //$NON-NLS-1$
+ ht.put(new String("es_UY"), new Short((short)0x380a)); //$NON-NLS-1$
+ ht.put(new String("ar_BH"), new Short((short)0x3c01)); //$NON-NLS-1$
+ ht.put(new String("es_PY"), new Short((short)0x3c0a)); //$NON-NLS-1$
+ ht.put(new String("ar_QA"), new Short((short)0x4001)); //$NON-NLS-1$
+ ht.put(new String("es_BO"), new Short((short)0x400a)); //$NON-NLS-1$
+ ht.put(new String("es_SV"), new Short((short)0x440a)); //$NON-NLS-1$
+ ht.put(new String("es_HN"), new Short((short)0x480a)); //$NON-NLS-1$
+ ht.put(new String("es_NI"), new Short((short)0x4c0a)); //$NON-NLS-1$
+ ht.put(new String("es_PR"), new Short((short)0x500a)); //$NON-NLS-1$
}
/**
@@ -626,7 +626,7 @@
* special format
*/
public static void initFace(int index, String faceString){
- String delim = "-";
+ String delim = "-"; //$NON-NLS-1$
int pos;
if (faceString == null) {
return;
@@ -654,7 +654,7 @@
fontStyles[index] = style;
- faces[index] = family + " " + styleNames[index];
+ faces[index] = family + " " + styleNames[index]; //$NON-NLS-1$
}
/** Returns the list of system font families names. */
@@ -703,7 +703,7 @@
java.security.AccessController
.doPrivileged(new java.security.PrivilegedAction() {
public Object run() {
- System.loadLibrary("linuxfont");
+ System.loadLibrary("linuxfont"); //$NON-NLS-1$
return null;
}
});
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java Tue Oct 31 00:05:44 2006
@@ -44,16 +44,16 @@
inst = new LinuxGraphics2DFactory();
}
public Graphics2D getGraphics2D(NativeWindow nw, int tx, int ty, MultiRectArea clip) {
- String opengl = System.getProperty("java2d.opengl");
- boolean useOpenGL = opengl != null && opengl.equals("true");
+ String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+ boolean useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
return useOpenGL ?
(Graphics2D) new OGLGraphics2D(nw, tx, ty, clip) :
new XGraphics2D(nw, tx, ty, clip);
}
public Graphics2D getGraphics2D(NativeWindow nw, int tx, int ty, int width, int height) {
- String opengl = System.getProperty("java2d.opengl");
- boolean useOpenGL = opengl != null && opengl.equals("true");
+ String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+ boolean useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
return useOpenGL ?
(Graphics2D) new OGLGraphics2D(nw, tx, ty, width, height) :
new XGraphics2D(nw, tx, ty, width, height);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsConfiguration.java Tue Oct 31 00:05:44 2006
@@ -23,6 +23,7 @@
package org.apache.harmony.awt.gl.linux;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.*;
import org.apache.harmony.awt.nativebridge.linux.X11;
import org.apache.harmony.awt.nativebridge.linux.X11Defs;
@@ -234,7 +235,8 @@
break;
}
default:
- throw new InternalError("Unknown visual class");
+ // awt.0C=Unknown visual class
+ throw new InternalError(Messages.getString("awt.0C")); //$NON-NLS-1$
}
}
@@ -250,15 +252,16 @@
// Transparency unsupported yet, return default model again
return getColorModel();
default:
- throw new IllegalArgumentException("Invalid transparency");
+ // awt.0D=Invalid transparency
+ throw new IllegalArgumentException(Messages.getString("awt.0D")); //$NON-NLS-1$
}
}
public VolatileImage createCompatibleVolatileImage(int width, int height) {
if (width <= 0 || height <= 0)
- throw new IllegalArgumentException(
- "Dimensions of the image should be positive"
- );
+ // awt.0E=Dimensions of the image should be positive
+ throw new IllegalArgumentException(Messages.getString("awt.0E")); //$NON-NLS-1$
+
return new XVolatileImage(this, width, height);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java Tue Oct 31 00:05:44 2006
@@ -131,8 +131,8 @@
// Allocate array for configurations
configs = new XGraphicsConfiguration[numVisualInfos];
- String opengl = System.getProperty("java2d.opengl");
- boolean useOpenGL = opengl != null && opengl.equals("true");
+ String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+ boolean useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
for (int i=0; i<numVisualInfos; i++) {
X11.XVisualInfo info = x11.createXVisualInfo(
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XVolatileImage.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XVolatileImage.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XVolatileImage.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/gl/linux/XVolatileImage.java Tue Oct 31 00:05:44 2006
@@ -31,6 +31,7 @@
import org.apache.harmony.awt.gl.GLVolatileImage;
import org.apache.harmony.awt.gl.Surface;
import org.apache.harmony.awt.gl.Utils;
+import org.apache.harmony.awt.internal.nls.Messages;
public class XVolatileImage extends GLVolatileImage {
private static final X11 x11 = X11.getInstance();
@@ -215,10 +216,9 @@
break;
}
default: {
- throw new InternalError(
- "Cannot use SinglePixedPackedSampleModel for bpp =" +
- xImage.get_bits_per_pixel()
- );
+ // awt.0A=Cannot use SinglePixedPackedSampleModel for bpp = {0}
+ throw new InternalError(Messages.getString(
+ "awt.0A", xImage.get_bits_per_pixel())); //$NON-NLS-1$
}
}
@@ -255,7 +255,8 @@
);
}
} else {
- throw new InternalError("Wrong color model created for drawable");
+ // awt.0B=Wrong color model created for drawable
+ throw new InternalError(Messages.getString("awt.0B")); //$NON-NLS-1$
}
return new BufferedImage(
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/X11.java Tue Oct 31 00:05:44 2006
@@ -39,7 +39,7 @@
}
private X11() {
- System.loadLibrary("X11Wrapper");
+ System.loadLibrary("X11Wrapper"); //$NON-NLS-1$
init();
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/Xft.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/Xft.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/Xft.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/nativebridge/linux/Xft.java Tue Oct 31 00:05:44 2006
@@ -39,7 +39,7 @@
}
private Xft() {
- System.loadLibrary("X11Wrapper");
+ System.loadLibrary("X11Wrapper"); //$NON-NLS-1$
init();
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/ContentWindow.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/ContentWindow.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/ContentWindow.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/ContentWindow.java Tue Oct 31 00:05:44 2006
@@ -45,7 +45,7 @@
CreationParams p) {
super(factory, p);
frame = (LinuxWindow) factory.getWindowById(p.parentId);
- super.setTitle("Content Window");
+ super.setTitle("Content Window"); //$NON-NLS-1$
}
/**
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxCursorFactory.java Tue Oct 31 00:05:44 2006
@@ -29,6 +29,7 @@
import java.awt.image.WritableRaster;
import org.apache.harmony.awt.gl.Utils;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.linux.X11;
import org.apache.harmony.awt.nativebridge.linux.X11Defs;
import org.apache.harmony.awt.wtk.CursorFactory;
@@ -262,8 +263,8 @@
x11.XDefaultColormap(display, factory.getScreen()),
strColor, color);
if (status == 0) {
- throw new RuntimeException("Cannot allocate color named '"
- + strColor + "'");
+ // awt.13=Cannot allocate color named '{0}'
+ throw new RuntimeException(Messages.getString("awt.13", strColor)); //$NON-NLS-1$
}
return color;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEvent.java Tue Oct 31 00:05:44 2006
@@ -32,6 +32,7 @@
import java.awt.event.WindowEvent;
import org.apache.harmony.awt.gl.MultiRectArea;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.CLongPointer;
import org.apache.harmony.awt.nativebridge.Int32Pointer;
import org.apache.harmony.awt.nativebridge.NativeBridge;
@@ -474,8 +475,8 @@
CLongPointer types = bridge.createCLongPointer(propReturn.get(0));
deriveNewWindowState(count, types);
} else {
- throw new RuntimeException(
- "Only 32-bit format is supported for window state operations.");
+ // awt.10=Only 32-bit format is supported for window state operations.
+ throw new RuntimeException(Messages.getString("awt.10")); //$NON-NLS-1$
}
}
@@ -628,6 +629,6 @@
}
public String toString() {
- return "window=0x" + Long.toHexString(windowId) + ", event=" + eventId;
+ return "window=0x" + Long.toHexString(windowId) + ", event=" + eventId; //$NON-NLS-1$ //$NON-NLS-2$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxEventQueue.java Tue Oct 31 00:05:44 2006
@@ -58,7 +58,7 @@
display = factory.getDisplay();
curEvent = x11.createXEvent(false);
performTaskAtom = x11.XInternAtom(display,
- "org.apache.harmony.awt.wtk.perform_task", 0);
+ "org.apache.harmony.awt.wtk.perform_task", 0); //$NON-NLS-1$
}
public boolean waitEvent() {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxSystemProperties.java Tue Oct 31 00:05:44 2006
@@ -126,7 +126,7 @@
public Font getDefaultFont() {
// Default font parameters are described
// in java.awt.Font specification
- return new Font("Dialog", Font.PLAIN, 12);
+ return new Font("Dialog", Font.PLAIN, 12); //$NON-NLS-1$
}
public void init(Map desktopProperties) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/LinuxWindow.java Tue Oct 31 00:05:44 2006
@@ -175,7 +175,7 @@
X11Defs.InputOutput,
X11Defs.CopyFromParent, 0, 0);
*/
- String title = (p.name != null) ? p.name : "";
+ String title = (p.name != null) ? p.name : ""; //$NON-NLS-1$
x11.XSetStandardProperties(display, windowID, title, title, 0,
null, 0, null);
x11.XSelectInput(display, windowID, enabled ? DEFAULT_MASK : DISABLED_MASK);
@@ -482,7 +482,7 @@
public void setTitle(String title) {
if (title == null) {
- title = "";
+ title = ""; //$NON-NLS-1$
}
x11.XStoreName(display, windowID, title);
x11.XSetIconName(display, windowID, title);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/WindowManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/WindowManager.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/WindowManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/WindowManager.java Tue Oct 31 00:05:44 2006
@@ -85,33 +85,33 @@
display = factory.getDisplay();
- XA_ATOM = internAtom("ATOM");
- XA_CARDINAL = internAtom("CARDINAL");
+ XA_ATOM = internAtom("ATOM"); //$NON-NLS-1$
+ XA_CARDINAL = internAtom("CARDINAL"); //$NON-NLS-1$
// WM hints
- WM_PROTOCOLS = internAtom("WM_PROTOCOLS");
- WM_DELETE_WINDOW = internAtom("WM_DELETE_WINDOW");
- WM_TAKE_FOCUS = internAtom("WM_TAKE_FOCUS");
+ WM_PROTOCOLS = internAtom("WM_PROTOCOLS"); //$NON-NLS-1$
+ WM_DELETE_WINDOW = internAtom("WM_DELETE_WINDOW"); //$NON-NLS-1$
+ WM_TAKE_FOCUS = internAtom("WM_TAKE_FOCUS"); //$NON-NLS-1$
// _NET extended hints
- NET_WM_WINDOW_TYPE = internAtom("_NET_WM_WINDOW_TYPE");
- NET_WM_WINDOW_TYPE_DIALOG = internAtom("_NET_WM_WINDOW_TYPE_DIALOG");
- NET_WM_WINDOW_TYPE_NORMAL = internAtom("_NET_WM_WINDOW_TYPE_NORMAL");
- NET_REQUEST_FRAME_EXTENTS = internAtom("_NET_REQUEST_FRAME_EXTENTS");
- NET_WM_STATE = internAtom("_NET_WM_STATE");
- NET_WM_STATE_HIDDEN = internAtom("_NET_WM_STATE_HIDDEN");
- NET_WM_STATE_MAXIMIZED_VERT = internAtom("_NET_WM_STATE_MAXIMIZED_VERT");
- NET_WM_STATE_MAXIMIZED_HORZ = internAtom("_NET_WM_STATE_MAXIMIZED_HORZ");
- NET_WM_STATE_ABOVE = internAtom("_NET_WM_STATE_ABOVE");
- NET_WM_STATE_STAYS_ON_TOP = internAtom("_NET_WM_STATE_STAYS_ON_TOP");
- NET_FRAME_EXTENTS = internAtom("_NET_FRAME_EXTENTS");
+ NET_WM_WINDOW_TYPE = internAtom("_NET_WM_WINDOW_TYPE"); //$NON-NLS-1$
+ NET_WM_WINDOW_TYPE_DIALOG = internAtom("_NET_WM_WINDOW_TYPE_DIALOG"); //$NON-NLS-1$
+ NET_WM_WINDOW_TYPE_NORMAL = internAtom("_NET_WM_WINDOW_TYPE_NORMAL"); //$NON-NLS-1$
+ NET_REQUEST_FRAME_EXTENTS = internAtom("_NET_REQUEST_FRAME_EXTENTS"); //$NON-NLS-1$
+ NET_WM_STATE = internAtom("_NET_WM_STATE"); //$NON-NLS-1$
+ NET_WM_STATE_HIDDEN = internAtom("_NET_WM_STATE_HIDDEN"); //$NON-NLS-1$
+ NET_WM_STATE_MAXIMIZED_VERT = internAtom("_NET_WM_STATE_MAXIMIZED_VERT"); //$NON-NLS-1$
+ NET_WM_STATE_MAXIMIZED_HORZ = internAtom("_NET_WM_STATE_MAXIMIZED_HORZ"); //$NON-NLS-1$
+ NET_WM_STATE_ABOVE = internAtom("_NET_WM_STATE_ABOVE"); //$NON-NLS-1$
+ NET_WM_STATE_STAYS_ON_TOP = internAtom("_NET_WM_STATE_STAYS_ON_TOP"); //$NON-NLS-1$
+ NET_FRAME_EXTENTS = internAtom("_NET_FRAME_EXTENTS"); //$NON-NLS-1$
// KDE specific hints
- KDE_NET_WM_WINDOW_TYPE_OVERRIDE = internAtom("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE");
- KDE_NET_WM_FRAME_STRUT = internAtom("_KDE_NET_WM_FRAME_STRUT");
+ KDE_NET_WM_WINDOW_TYPE_OVERRIDE = internAtom("_KDE_NET_WM_WINDOW_TYPE_OVERRIDE"); //$NON-NLS-1$
+ KDE_NET_WM_FRAME_STRUT = internAtom("_KDE_NET_WM_FRAME_STRUT"); //$NON-NLS-1$
// Motif hints (for Gnome)
- XA_MOTIF_WM_HINTS = internAtom("_MOTIF_WM_HINTS");
+ XA_MOTIF_WM_HINTS = internAtom("_MOTIF_WM_HINTS"); //$NON-NLS-1$
}
long internAtom(String atomName) {
@@ -360,7 +360,7 @@
}
long[] getSupportedHints() {
- final long NET_SUPPORTED = internAtom("_NET_SUPPORTED");
+ final long NET_SUPPORTED = internAtom("_NET_SUPPORTED"); //$NON-NLS-1$
long root = factory.getRootWindow();
long [] supportedHints = getWindowProperty(root, NET_SUPPORTED);
return supportedHints;
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XServerConnection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XServerConnection.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XServerConnection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XServerConnection.java Tue Oct 31 00:05:44 2006
@@ -20,6 +20,7 @@
*/
package org.apache.harmony.awt.wtk.linux;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.linux.X11;
class XServerConnection {
@@ -34,8 +35,10 @@
this.x11 = x11;
display = x11.XOpenDisplay(0); //0 - we use default display only
if (display == 0) {
- String name = System.getProperty("DISPLAY");
- throw new InternalError("Cannot open display '" + (name != null ? name : "") + "'");
+ String name = System.getProperty("DISPLAY"); //$NON-NLS-1$
+ // awt.0F=Cannot open display '{0}'
+ throw new InternalError(Messages.getString("awt.0F", //$NON-NLS-1$
+ (name != null ? name : ""))); //$NON-NLS-1$
}
screen = x11.XDefaultScreen(display);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/linux/org/apache/harmony/awt/wtk/linux/XTestRobot.java Tue Oct 31 00:05:44 2006
@@ -29,6 +29,7 @@
import org.apache.harmony.awt.gl.linux.XGraphicsConfiguration;
import org.apache.harmony.awt.gl.linux.XGraphicsDevice;
import org.apache.harmony.awt.gl.linux.XVolatileImage;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.wtk.NativeRobot;
import org.apache.harmony.awt.nativebridge.Int32Pointer;
@@ -106,7 +107,8 @@
public void keyEvent(int keycode, boolean press) {
int xKeySym = KeyCodeTranslator.VK2XK(keycode);
if (xKeySym == X11Defs.NoSymbol) {
- throw new IllegalArgumentException("Invalid key code");
+ // awt.11=Invalid key code
+ throw new IllegalArgumentException(Messages.getString("awt.11")); //$NON-NLS-1$
}
int xKeyCode = x11.XKeysymToKeycode(dpy, xKeySym);
x11.XTestFakeKeyEvent(dpy, xKeyCode, getBool(press),
@@ -162,7 +164,8 @@
res = x11.XTestQueryExtension(dpy, dummyPtr, dummyPtr,
majorPtr, minorPtr);
if (res != X11Defs.True) {
- throw new AWTError("XTest is not supported by your X server!");
+ // awt.12=XTest is not supported by your X server\!
+ throw new AWTError(Messages.getString("awt.12")); //$NON-NLS-1$
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinClipboard.java Tue Oct 31 00:05:44 2006
@@ -40,7 +40,7 @@
private final WinEventQueue winEventQueue;
public WinClipboard() {
- super("System");
+ super("System"); //$NON-NLS-1$
winEventQueue = ((WinEventQueue) ContextStorage.getNativeEventQueue());
winEventQueue.addPreprocessor(this);
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDTK.java Tue Oct 31 00:05:44 2006
@@ -47,7 +47,7 @@
private long dataTransferWindow;
private long windowProc;
private static final String windowClass =
- "org.apache.harmony.awt.datatransfer.window";
+ "org.apache.harmony.awt.datatransfer.window"; //$NON-NLS-1$
@Override
protected NativeClipboard newNativeClipboard() {
@@ -95,7 +95,7 @@
@Override
public String getDefaultCharset() {
- return "utf-16le";
+ return "utf-16le"; //$NON-NLS-1$
}
public long windowProc(long hwnd, int msg, long wParam, long lParam) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java?view=diff&rev=469404&r1=469403&r2=469404
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/datatransfer/windows/WinDropTarget.java Tue Oct 31 00:05:44 2006
@@ -36,6 +36,7 @@
import org.apache.harmony.awt.ComponentInternals;
import org.apache.harmony.awt.datatransfer.DataProxy;
import org.apache.harmony.awt.datatransfer.DataSnapshot;
+import org.apache.harmony.awt.internal.nls.Messages;
import org.apache.harmony.awt.nativebridge.windows.WinDataTransfer;
import org.apache.harmony.awt.nativebridge.windows.WindowsDefs;
import org.apache.harmony.awt.wtk.NativeWindow;
@@ -113,8 +114,8 @@
public Transferable getTransferable() throws InvalidDnDOperationException {
if (transferable == null) {
- throw new InvalidDnDOperationException(
- "Transfer data is not available");
+ // awt.14=Transfer data is not available
+ throw new InvalidDnDOperationException(Messages.getString("awt.14")); //$NON-NLS-1$
}
return transferable;
}