Remove some superfluous checks

Author: mbastian

src/main/java/org/gephi/graph/impl/GraphViewStore.java

@@ -82,6 +82,7 @@ public GraphViewImpl createView(GraphView view, boolean nodes, boolean edges) {
             }
         } else {
             checkNonNullViewObject(view);
+            checkGraphViewObject(view);
             checkViewExist((GraphViewImpl) view);
 
             graphStore.autoWriteLock();
@@ -96,9 +97,13 @@ public GraphViewImpl createView(GraphView view, boolean nodes, boolean edges) {
     }
 
     public void destroyView(GraphView view) {
+        if (view.isMainView()) {
+            throw new IllegalArgumentException("Can't delete the main view");
+        }
         graphStore.autoWriteLock();
         try {
             checkNonNullViewObject(view);
+            checkGraphViewObject(view);
 
             TimeIndexStore nodeTimeStore = graphStore.timeStore.nodeIndexStore;
             if (nodeTimeStore != null) {
@@ -160,6 +165,7 @@ public int size() {
 
     public Subgraph getGraph(GraphView view) {
         checkNonNullViewObject(view);
+        checkGraphViewObject(view);
 
         if (graphStore.isUndirected()) {
             if (view.isMainView()) {
@@ -176,6 +182,7 @@ public Subgraph getGraph(GraphView view) {
 
     public DirectedSubgraph getDirectedGraph(GraphView view) {
         checkNonNullViewObject(view);
+        checkGraphViewObject(view);
 
         if (view.isMainView()) {
             return graphStore;
@@ -187,6 +194,7 @@ public DirectedSubgraph getDirectedGraph(GraphView view) {
 
     public UndirectedSubgraph getUndirectedGraph(GraphView view) {
         checkNonNullViewObject(view);
+        checkGraphViewObject(view);
 
         if (view.isMainView()) {
             return graphStore.undirectedDecorator;
@@ -358,14 +366,15 @@ public boolean deepEquals(GraphViewStore obj) {
         return true;
     }
 
-    protected void checkNonNullViewObject(final Object o) {
+    protected void checkNonNullViewObject(final GraphView o) {
         if (o == null) {
             throw new NullPointerException();
         }
-        if (o != graphStore.mainGraphView) {
-            if (!(o instanceof GraphViewImpl)) {
-                throw new ClassCastException("View must be a GraphViewImpl object");
-            }
+    }
+
+    protected void checkGraphViewObject(final GraphView o) {
+        if (!o.isMainView() && !(o instanceof GraphViewImpl)) {
+            throw new IllegalArgumentException("The view is not from this implementation");
         }
     }
 

src/test/java/org/gephi/graph/impl/GraphViewStoreTest.java

@@ -71,6 +71,14 @@ public void testDestroy() {
         Assert.assertTrue(view.isDestroyed());
     }
 
+    @Test(expectedExceptions = IllegalArgumentException.class)
+    public void testDestroyMainView() {
+        GraphStore graphStore = GraphGenerator.generateSmallGraphStore();
+        GraphViewStore store = graphStore.viewStore;
+
+        store.destroyView(graphStore.mainGraphView);
+    }
+
     @Test(expectedExceptions = IllegalArgumentException.class)
     public void testDestroyTwice() {
         GraphStore graphStore = GraphGenerator.generateSmallGraphStore();
@@ -199,7 +207,7 @@ public void testGetUndirectedGraphNull() {
         store.getUndirectedGraph(null);
     }
 
-    @Test(expectedExceptions = ClassCastException.class)
+    @Test(expectedExceptions = IllegalArgumentException.class)
     public void testGetViewAnonymousClass() {
         GraphStore graphStore = GraphGenerator.generateSmallGraphStore();
         GraphViewStore store = graphStore.viewStore;
@@ -212,7 +220,7 @@ public GraphModel getGraphModel() {
 
             @Override
             public boolean isMainView() {
-                throw new UnsupportedOperationException("Not supported yet.");
+                return false;
             }
 
             @Override