From f73712aa80c31a7f4ff81e0fceca90f5212492f5 Mon Sep 17 00:00:00 2001
From: rkv <rkv@opencascade.com>
Date: Sun, 18 Nov 2012 14:59:37 +0000
Subject: [PATCH] Import users action is working now.

---
 Workspace/Siman/WebContent/sadmin/upload.jsp    |  6 +++---
 Workspace/Siman/src/org/splat/simer/Action.java | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Workspace/Siman/WebContent/sadmin/upload.jsp b/Workspace/Siman/WebContent/sadmin/upload.jsp
index 1bbfa64..6723844 100644
--- a/Workspace/Siman/WebContent/sadmin/upload.jsp
+++ b/Workspace/Siman/WebContent/sadmin/upload.jsp
@@ -26,13 +26,13 @@
               <tr height=10><td></td></tr>
               <s:hidden name="nextAction" value="%{nextAction}" />
               <s:hidden name="index"      value="%{index}" />
-              <s:file   name="upload" key="field.upload" onChange="enableUpload()" />
+              <s:file   name="upload" key="field.upload" onchange="enableUpload()" />
               <tr height=10><td></td></tr>
               <tr>
                 <td></td>
                 <td align=right>
-                  <input type="submit" name="cancel" value="<s:text name="button.cancel"/>"/>
-                  <input type="submit" name="doIt"   value="<s:text name="button.upload"/>" disabled="true"/>
+                    <s:submit theme="simple" name="cancel" key="button.cancel"/>
+                    <s:submit theme="simple" name="doIt" key="button.upload" disabled="true"/>
                 </td>
               </tr>
             </table>
diff --git a/Workspace/Siman/src/org/splat/simer/Action.java b/Workspace/Siman/src/org/splat/simer/Action.java
index 4c0a974..f2848e7 100644
--- a/Workspace/Siman/src/org/splat/simer/Action.java
+++ b/Workspace/Siman/src/org/splat/simer/Action.java
@@ -393,12 +393,14 @@ public class Action extends ActionSupport implements ServletRequestAware,
 
 		AbstractOpenObject entity = (AbstractOpenObject) _session.get(titleProperty + ".open");
 
-		getTitleBarSettings().setProgressState(
-				entity.getProgressState().toString());
-		getTitleBarSettings().setSelectionState(entity.getSelection());
-		getTitleBarSettings().setEntryType(entity.getType().toLowerCase());
-		getTitleBarSettings().setEntryTypeTitle(entity.getType());
-		getTitleBarSettings().setEntryTitle(entity.getTitle());
+		if (entity != null) {
+			getTitleBarSettings().setProgressState(
+					entity.getProgressState().toString());
+			getTitleBarSettings().setSelectionState(entity.getSelection());
+			getTitleBarSettings().setEntryType(entity.getType().toLowerCase());
+			getTitleBarSettings().setEntryTypeTitle(entity.getType());
+			getTitleBarSettings().setEntryTitle(entity.getTitle());
+		}
 		getTitleBarSettings().setEditDisabledProperty(editDisabledProperty);
 	}
 
-- 
2.39.2