[cp-patches] FYI: javax.swing indentation fixups

[Mark Wielaard]

Hi,

Apparently libgcj hackers cannot be bothered to either post the actual
patch the are committing on libgcj or add a little warning that the
attached patch isn't the real patch as they will commit it, so here is a
some reindentation fixups for javax.swing to get us in line with libgcj
gui again.

2004-11-11  Mark Wielaard  <address@hidden>

        * javax/swing/plaf/basic/BasicTableHeaderUI.java: Indentation fixups.
        * javax/swing/plaf/basic/BasicViewportUI.java: Likewise.
        * javax/swing/text/PlainDocument.java: Likewise.
        * javax/swing/text/SimpleAttributeSet.java: Likewise.
        * javax/swing/text/Utilities.java: Likewise.

Committed.

Please make my merging job a little easier and at least mention that you
are committing something else than you post.

Thanks,

Mark

Index: javax/swing/plaf/basic/BasicTableHeaderUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTableHeaderUI.java,v
retrieving revision 1.4
diff -u -r1.4 BasicTableHeaderUI.java
--- javax/swing/plaf/basic/BasicTableHeaderUI.java      11 Nov 2004 17:22:52 
-0000      1.4
+++ javax/swing/plaf/basic/BasicTableHeaderUI.java      11 Nov 2004 22:29:09 
-0000
@@ -181,7 +181,7 @@
       }
 
   }
-
+  
   public Dimension getPreferredSize(JComponent c)
   {
     TableColumnModel cmod = header.getColumnModel();
Index: javax/swing/plaf/basic/BasicViewportUI.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicViewportUI.java,v
retrieving revision 1.11
diff -u -r1.11 BasicViewportUI.java
--- javax/swing/plaf/basic/BasicViewportUI.java 11 Nov 2004 17:22:52 -0000      
1.11
+++ javax/swing/plaf/basic/BasicViewportUI.java 11 Nov 2004 22:29:09 -0000
@@ -120,7 +120,7 @@
   }
 
   public void paint(Graphics g, JComponent c)
-  {      
+  {
     JViewport port = (JViewport)c;
     Component view = port.getView();
 
Index: javax/swing/text/PlainDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/PlainDocument.java,v
retrieving revision 1.5
diff -u -r1.5 PlainDocument.java
--- javax/swing/text/PlainDocument.java 11 Nov 2004 22:23:17 -0000      1.5
+++ javax/swing/text/PlainDocument.java 11 Nov 2004 22:29:09 -0000
@@ -85,9 +85,9 @@
         
       }
     catch (BadLocationException e)
-  {
+      {
         lines = new Element[1];
-    lines[0] = createLeafElement(rootElement, null, 0, 1);
+        lines[0] = createLeafElement(rootElement, null, 0, 1);
       }
 
     ((BranchElement) rootElement).replace(0, rootElement.getElementCount(), 
lines);
Index: javax/swing/text/SimpleAttributeSet.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/text/SimpleAttributeSet.java,v
retrieving revision 1.4
diff -u -r1.4 SimpleAttributeSet.java
--- javax/swing/text/SimpleAttributeSet.java    11 Nov 2004 17:22:52 -0000      
1.4
+++ javax/swing/text/SimpleAttributeSet.java    11 Nov 2004 22:29:09 -0000
@@ -58,7 +58,7 @@
   {
     tab = new Hashtable();
     if (a != null)
-    addAttributes(a);
+      addAttributes(a);
   }
 
   public void addAttribute(Object name, Object value)
Index: javax/swing/text/Utilities.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/Utilities.java,v
retrieving revision 1.3
diff -u -r1.3 Utilities.java
--- javax/swing/text/Utilities.java     11 Nov 2004 22:23:17 -0000      1.3
+++ javax/swing/text/Utilities.java     11 Nov 2004 22:29:09 -0000
@@ -101,14 +101,14 @@
         if (c == '\t' || c == '\n')
           {
             if (len > 0) {
-           g.drawChars(buffer, pos, len, pixelX, pixelY + ascent);            
-            pixelX += pixelWidth;
-            pixelWidth = 0;
+              g.drawChars(buffer, pos, len, pixelX, pixelY + ascent);          
  
+              pixelX += pixelWidth;
+              pixelWidth = 0;
             }
             pos = offset+1;
             len = 0;
           }
-          
+        
        switch (c)
          {
          case '\t':

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