Sanity (jikes falls over these)

grendel/addressbook/AddressBook.java

@@ -284,7 +284,7 @@ public class AddressBook extends JFrame {
     class NewCard extends UIAction {
         NewCard() {
             super(newCardTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -299,7 +299,7 @@ public class AddressBook extends JFrame {
     class SaveAs extends UIAction {
         SaveAs() {
             super(saveAsTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
         public void actionPerformed(ActionEvent ae) {
             NewCardDialog aDialog = new NewCardDialog(getParentFrame());
@@ -313,7 +313,7 @@ public class AddressBook extends JFrame {
     class CloseWindow extends UIAction {
         CloseWindow() {
             super(closeWindowTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -332,7 +332,7 @@ public class AddressBook extends JFrame {
     class Undo extends UIAction {
         Undo() {
             super(undoTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
         public void actionPerformed(ActionEvent e) {}
     }
@@ -343,7 +343,7 @@ public class AddressBook extends JFrame {
     class HideMessageToolbar extends UIAction {
         HideMessageToolbar() {
             super(hideMessageToolbarTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
 
         public void actionPerformed(ActionEvent e) {}
@@ -354,7 +354,7 @@ public class AddressBook extends JFrame {
     class Search extends UIAction {
         Search() {
             super(newListTag);
-            setEnabled(true);
+            this.setEnabled(true);
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -583,7 +583,7 @@ System.out.println ("Done.");
     class StatusBar extends JPanel {
         public StatusBar() {
             super();
-                setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
+                this.setLayout(new BoxLayout(this, BoxLayout.X_AXIS));
         }
 
         public void paint(Graphics g) {
@@ -600,7 +600,7 @@ System.out.println ("Done.");
                 //super(true);
 
             setBorder (new EmptyBorder(10,10,10,10));
-                setLayout (new BorderLayout(10, 5));
+                this.setLayout (new BorderLayout(10, 5));
 
             add(createSearchPane(aDataSourceList), BorderLayout.NORTH);
             add(createTable(),      BorderLayout.CENTER);

grendel/calypso/util/Atom.java

@@ -33,7 +33,7 @@ public final class Atom {
   /**
    * Private constructor used by static allocators.
    */
-  private Atom(String aString, int aHashCode) {
+  protected Atom(String aString, int aHashCode) {
     fString = aString;
     fHashCode = aHashCode;
   }

grendel/composition/AddressList.java

@@ -137,7 +137,7 @@ public class AddressList extends JScrollPane implements Serializable {
 
         public AddressPanel () {
             super();
-            setLayout (null);
+            this.setLayout (null);
 
             //vector for holding addressee list.
             mAddressees = new Vector();
@@ -430,7 +430,7 @@ public class AddressList extends JScrollPane implements Serializable {
 
         public AddressLine (Addressee aAddressee) {
             super();
-            setLayout (null);   //see doLayout.
+            this.setLayout (null);   //see doLayout.
 
             //left side delivery button ("To:")
             mDeliveryButton = new DeliveryButton (aAddressee.getDelivery());

grendel/composition/AttachmentsList.java

@@ -121,7 +121,7 @@ public class AttachmentsList extends JScrollPane implements Serializable {
             super ();
 
             //do your own layout.
-            setLayout (null);
+            this.setLayout (null);
 
             //Get your own mouse events.
             //  used to diaply file dialog when mouse down on background.

grendel/filters/MoveFilterActionFactory.java

@@ -42,7 +42,7 @@ implements IFilterActionFactory {
         private Folder fTargetFolder;
 
         // constructors
-    private MoveFilterAction(Folder folder) {
+    protected MoveFilterAction(Folder folder) {
           fTargetFolder = folder;
         }