harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apavle...@apache.org
Subject svn commit: r636031 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/java: common/java/awt/ common/java/awt/color/ common/java/awt/print/ common/org/apache/harmony/awt/ common/org/apache/harmony/awt/gl/font/fontlib/ common/org/apache/harmony/...
Date Tue, 11 Mar 2008 17:46:02 GMT
Author: apavlenko
Date: Tue Mar 11 10:45:57 2008
New Revision: 636031

URL: http://svn.apache.org/viewvc?rev=636031&view=rev
Log:
Secured actions wrapped in PrivilegedAction objects

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Cursor.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/color/ICC_Profile.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Utils.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/fontlib/FLFontManager.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultFileDialog.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/XServerConnection.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Component.java
Tue Mar 11 10:45:57 2008
@@ -947,8 +947,8 @@
         PrivilegedAction<String[]> action = new PrivilegedAction<String[]>()
{
             public String[] run() {
                 String properties[] = new String[2];
-                properties[0] = System.getProperty("awt.image.redrawrate", "100"); //$NON-NLS-1$
//$NON-NLS-2$
-                properties[1] = System.getProperty("awt.image.incrementaldraw", "true");
//$NON-NLS-1$ //$NON-NLS-2$
+                properties[0] = org.apache.harmony.awt.Utils.getSystemProperty("awt.image.redrawrate",
"100"); //$NON-NLS-1$ //$NON-NLS-2$
+                properties[1] = org.apache.harmony.awt.Utils.getSystemProperty("awt.image.incrementaldraw",
"true"); //$NON-NLS-1$ //$NON-NLS-2$
                 return properties;
             }
         };

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Cursor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Cursor.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Cursor.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Cursor.java
Tue Mar 11 10:45:57 2008
@@ -195,7 +195,7 @@
         }
         String sep = File.separator;
         String cursorsDir = "lib" + sep + "images" + sep + "cursors"; //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
-        String cursorsAbsDir = System.getProperty("java.home") + sep + //$NON-NLS-1$
+        String cursorsAbsDir = org.apache.harmony.awt.Utils.getSystemProperty("java.home")
+ sep + //$NON-NLS-1$
                                 cursorsDir;
         String cursorPropsFileName = "cursors.properties"; //$NON-NLS-1$
         String cursorPropsFullFileName = (cursorsAbsDir + sep +

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Font.java Tue
Mar 11 10:45:57 2008
@@ -593,7 +593,7 @@
     }
 
     public static Font getFont(String sp, Font f) {
-        String pr = System.getProperty(sp);
+        String pr = org.apache.harmony.awt.Utils.getSystemProperty(sp);
         if (pr == null) {
             return f;
         }

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/GraphicsEnvironment.java
Tue Mar 11 10:45:57 2008
@@ -61,11 +61,7 @@
 
     public static boolean isHeadless() {
         if (isHeadless == null) {
-            isHeadless = AccessController.doPrivileged(new PrivilegedAction<Boolean>()
{
-                public Boolean run() {
-                    return "true".equals(System.getProperty("java.awt.headless")); //$NON-NLS-1$
//$NON-NLS-2$
-                }
-            });
+            isHeadless = "true".equals(org.apache.harmony.awt.Utils.getSystemProperty("java.awt.headless"));
//$NON-NLS-1$ //$NON-NLS-2$
         }
         
         return isHeadless.booleanValue();

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java
Tue Mar 11 10:45:57 2008
@@ -1276,12 +1276,8 @@
     private static Theme createTheme() {
         String osName = System.getProperty("os.name").toLowerCase(); //$NON-NLS-1$
         String packageBase = "org.apache.harmony.awt.theme", win = "windows", lin = "linux";
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        PrivilegedAction<String> action = new PrivilegedAction<String>() {
-            public String run() {
-                return System.getProperty("awt.theme"); //$NON-NLS-1$
-            }
-        };
-        String className = AccessController.doPrivileged(action);
+        String className = org.apache.harmony.awt.Utils.getSystemProperty("awt.theme"); //$NON-NLS-1$
+
         if (className == null) {
             if (osName.startsWith(lin)) {
                 className = packageBase + "." + lin + ".LinuxTheme"; //$NON-NLS-1$ //$NON-NLS-2$

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Window.java
Tue Mar 11 10:45:57 2008
@@ -662,12 +662,9 @@
         if (sm.checkTopLevelWindow(this)) {
             return null;
         }
-        PrivilegedAction<String> action = new PrivilegedAction<String>() {
-            public String run() {
-                return System.getProperty("awt.appletWarning", "Warning: Java window"); //$NON-NLS-1$
//$NON-NLS-2$
-            }
-        };
-        return AccessController.doPrivileged(action);
+
+        return org.apache.harmony.awt.Utils.getSystemProperty(
+                        "awt.appletWarning", "Warning: Java window"); //$NON-NLS-1$ //$NON-NLS-2$
     }
 
     public boolean isActive() {

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/color/ICC_Profile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/color/ICC_Profile.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/color/ICC_Profile.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/color/ICC_Profile.java
Tue Mar 11 10:45:57 2008
@@ -586,19 +586,19 @@
                         } catch (FileNotFoundException e) {}
 
                         // Check java.iccprofile.path entries
-                        fiStream = tryPath(System.getProperty("java.iccprofile.path"), fName);
//$NON-NLS-1$
+                        fiStream = tryPath(org.apache.harmony.awt.Utils.getSystemProperty("java.iccprofile.path"),
fName); //$NON-NLS-1$
                         if (fiStream != null) {
                             return fiStream;
                         }
 
                         // Check java.class.path entries
-                        fiStream = tryPath(System.getProperty("java.class.path"), fName);
//$NON-NLS-1$
+                        fiStream = tryPath(org.apache.harmony.awt.Utils.getSystemProperty("java.class.path"),
fName); //$NON-NLS-1$
                         if (fiStream != null) {
                             return fiStream;
                         }
 
                         // Check directory with java sample profiles
-                        String home = System.getProperty("java.home"); //$NON-NLS-1$
+                        String home = org.apache.harmony.awt.Utils.getSystemProperty("java.home");
//$NON-NLS-1$
                         if (home != null) {
                             fiStream = tryPath(
                                     home + File.separatorChar +

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/print/PrinterJob.java
Tue Mar 11 10:45:57 2008
@@ -77,7 +77,7 @@
         return AccessController.doPrivileged(
                 new PrivilegedAction<PrinterJob>() {
             public PrinterJob run() {
-                String s = System.getProperty("java.awt.printerjob"); //$NON-NLS-1$
+                String s = org.apache.harmony.awt.Utils.getSystemProperty("java.awt.printerjob");
//$NON-NLS-1$
 
                 if (s == null || s.equals("")){ //$NON-NLS-1$
                     s = "java.awt.print.PrinterJobImpl"; //$NON-NLS-1$

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Utils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Utils.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Utils.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/Utils.java
Tue Mar 11 10:45:57 2008
@@ -25,9 +25,13 @@
 public final class Utils {
 
     public static String getSystemProperty(final String name) {
+        return getSystemProperty(name, null);
+    }
+    
+    public static String getSystemProperty(final String name, final String value) {
         return AccessController.doPrivileged(new PrivilegedAction<String>() {
             public String run() {
-                return System.getProperty(name);
+                return System.getProperty(name, value);
             }
         });
     }

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/fontlib/FLFontManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/fontlib/FLFontManager.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/fontlib/FLFontManager.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/gl/font/fontlib/FLFontManager.java
Tue Mar 11 10:45:57 2008
@@ -52,7 +52,7 @@
 
         initManager();
         
-        addPath(new File(System.getProperty("java.home") + "/lib/fonts/"));
+        addPath(new File(org.apache.harmony.awt.Utils.getSystemProperty("java.home") + "/lib/fonts/"));
         addPath(new File("C:\\WINNT\\Fonts"));
         addPath(new File("/usr/X11R6/lib/X11/fonts/Type1/"));
         addPath(new File("/usr/X11R6/lib/X11/fonts/truetype/"));

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/im/IMManager.java
Tue Mar 11 10:45:57 2008
@@ -316,7 +316,7 @@
     
     private static String getInputStyle() {
         String propName = INPUT_STYLE_PROP;
-        String inputStyle = System.getProperty(propName);
+        String inputStyle = org.apache.harmony.awt.Utils.getSystemProperty(propName);
         if (inputStyle != null) {
             return inputStyle;
         }

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultFileDialog.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultFileDialog.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultFileDialog.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/org/apache/harmony/awt/theme/DefaultFileDialog.java
Tue Mar 11 10:45:57 2008
@@ -229,7 +229,7 @@
     }
 
     private File getDefaultFolder() {
-        return new File(System.getProperty("user.dir")); //$NON-NLS-1$
+        return new File(org.apache.harmony.awt.Utils.getSystemProperty("user.dir")); //$NON-NLS-1$
     }
 
     private void addListeners() {

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/LinuxGraphics2DFactory.java
Tue Mar 11 10:45:57 2008
@@ -45,7 +45,7 @@
         inst = new LinuxGraphics2DFactory();
     }
     public Graphics2D getGraphics2D(NativeWindow nw, int tx, int ty, MultiRectArea clip)
{
-        String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+        String opengl = org.apache.harmony.awt.Utils.getSystemProperty("java2d.opengl");
//$NON-NLS-1$
         boolean useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
         return useOpenGL ?
                 (Graphics2D) new OGLGraphics2D(nw, tx, ty, clip) :
@@ -53,7 +53,7 @@
     }
 
     public Graphics2D getGraphics2D(NativeWindow nw, int tx, int ty, int width, int height)
{
-        String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+        String opengl = org.apache.harmony.awt.Utils.getSystemProperty("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) :

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/gl/linux/XGraphicsDevice.java
Tue Mar 11 10:45:57 2008
@@ -131,7 +131,7 @@
         // Allocate array for configurations
         configs = new XGraphicsConfiguration[numVisualInfos];
 
-        String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
+        String opengl = org.apache.harmony.awt.Utils.getSystemProperty("java2d.opengl");
//$NON-NLS-1$
         boolean useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
 
         for (int i=0; i<numVisualInfos; i++) {

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/XServerConnection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/XServerConnection.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/XServerConnection.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/unix/org/apache/harmony/awt/wtk/linux/XServerConnection.java
Tue Mar 11 10:45:57 2008
@@ -37,7 +37,7 @@
         this.x11 = X11.getInstance();;
         display = x11.XOpenDisplay(0); //0 - we use default display only
         if (display == 0) {
-            String name = System.getProperty("DISPLAY"); //$NON-NLS-1$
+            String name = org.apache.harmony.awt.Utils.getSystemProperty("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$

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/GDIPTextRenderer.java
Tue Mar 11 10:45:57 2008
@@ -52,7 +52,7 @@
     int curPenColor;
     
     // Print debug output or not
-    protected static final boolean debugOutput = "1".equals(System.getProperty("g2d.debug"));
//$NON-NLS-1$ //$NON-NLS-2$
+    protected static final boolean debugOutput = "1".equals(org.apache.harmony.awt.Utils.getSystemProperty("g2d.debug"));
//$NON-NLS-1$ //$NON-NLS-2$
 
     public static final GDIPTextRenderer inst = new GDIPTextRenderer();
 

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/gl/windows/WinGraphicsDevice.java
Tue Mar 11 10:45:57 2008
@@ -55,8 +55,8 @@
     static boolean useOpenGL;
     static boolean useGDI;
     static {
-        String opengl = System.getProperty("java2d.opengl"); //$NON-NLS-1$
-        String gdi = System.getProperty("java2d.gdi"); //$NON-NLS-1$
+        String opengl = org.apache.harmony.awt.Utils.getSystemProperty("java2d.opengl");
//$NON-NLS-1$
+        String gdi = org.apache.harmony.awt.Utils.getSystemProperty("java2d.gdi"); //$NON-NLS-1$
         useOpenGL = opengl != null && opengl.equals("true"); //$NON-NLS-1$
         useGDI = gdi != null && gdi.equals("true"); //$NON-NLS-1$
     };

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java?rev=636031&r1=636030&r2=636031&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/windows/org/apache/harmony/awt/theme/windows/WinFileDialog.java
Tue Mar 11 10:45:57 2008
@@ -223,7 +223,7 @@
 
     private void setDir(String dirName) {
         if (dirName == null) {
-            dirName = System.getProperty("user.dir"); //$NON-NLS-1$
+            dirName = org.apache.harmony.awt.Utils.getSystemProperty("user.dir"); //$NON-NLS-1$
         }
         ofn.set_lpstrInitialDir(nb.createInt16Pointer(dirName, false));
     }



Mime
View raw message