Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 11161)
@@ -72,5 +72,4 @@
 		this.data = dataSet;
 		DataSet.selListeners.add(new SelectionChangedListener() {
-			@Override
 			public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
 				selection = newSelection;
@@ -128,5 +127,4 @@
 			
 			g.drawImage(icon.getImage(), p.x - (width / 2), p.y - (height / 2), new ImageObserver() {
-				@Override
 				public boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
 					return false;
@@ -209,5 +207,4 @@
 	}
 
-	@Override
 	public void mouseClicked(MouseEvent e) {
 		if(e.getButton() == MouseEvent.BUTTON1) {
@@ -221,10 +218,8 @@
 	}
 	
-	@Override
 	public void mousePressed(MouseEvent e) {
         mayTriggerPopup(e);
     }
 
-	@Override
     public void mouseReleased(MouseEvent e) {
         mayTriggerPopup(e);
@@ -243,8 +238,6 @@
     }
 	
-	@Override
 	public void mouseEntered(MouseEvent e) {}
 
-	@Override
 	public void mouseExited(MouseEvent e) {}
 }
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java	(revision 11161)
@@ -181,10 +181,8 @@
 				private boolean download = true;
 
-				@Override
 				public void actionPerformed(ActionEvent e) {
 					active = toggle.isSelected();
 					if (toggle.isSelected() && download) {
 						Main.worker.execute(new Runnable() {
-							@Override
 							public void run() {
 								updateData();
@@ -205,8 +203,6 @@
 	}
 
-	@Override
 	public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
 
-	@Override
 	public void layerAdded(Layer newLayer) {
 		if(newLayer instanceof OsmDataLayer) {
@@ -218,5 +214,4 @@
 	}
 
-	@Override
 	public void layerRemoved(Layer oldLayer) {
 		if(oldLayer == layer) {
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java	(revision 11161)
@@ -39,5 +39,4 @@
 public class OsbUploadHook implements UploadHook {
 
-	@Override
 	public boolean checkUpload(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update,
 			Collection<OsmPrimitive> delete) 
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 11161)
@@ -112,5 +112,5 @@
 		refresh.setIcon(OsbPlugin.loadIcon("view-refresh22.png"));
 		refresh.addActionListener(new ActionListener() {
-			@Override
+
 			public void actionPerformed(ActionEvent e) {
 				// check zoom level
@@ -145,5 +145,4 @@
 		// add a selection listener to the data
 		DataSet.selListeners.add(new SelectionChangedListener() {
-			@Override
 			public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
 				fireSelectionChanged = false;
@@ -165,5 +164,4 @@
 	}
 
-	@Override
 	public synchronized void update(final DataSet dataset) {
 		Node lastNode = OsbAction.getSelectedNode();
@@ -181,5 +179,4 @@
 	}
 
-	@Override
 	public void valueChanged(ListSelectionEvent e) {
 		if(list.getSelectedValues().length == 0) {
@@ -224,8 +221,6 @@
 	}
 
-	@Override
 	public void activeLayerChange(Layer oldLayer, Layer newLayer) {}
 
-	@Override
 	public void layerAdded(Layer newLayer) {
 		if(newLayer == osbPlugin.getLayer()) {
@@ -235,5 +230,4 @@
 	}
 
-	@Override
 	public void layerRemoved(Layer oldLayer) {
 		if(oldLayer == osbPlugin.getLayer()) {
@@ -242,5 +236,4 @@
 	}
 
-	@Override
 	public void dataChanged(OsmDataLayer l) {
 		update(l.data);
@@ -252,5 +245,4 @@
     }
 
-	@Override
 	public void mouseClicked(MouseEvent e) {
 		if(e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2) {
@@ -260,10 +252,8 @@
 	}
 	
-	@Override
 	public void mousePressed(MouseEvent e) {
         mayTriggerPopup(e);
     }
 
-	@Override
     public void mouseReleased(MouseEvent e) {
         mayTriggerPopup(e);
@@ -280,11 +270,8 @@
     }
 	
-	@Override
 	public void mouseEntered(MouseEvent e) {}
 
-	@Override
 	public void mouseExited(MouseEvent e) {}
 
-	@Override
 	public void actionPerformed(OsbAction action) {
 		if(action instanceof AddCommentAction || action instanceof CloseIssueAction) {
@@ -294,5 +281,5 @@
 	
 	private class BugComparator implements Comparator<Node> {
-		@Override
+
 		public int compare(Node o1, Node o2) {
 			String state1 = o1.get("state");
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbListCellRenderer.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbListCellRenderer.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbListCellRenderer.java	(revision 11161)
@@ -46,5 +46,4 @@
     private Color altBackground = new Color(250, 250, 220);
     
-	@Override
 	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
 			boolean cellHasFocus) {
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java	(revision 11161)
@@ -74,16 +74,12 @@
 	}
 
-	@Override
 	public void mouseClicked(MouseEvent e) {
 		addNewIssue(e);
 	}
 
-	@Override
 	public void mouseEntered(MouseEvent e) {}
 
-	@Override
 	public void mouseExited(MouseEvent e) {}
 
-	@Override
 	public void mousePressed(MouseEvent e) {
 		addNewIssue(e);
@@ -96,5 +92,5 @@
 				JOptionPane.QUESTION_MESSAGE);
 		
-		if(result != null && !result.isEmpty()) {
+		if(result != null && result.length() > 0) {
 			try {
 				Node n = newAction.execute(e.getPoint(), result);
@@ -117,5 +113,4 @@
 	}
 
-	@Override
 	public void mouseReleased(MouseEvent e) {}
 }
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java	(revision 11160)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java	(revision 11161)
@@ -54,5 +54,4 @@
 	}
 	
-	@Override
 	public void actionPerformed(ActionEvent e) {
 		try {