Changeset 4456

Timestamp:

Mar 20, 2013, 12:46:21 PM (10 years ago)

Author:

olle

Message:

Refs #327. Refs #339. Classes/files action/sample/AddSampleFiole.java, action/extract/AddExtractFile.java, and action/extract/AddLabeledExtractFile.java in client/servlet/ updated to not crash if no active project has been selected.

Location:

trunk/client/servlet/src/org/proteios/action

Files:

• extract/AddExtractFile.java (modified) (1 diff)
• extract/AddLabeledExtractFile.java (modified) (1 diff)
• sample/AddSampleFile.java (modified) (1 diff)

trunk/client/servlet/src/org/proteios/action/extract/AddExtractFile.java

@@ -50 +50 @@
     setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
       CreateExtractFile.class));
-    setSessionAttribute(ViewActiveDirectory.VDIRID, project
-      .getProjectDirectory().getId());
+    if (project != null)
+    {
+      setSessionAttribute(ViewActiveDirectory.VDIRID, project
+        .getProjectDirectory().getId());
+    }
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setForwardTo(ViewActiveDirectory.class);

trunk/client/servlet/src/org/proteios/action/extract/AddLabeledExtractFile.java

@@ -50 +50 @@
     setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
       CreateLabeledExtractFile.class));
-    setSessionAttribute(ViewActiveDirectory.VDIRID, project
-      .getProjectDirectory().getId());
+    if (project != null)
+    {
+      setSessionAttribute(ViewActiveDirectory.VDIRID, project
+        .getProjectDirectory().getId());
+    }
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setForwardTo(ViewActiveDirectory.class);

trunk/client/servlet/src/org/proteios/action/sample/AddSampleFile.java

@@ -51 +51 @@
     setSessionAttribute(ForwardField.VPARAM, getActionFactory().getId(
       CreateSampleFile.class));
-    setSessionAttribute(ViewActiveDirectory.VDIRID, project
-      .getProjectDirectory().getId());
+    if (project != null)
+    {
+      setSessionAttribute(ViewActiveDirectory.VDIRID, project
+        .getProjectDirectory().getId());
+    }
     setSessionAttribute(ViewActiveDirectory.VSELECT, true);
     setForwardTo(ViewActiveDirectory.class);