Changeset 4505

Timestamp:

Aug 13, 2013, 10:45:59 AM (10 years ago)

Author:

Fredrik Levander

Message:

Fixes #811. Restored functionality for protocol file selection. Now also setting file type for the selected file.

Location:

trunk/client/servlet/src

Files:

• icons/default (modified) (1 diff)
• locale/en/dictionary (modified) (1 diff)
• org/proteios/action/protocol/AddProtocol.java (modified) (4 diffs)
• org/proteios/action/protocol/NewProtocol.java (modified) (3 diffs)

trunk/client/servlet/src/icons/default

@@ -116 +116 @@
 RunPlugin=icons/runplugin.gif
 Save=icons/save.gif
+SaveNoFurtherChanges=icons/save.gif
 SaveInFile=icons/saveas.gif
 ExportToFile=icons/saveas.gif

trunk/client/servlet/src/locale/en/dictionary

@@ -827 +827 @@
 SaveProperties=Save properties
 Save=Save
+SaveNoFurtherChanges=Save (No further changes allowed)
 ScanRate=Scan Rate
 Score=Score

trunk/client/servlet/src/org/proteios/action/protocol/AddProtocol.java

@@ -31 +31 @@
 import org.proteios.core.DbControl;
 import org.proteios.core.File;
+import org.proteios.core.FileType;
 import org.proteios.core.ItemFactory;
 import org.proteios.core.ItemNotFoundException;
@@ -36 +37 @@
 import org.proteios.core.Protocol;
 import org.proteios.core.ProtocolType;
+import org.proteios.core.SystemItems;
 import org.proteios.gui.form.*;
 import se.lu.thep.waf.ActionException;
@@ -94 +96 @@
       File file = factory.getById(File.class, fileId);
       protocol.setFile(file);
+      if (file.getFileType()==null)
+      {
+        dc.reattachItem(file);
+        int id = SystemItems.getId(FileType.PROTOCOL);
+        file.setFileType(factory.getById(FileType.class, id));
+        if (file.getMimeType()==null || file.getMimeType().equals(""))
+        {
+          file.setMimeType("text/plain");
+          if (file.getName().toLowerCase().endsWith(".xml"))
+          {
+            file.setMimeType("application/xml");
+          }
+        }
+      }
     }
     dc.saveItem(protocol);
@@ -101 +117 @@
      * Forward action
      */
-    if (forwardTo != null)
-    {
-      setForwardTo(forwardTo);
-    }
-    else
-    {
-      setForwardTo(ListProtocols.class);
-    }
+    setForwardTo(ListProtocols.class);
+
   }
 }

trunk/client/servlet/src/org/proteios/action/protocol/NewProtocol.java

@@ -38 +38 @@
 import org.proteios.gui.Title;
 import org.proteios.gui.Toolbar;
-import org.proteios.gui.form.*;
+import org.proteios.gui.form.DescriptionField;
+import org.proteios.gui.form.Form;
+import org.proteios.gui.form.FormFactory;
+import org.proteios.gui.form.ForwardField;
+import org.proteios.gui.form.NameField;
 import org.proteios.gui.layout.RowLayout;
+
 import se.lu.thep.waf.ActionException;
 import se.lu.thep.waf.constraints.InvalidParameterValue;
@@ -129 +134 @@
             * Protocol form
         */
-        Form form = getFormFactory().getForm(Protocol.class);
+        Form form = getFormFactory().getForm(Protocol.class, protocol);
         // Toolbar
         Toolbar tb = new Toolbar();
         // Save button
-        String saveLabel = "Save";
+        String saveLabel = "SaveNoFurtherChanges";
         ActionLink saveAction = getActionFactory().getActionLink(AddProtocol.class, saveLabel);
         saveAction.addParameter(ForwardField.VPARAM.getName(),
@@ -156 +161 @@
             * Layout
         */
-        RowLayout layout = getLayoutFactory().getRowLayout();
+         RowLayout layout = getLayoutFactory().getRowLayout();
         layout.add(new Title("NewProtocol"));
         layout.add(form);
+        
         setLayout(layout);
     }