Changeset 26636 for other-projects/GlamED

Timestamp:

2013-01-09T23:34:21+13:00 (11 years ago)

Author:

davidb

Message:

Adding in error message if a collection space can't be generated for a collection.

File:

• other-projects/GlamED/trunk/src/org/honours/agents/CollectionSpaceAgent.java (modified) (2 diffs)

other-projects/GlamED/trunk/src/org/honours/agents/CollectionSpaceAgent.java

@@ -4 +4 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
+import org.expeditee.gui.MessageBay;
 import org.honours.Main;
 import org.honours.collection.Collection;
@@ -17 +18 @@
         
         _collection = Collection.findCollection(frame);
+        System.err.println(frame.getName());
+        System.err.println(_collection);
         
-        if(_collection.getCollectionSpace() == null){
-            //create a new collection space.
-            _collectionSpace = new CollectionSpace(_collection);
-            _collection.setCollectionSpace(_collectionSpace);
-            _collectionSpace.generate();
+        if(_collection != null){
+            if(_collection.getCollectionSpace() == null){
+                //create a new collection space.
+                _collectionSpace = new CollectionSpace(_collection);
+                _collection.setCollectionSpace(_collectionSpace);
+                _collectionSpace.generate();
             
-            int index = Collection.getCollectionPosition(_collection);
-            Main._collections.remove(index);
-            Main._collections.add(index, _collection);
+                int index = Collection.getCollectionPosition(_collection);
+                Main._collections.remove(index);
+                Main._collections.add(index, _collection);
             
-            return FrameIO.LoadFrame(_collectionSpace.getName() + "1");
+                return FrameIO.LoadFrame(_collectionSpace.getName() + "1");
+            }
+        }else{
+            MessageBay.errorMessage("ERROR: Cannot generate a collection space as collection cannot be found.");
         }
-        
         
         return null;