1.5 annotation fix

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index b35495f..bf0d052 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -54,7 +54,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
   private class JalviewChangeSupport implements PropertyChangeListener
   {
-    @Override
     public void propertyChange(PropertyChangeEvent evt)
     {
       // Handle change events - most are simply routed to other sources

diff --git a/src/jalview/gui/WsJobParameters.java b/src/jalview/gui/WsJobParameters.java
index b651833..0e206b4 100644 (file)
--- a/src/jalview/gui/WsJobParameters.java
+++ b/src/jalview/gui/WsJobParameters.java
@@ -769,7 +769,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
       showDesc.addActionListener(new ActionListener()
       {
 
-        @Override
         public void actionPerformed(ActionEvent e)
         {
           descisvisible = !descisvisible;
@@ -979,7 +978,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
     }
 
-    @Override
     public void stateChanged(ChangeEvent e)
     {
       if (!adjusting)
@@ -992,7 +990,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
     }
 
-    @Override
     public void actionPerformed(ActionEvent e)
     {
       if (adjusting)
@@ -1114,7 +1111,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
       return option;
     }
 
-    @Override
     public void actionPerformed(ActionEvent e)
     {
       if (e.getSource() != enabled)
@@ -1231,47 +1227,40 @@ public class WsJobParameters extends JPanel implements ItemListener,
         jf.addWindowListener(new WindowListener()
         {
 
-          @Override
           public void windowActivated(WindowEvent e)
           {
             // TODO Auto-generated method stub
 
           }
 
-          @Override
           public void windowClosed(WindowEvent e)
           {
           }
 
-          @Override
           public void windowClosing(WindowEvent e)
           {
             thr.interrupt();
 
           }
 
-          @Override
           public void windowDeactivated(WindowEvent e)
           {
             // TODO Auto-generated method stub
 
           }
 
-          @Override
           public void windowDeiconified(WindowEvent e)
           {
             // TODO Auto-generated method stub
 
           }
 
-          @Override
           public void windowIconified(WindowEvent e)
           {
             // TODO Auto-generated method stub
 
           }
 
-          @Override
           public void windowOpened(WindowEvent e)
           {
             // TODO Auto-generated method stub
@@ -1428,7 +1417,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
 
   String curSetName = null;
 
-  @Override
   public void itemStateChanged(ItemEvent e)
   {
     if (settingDialog)
@@ -1468,7 +1456,6 @@ public class WsJobParameters extends JPanel implements ItemListener,
    */
   String lastDescrText = null;
 
-  @Override
   public void actionPerformed(ActionEvent e)
   {
     if (e.getSource() instanceof Component)
@@ -1516,19 +1503,16 @@ public class WsJobParameters extends JPanel implements ItemListener,
     }
   }
 
-  @Override
   public void insertUpdate(DocumentEvent e)
   {
     checkDescrModified();
   }
 
-  @Override
   public void removeUpdate(DocumentEvent e)
   {
     checkDescrModified();
   }
 
-  @Override
   public void changedUpdate(DocumentEvent e)
   {
     checkDescrModified();

diff --git a/src/jalview/gui/WsPreferences.java b/src/jalview/gui/WsPreferences.java
index 7ca4fd5..8bf81bb 100644 (file)
--- a/src/jalview/gui/WsPreferences.java
+++ b/src/jalview/gui/WsPreferences.java
@@ -212,7 +212,6 @@ public class WsPreferences extends GWsPreferences
   {
     new Thread(new Runnable() {
 
-      @Override
       public void run()
       {
         updateWsMenuConfig(false);
@@ -228,7 +227,6 @@ public class WsPreferences extends GWsPreferences
     {
       new Thread(new Runnable() {
 
-        @Override
         public void run()
         {
           progressBar.setVisible(true);
@@ -244,7 +242,6 @@ public class WsPreferences extends GWsPreferences
     } else {
       new Thread(new Runnable() {
 
-        @Override
         public void run()
         {
           Desktop.instance.startServiceDiscovery(false);

diff --git a/src/jalview/jbgui/GWsPreferences.java b/src/jalview/jbgui/GWsPreferences.java
index 4ffd193..7885d12 100644 (file)
--- a/src/jalview/jbgui/GWsPreferences.java
+++ b/src/jalview/jbgui/GWsPreferences.java
@@ -223,42 +223,31 @@ public class GWsPreferences extends JPanel
     wsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
     wsList.addMouseListener(new MouseListener() {
 
-      @Override
       public void mouseClicked(MouseEvent e)
       {
         if (e.getClickCount()>1)
         {
           editWsUrl_actionPerformed(null);
         }
-        // TODO Auto-generated method stub
         
       }
 
-      @Override
       public void mouseEntered(MouseEvent e)
       {
-        // TODO Auto-generated method stub
         
       }
 
-      @Override
       public void mouseExited(MouseEvent e)
       {
-        // TODO Auto-generated method stub
-        
       }
 
-      @Override
       public void mousePressed(MouseEvent e)
       {
-        // TODO Auto-generated method stub
         
       }
 
-      @Override
       public void mouseReleased(MouseEvent e)
       {
-        // TODO Auto-generated method stub
         
       }
       
@@ -301,73 +290,61 @@ public class GWsPreferences extends JPanel
 
   protected void resetWs_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
     
   }
 
   protected void indexByType_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void indexByHost_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void newWsUrl_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void editWsUrl_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void deleteWsUrl_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void moveWsUrlUp_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void moveWsUrlDown_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void enableEnfinServices_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void enableJws2Services_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void enableJws1Services_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 
   protected void refreshWs_actionPerformed(ActionEvent e)
   {
-    // TODO Auto-generated method stub
 
   }
 

diff --git a/src/jalview/ws/jws2/Jws2Discoverer.java b/src/jalview/ws/jws2/Jws2Discoverer.java
index cb1f49b..2528308 100644 (file)
--- a/src/jalview/ws/jws2/Jws2Discoverer.java
+++ b/src/jalview/ws/jws2/Jws2Discoverer.java
@@ -70,7 +70,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   Thread oldthread = null;
 
-  @Override
   public void run()
   {
     if (running && oldthread != null && oldthread.isAlive())
@@ -286,7 +285,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
 
   }
 
-  @Override
   public void attachWSMenuEntry(JMenu wsmenu, final AlignFrame alignFrame)
   {
     if (running || services == null || services.size() == 0)
@@ -360,7 +358,6 @@ public class Jws2Discoverer implements Runnable, WSMenuEntryProviderI
     getDiscoverer().addPropertyChangeListener(new PropertyChangeListener()
     {
 
-      @Override
       public void propertyChange(PropertyChangeEvent evt)
       {
         System.out.println("Changesupport: There are now "