Skip to content

Commit

Permalink
Adds units of measure to view and edit screens for Shape dimensions.
Browse files Browse the repository at this point in the history
JIRA CANANOLAB-571
  • Loading branch information
lernermh committed Nov 6, 2018
1 parent 4050e4e commit f2d7a3b
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void transferFromPropertyBean(HttpServletRequest request, Characterizatio
super.transferFromPropertyBean(request, charBean, needOptions);

Shape shape = charBean.getShape();

this.type = shape.getType();
this.aspectRatio = shape.getAspectRatio();
this.maxDimension = shape.getMaxDimension();
Expand Down Expand Up @@ -83,9 +83,9 @@ public List<String> getPropertyViewTitles() {
List<String> vals = new ArrayList<String>();
vals.add("Type");
vals.add("Aspect Ratio");
vals.add("Minimum Dimention");
vals.add("Maximum Dimention");
return vals;
vals.add("Minimum Dimension");
vals.add("Maximum Dimension");
return vals;
}

@Override
Expand All @@ -98,15 +98,15 @@ public List<String> getPropertyViewValues() {
vals.add("");

if (this.minDimension != null)
vals.add(String.valueOf(this.minDimension));
vals.add(String.valueOf(this.minDimension) + " " + this.minDimensionUnit);
else
vals.add("");

if (this.maxDimension != null)
vals.add(String.valueOf(this.maxDimension));
vals.add(String.valueOf(this.maxDimension) + " " + this.maxDimensionUnit);
else
vals.add("");

return vals;
}

Expand Down

0 comments on commit f2d7a3b

Please sign in to comment.