Changeset 2686

Timestamp:

03/08/10 23:33:24 (2 years ago)

Author:

asboerema

Message:

changed the GetxxxxLabels?() with Getxxx_name() to make stuff work again

Location:

molgenis4animaldb/handwritten/java/servlets

Files:

• AddEventMenuServlet.java (modified) (1 diff)
• ViewEventsServlet.java (modified) (4 diffs)

molgenis4animaldb/handwritten/java/servlets/AddEventMenuServlet.java

@@ -108 +108 @@
 //                                              }
                                                 
-                                                out.print("<em>(unit: "+currentFeature.getUnitLabel()+")</em>");
+                                                //out.print("<em>(unit: "+currentFeature.getUnitLabel()+")</em>");
+                                                out.print("<em>(unit: "+currentFeature.getUnit_name()+")</em>");
                                                 out.print("<input type='hidden' name='feature"+valueNr+"' value='"+currentFeature.getId()+"' />");
                                                 out.print("</div>");

molgenis4animaldb/handwritten/java/servlets/ViewEventsServlet.java

@@ -62 +62 @@
                                                 Event currentEvent = eventList.get(0);
 
-                                                out.print("<td>" + currentEvent.getEventtypeidLabel()
+                                                out.print("<td>" + currentEvent.getEventtypeid_name()
                                                                 + " on " + currentValue.getTime().toString()
                                                                 + "</td>");
@@ -76 +76 @@
                                         while (valIterator.hasNext()) {
                                                 Value currentValue = valIterator.next();
-                                                currentValueContents = currentValue.getFeatureidLabel();
+                                                currentValueContents = currentValue.getFeatureid_name();
                                                 if (currentValueContents.equals("Dummy")) {
                                                         currentValueContents = "";
@@ -90 +90 @@
                                                 Value currentValue = valIterator.next();
 
-                                                if (!currentValue.getFeatureidLabel().equals("Dummy")) {
+                                                if (!currentValue.getFeatureid_name().equals("Dummy")) {
                                                         // Get the real value:
                                                         currentValueContents = currentValue
@@ -100 +100 @@
                                                                                         featureId));
                                                         Feature currentFeature = featList.get(0);
-                                                        unitName = "(" + currentFeature.getUnitLabel() + ")";
+                                                        unitName = "(" + currentFeature.getUnit_name() + ")";
                                                         int unitId = currentFeature.getUnit();
                                                         // Check in Ontology if it is a DatabaseLink: