harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r535163 - in /harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt: HeadlessGraphicsEnvironment.java HeadlessToolkit.java Toolkit.java
Date Fri, 04 May 2007 10:59:38 GMT
Author: apetrenko
Date: Fri May  4 03:59:37 2007
New Revision: 535163

URL: http://svn.apache.org/viewvc?view=rev&rev=535163
Log:
Some japitools errors are fixed in awt module

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessGraphicsEnvironment.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java
    harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/Toolkit.java

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessGraphicsEnvironment.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessGraphicsEnvironment.java?view=diff&rev=535163&r1=535162&r2=535163
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessGraphicsEnvironment.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessGraphicsEnvironment.java
Fri May  4 03:59:37 2007
@@ -21,7 +21,7 @@
 
 import org.apache.harmony.awt.gl.CommonGraphicsEnvironment;
 
-public class HeadlessGraphicsEnvironment extends CommonGraphicsEnvironment {
+class HeadlessGraphicsEnvironment extends CommonGraphicsEnvironment {
     
     @Override
     public boolean isHeadlessInstance() {

Modified: harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java?view=diff&rev=535163&r1=535162&r2=535163
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/awt/src/main/java/common/java/awt/HeadlessToolkit.java
Fri May  4 03:59:37 2007
@@ -38,7 +38,7 @@
 import org.apache.harmony.awt.wtk.NativeEventQueue;
 import org.apache.harmony.awt.wtk.WindowFactory;
 
-public final class HeadlessToolkit extends ToolkitImpl {
+final class HeadlessToolkit extends ToolkitImpl {
 
     private class EventMonitor {}
     private final Object eventMonitor = new EventMonitor();
@@ -233,14 +233,12 @@
     }
     
     @Override
-    protected void init() {
+    void init() {
         lockAWT();
         try {
             ComponentInternals.setComponentInternals(new ComponentInternalsImpl());
             new EventQueue(this); // create the system EventQueue
             dispatcher = new Dispatcher(this);
-            desktopProperties = new HashMap<String, Object>();
-            desktopPropsSupport = new PropertyChangeSupport(this);
             awtEventsManager = new AWTEventsManager();
             dispatchThread = new HeadlessEventDispatchThread(this, dispatcher);         
  
             dtk = DTK.getDTK();

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?view=diff&rev=535163&r1=535162&r2=535163
==============================================================================
--- 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
Fri May  4 03:59:37 2007
@@ -151,9 +151,9 @@
      */
     private final HashSet<String> userPropSet = new HashSet<String>();
 
-    protected Map<String, Object> desktopProperties;
+    protected final Map<String, Object> desktopProperties;
 
-    protected PropertyChangeSupport desktopPropsSupport;
+    protected final PropertyChangeSupport desktopPropsSupport;
 
     /**
      * For this component the native window is being created
@@ -170,7 +170,7 @@
 
     DTK dtk;
 
-    protected final class ComponentInternalsImpl extends ComponentInternals {
+    final class ComponentInternalsImpl extends ComponentInternals {
         @Override
         public NativeWindow getNativeWindow(Component component) {
             lockAWT();
@@ -534,18 +534,18 @@
     }
     
     public Toolkit() {        
+        desktopProperties = new HashMap<String, Object>();
+        desktopPropsSupport = new PropertyChangeSupport(this);
         init();
     }
 
-    protected void init() {
+    void init() {
         lockAWT();
         try {
             ComponentInternals.setComponentInternals(new ComponentInternalsImpl());
             new EventQueue(this); // create the system EventQueue
             dispatcher = new Dispatcher(this);
             final String className = getWTKClassName();
-            desktopProperties = new HashMap<String, Object>();
-            desktopPropsSupport = new PropertyChangeSupport(this);
             awtEventsManager = new AWTEventsManager();
             dispatchThread = new EventDispatchThread(this, dispatcher);
             nativeThread = new NativeEventThread();



Mime
View raw message