Changeset 3790

Timestamp:

Aug 24, 2010, 9:59:56 AM (13 years ago)

Author:

Gregory Vincic

Message:

Refs #698.
In FormFactory?

Removed method newNameField()
Replaced VNAME with NameField?.VPARAM

In NameableProperties?

Added disable() method
setValues(Nameable obj) method adds ItemIdField?

Location:

trunk/client/servlet/src/org/proteios/gui/form

Files:

• FormFactory.java (modified) (13 diffs)
• NameField.java (modified) (1 diff)
• NameableProperties.java (modified) (2 diffs)
• PluginDefinitionForm.java (modified) (3 diffs)
• TemplateForm.java (added)

trunk/client/servlet/src/org/proteios/gui/form/FormFactory.java

@@ -216 +216 @@
   public static final VInteger VROLEID = new VInteger("roleId", 1, true);
   public static final VInteger VGROUPID = new VInteger("groupId", 1, false);
-  public static final VString VNAME = new VString("name", 1, 255, true);
+  public static final VString VNAME = NameField.VPARAM;
   public static final VString VUSERNAME = new VString("username", 1, 32, true);
   public static final VString VANNONAME = new VString("annotationName", 1,
@@ -609 +609 @@
     form.addFieldset(properties);
     // Create fields for the properties fieldset
-    TextField<String> name = newNameField();
+    TextField<String> name = new NameField();
     properties.add(name);
     //
@@ -647 +647 @@
     }
     return form;
-  }
-
-
-
-  private TextField<String> newNameField()
-  {
-    TextField<String> nameF = new TextField<String>(VNAME);
-    nameF.setLabel("Name");
-    return nameF;
   }
 
@@ -1023 +1014 @@
     properties.getLegendTitle().setTitle("Properties");
     properties.add(newLoginField());
-    properties.add(newNameField());
+    properties.add(new NameField());
     properties.add(newEmailField());
     properties.add(newDescriptionField());
@@ -1549 +1540 @@
   TextField<Date> createdF, endedF;
 
-    nameF = newNameField();
+    nameF = new NameField();
     descrF = newDescriptionField();
     createdF = newCDateField();
@@ -1614 +1605 @@
     peaklistsetFS.getLegendTitle().setTitle("ParentPeakListSet");
     PeakListSet pls = peaklist.getPeakListSet();
-    TextField<String> plsNameF = newNameField();
+    TextField<String> plsNameF = new NameField();
     plsNameF.setDisabled(true);
     // Annotations
@@ -1813 +1804 @@
       peaklistsetFS.getLegendTitle().setTitle("ParentPeakListSet");
       PeakListSet pls = peaklist.getPeakListSet();
-      TextField<String> plsNameF = newNameField();
+      TextField<String> plsNameF = new NameField();
       plsNameF.setDisabled(true);
       peaklistsetFS.add(plsNameF);
@@ -2761 +2752 @@
     properties.getLegendTitle().setTitle("Properties");
     // Name field
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     properties.add(nameF);
     // Description field
@@ -2887 +2878 @@
     properties.add(itemIdF);
     // Name field
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     properties.add(nameF);
     // Description field
@@ -2982 +2973 @@
     fs.add(typeS);
     // Name field
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     nameF.setLabel("FileName");
     fs.add(nameF);
@@ -9278 +9269 @@
     form.addFieldset(fs);
     //
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     fs.add(nameF);
     // 
@@ -9326 +9317 @@
     form.addFieldset(fs);
     //
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     fs.add(nameF);
     // 
@@ -9396 +9387 @@
     form.addFieldset(fs);
     //
-    TextField<String> nameF = newNameField();
+    TextField<String> nameF = new NameField();
     fs.add(nameF);
     // 

trunk/client/servlet/src/org/proteios/gui/form/NameField.java

@@ -33 +33 @@
  extends TextField<String>
 {
-  public static final VString VNAME = new VString("name", 1, 255, true );
+  public static final VString VPARAM = new VString("name", 1, 255, true );
 
  public NameField()
  {
-  super(NameField.VNAME);
+  super(NameField.VPARAM);
   this.setLabel("Name");
  }

trunk/client/servlet/src/org/proteios/gui/form/NameableProperties.java

@@ -34 +34 @@
  extends Fieldset
 {
+ public ItemIdField itemIdF = null;
  public NameField nameF;
  public DescriptionField descriptionF;
@@ -48 +49 @@
  }
 
+ /**
+  Sets the nameF and descriptionF of the Nameable object.
+  Also adds an ItemIdField, once if called more times and sets the id value.
+  @param obj Nameable item from which to read values
+ */
  public void setValues(Nameable obj)
  {
+  if(itemIdF == null) { itemIdF = new ItemIdField(); }
+  itemIdF.setValue(obj.getId());
   this.nameF.setValue(obj.getName());
   this.descriptionF.setValue(obj.getDescription());
  }
+
+ public void disable()
+ {
+  if(itemIdF != null) { itemIdF.setDisabled(true); }
+  nameF.setDisabled(true);
+  descriptionF.setDisabled(true);
+ }
 }

trunk/client/servlet/src/org/proteios/gui/form/PluginDefinitionForm.java

@@ -44 +44 @@
  public TextField<Integer> itemIdF;
  public Fieldset propertiesFS;
- public FileField fileF;
  public TextArea descriptionF;
 
@@ -51 +50 @@
   */
  public PluginDefinitionForm()
- {
-  this(true);
- }
-
- /**
-  Creates a form with no values
-  */
- private PluginDefinitionForm(boolean addFile)
  {
   propertiesFS = new Fieldset();
@@ -68 +59 @@
   propertiesFS.add(classNameF);
   propertiesFS.add(descriptionF);
-  if(addFile)
-  {
-   fileF = new UploadField();
-   propertiesFS.add(fileF);
-  }
   addFieldset(propertiesFS);
  }
 
- /**
-  Creates a form with no values
-  */
  public PluginDefinitionForm(PluginDefinition pd)
  {
-  this(false); // Create all fields using empty constructor
+  this(); // Create all fields using empty constructor
   itemIdF = new ItemIdField();
   propertiesFS.add(0,itemIdF);