[cp-patches] FYI: Some reindentations to sync with libgcj gui branch

[Mark Wielaard]

Hi,

Some more reindentations to sync with the libgcj gui branch.
No code was changed.

2004-07-31  Mark Wielaard  <address@hidden>
 
        * java/awt/Component.java: Reindent.
        * java/awt/im/InputContext.java: Reindent.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:
        Reindent.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Reindent.

Committed.

Mark

Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.37
diff -u -r1.37 Component.java
--- java/awt/Component.java     31 Jul 2004 17:40:15 -0000      1.37
+++ java/awt/Component.java     31 Jul 2004 22:11:43 -0000
@@ -2231,9 +2231,9 @@
    * calls address@hidden #postEvent}.
    *
    * @param e the event to deliver
-   * @deprecated use address@hidden #dispatchEvent(AWTEvent)} instead
+   * @deprecated use address@hidden #dispatchEvent (AWTEvent)} instead
    */
-  public void deliverEvent(Event e)
+  public void deliverEvent (Event e)
   {
     postEvent (e);
   }
@@ -2265,7 +2265,7 @@
    * @return true if the event was handled, false otherwise
    * @deprecated use address@hidden #dispatchEvent(AWTEvent)} instead
    */
-  public boolean postEvent(Event e)
+  public boolean postEvent (Event e)
   {
     boolean handled = handleEvent (e);
 
@@ -3162,9 +3162,9 @@
    *
    * @param evt the event to handle
    * @return true if the event was handled, false otherwise
-   * @deprecated use address@hidden #processEvent(AWTEvent)} instead
+   * @deprecated use address@hidden #processEvent (AWTEvent)} instead
    */
-  public boolean handleEvent(Event evt)
+  public boolean handleEvent (Event evt)
   {
     switch (evt.id)
       {
@@ -3821,10 +3821,10 @@
                                                          currentFocusOwner));
                           }
                         else
-                    eq.postEvent (new FocusEvent(this, 
FocusEvent.FOCUS_GAINED, temporary));
+                          eq.postEvent (new FocusEvent(this, 
FocusEvent.FOCUS_GAINED, temporary));
+                      }
                   }
               }
-              }
             else
               // FIXME: need to add a focus listener to our top-level
               // ancestor, so that we can post this event when it becomes
@@ -3938,10 +3938,10 @@
                                                              
currentFocusOwner));
                               }
                             else
-                        eq.postEvent (new FocusEvent(this, 
FocusEvent.FOCUS_GAINED, temporary));
+                              eq.postEvent (new FocusEvent(this, 
FocusEvent.FOCUS_GAINED, temporary));
+                          }
                       }
                   }
-                  }
                 else
                   return false;
               }
@@ -4685,7 +4685,7 @@
    *
    * @param e the event to dispatch
    */
-  void dispatchEventImpl(AWTEvent e)
+  void dispatchEventImpl (AWTEvent e)
   {
     Event oldEvent = translateEvent (e);
 
@@ -4693,7 +4693,7 @@
       postEvent (oldEvent);
 
     if (eventTypeEnabled (e.id))
-      processEvent(e);
+      processEvent (e);
   }
 
   /**
Index: java/awt/im/InputContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/im/InputContext.java,v
retrieving revision 1.5
diff -u -r1.5 InputContext.java
--- java/awt/im/InputContext.java       16 Jul 2004 08:33:10 -0000      1.5
+++ java/awt/im/InputContext.java       31 Jul 2004 22:11:44 -0000
@@ -100,8 +100,8 @@
     while (e.hasMoreElements())
       {
         URL url = (URL) e.nextElement();
-        BufferedReader in = null;
-        String line = null;
+        BufferedReader in;
+        String line;
         try
           {
             in = new BufferedReader
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkFileDialogPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c       25 Jul 
2004 16:28:28 -0000      1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c       31 Jul 
2004 22:11:44 -0000
@@ -41,8 +41,8 @@
 #include "gnu_java_awt_peer_gtk_GtkFileDialogPeer.h"
 
 static void handle_response (GtkDialog *dialog,
-                           gint responseId,
-                           jobject peer_obj);
+                             gint responseId,
+                             jobject peer_obj);
 
 /*
  * Make a new file selection dialog
@@ -114,7 +114,7 @@
   g_signal_connect (G_OBJECT (GTK_DIALOG (ptr)),
                     "response", 
                    GTK_SIGNAL_FUNC (handle_response), *gref);
-                   
+
   gdk_threads_leave ();
 
   /* Connect the superclass signals.  */
