Merge pull request #419 from dominikl/fix_issues

Fix issues

Author: jburel

src/main/java/org/openmicroscopy/shoola/agents/imviewer/view/ImViewerControl.java

@@ -903,6 +903,7 @@ public void stateChanged(ChangeEvent e)
 				break;
 			case ImViewer.CANCELLED:
 				window.setVisible(false);
+				break;
 			case ImViewer.LOADING_IMAGE:
 				if (historyState == ImViewer.LOADING_METADATA)
 					window.setVisible(false);

src/main/java/org/openmicroscopy/shoola/agents/metadata/editor/EditorComponent.java

@@ -180,7 +180,7 @@ private Collection<DataObject> getImmutableAnnotation(Class type,
 						link = j.next();
 						child = (AnnotationData) link.getChild();
 						if (!model.isNameSpaceExcluded(child.getNameSpace()) &&
-							!link.canDelete() && link.getChild().equals(type))
+							!link.canDelete() && link.getChild().getClass().equals(type))
 							list.add(link.getChild());
 					}
 				}

src/main/java/org/openmicroscopy/shoola/agents/treeviewer/browser/BrowserControl.java

@@ -326,7 +326,7 @@ void onNodeNavigation(TreeImageDisplay display, boolean expanded)
                 case TreeViewer.EXPERIMENTER_DISPLAY:
                 default:
                     List<?> l = display.getChildrenDisplay();
-                    if (l != null & l.size() > 0) {
+                    if (l != null && l.size() > 0) {
                         view.expandNode((TreeImageDisplay) l.get(0), true);
                     }
                 }