@@ -129,7 +129,7 @@
   const char *str;
 
   ptr = NSA_GET_PTR (env, obj);
-    
+
   gdk_threads_enter ();
 
   str = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER(ptr));
@@ -158,7 +158,7 @@
                                              "(Ljava/lang/String;)Z");
 
   filename = (*gdk_env)->NewStringUTF(gdk_env, filter_info->filename);
-  
+
   gdk_threads_leave();
   accepted = (*gdk_env)->CallBooleanMethod(gdk_env, obj, id, filename);
   gdk_threads_enter();
@@ -169,7 +169,7 @@
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter
     (JNIEnv *env, jobject obj, jobject filter_obj)
-    {
+{
   void *ptr;
   GtkFileFilter *filter;
 
@@ -187,8 +187,8 @@
   gtk_file_chooser_set_filter(GTK_FILE_CHOOSER(ptr), filter);
 
   gdk_threads_leave ();
-    }
-    
+}
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetDirectory
     (JNIEnv *env, jobject obj, jstring directory)
@@ -217,7 +217,7 @@
   ptr = NSA_GET_PTR (env, obj);
     
   str = (*env)->GetStringUTFChars (env, filename, 0);
-
+     
   gdk_threads_enter ();
   gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (ptr), str);
   gdk_threads_leave ();
@@ -228,7 +228,7 @@
 static void
 handle_response (GtkDialog *dialog __attribute__((unused)),
                  gint responseId,
-                       jobject peer_obj)
+                 jobject peer_obj)
 {
   static int isDisposeIDSet = 0;
   static int isIDSet = 0;
@@ -245,26 +245,26 @@
       && responseId != GTK_RESPONSE_OK
       && responseId != GTK_RESPONSE_CANCEL)
     return;
-  
+
   ptr = NSA_GET_PTR (gdk_env, peer_obj);
-  
+
   if (responseId == GTK_RESPONSE_DELETE_EVENT)
   {
     if (!isDisposeIDSet)
-    {
-      jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj);
+      {
+        jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj);
         disposeID = (*gdk_env)->GetMethodID (gdk_env, cx, 
"gtkDisposeFileDialog", "()V");
         isDisposeIDSet = 1;
-    }
-    
-  gdk_threads_leave ();
+      }
   
+    gdk_threads_leave ();
+
     /* We can dispose of the dialog now (and unblock show) */
     (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, disposeID);
 
-  gdk_threads_enter ();
+    gdk_threads_enter ();
     return;
-}
+  }
 
   if (responseId == GTK_RESPONSE_OK) {
     fileName = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (GTK_WIDGET 
(ptr)));
@@ -272,18 +272,18 @@
   } else if (responseId == GTK_RESPONSE_CANCEL) {
     str_fileName = NULL;
   }
-  
+
   if (!isIDSet)
     {
       jclass cx = (*gdk_env)->GetObjectClass (gdk_env, peer_obj);
       hideID = (*gdk_env)->GetMethodID (gdk_env, cx, "gtkHideFileDialog", 
"()V");
       gtkSetFilenameID = (*gdk_env)->GetMethodID (gdk_env, cx,
-                                   "gtkSetFilename", "(Ljava/lang/String;)V");
+                                   "gtkSetFilename", "(Ljava.lang.String;)V");
       isIDSet = 1;
     }
     
   gdk_threads_leave ();
-
+  
   /* Set the Java object field 'file' with this value. */
   (*gdk_env)->CallVoidMethod (gdk_env, peer_obj, gtkSetFilenameID, 
str_fileName);
 
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkListPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c     26 Jun 2004 
16:07:03 -0000      1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c     31 Jul 2004 
22:11:44 -0000
@@ -1,5 +1,5 @@
-/* gtklistpeer.c -- Native implementation of GtkListPeer
-   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
+/* GtkListPeer.c -- implements GtkListPeer's native methods
+   Copyright (C) 1998, 1999, 2003, 2004 Free Software Foundation, Inc.
 
    This file is part of GNU Classpath.

signature.asc
Description: This is a digitally signed message part