Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix #6

Merged
merged 1 commit into from
Oct 23, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void setPowerModeActive(Boolean powerModeActive) {
public Boolean getPowerModeActive() {
return (Boolean) store.get(Names.powerModeActive);
}
public void setPowerModeQualificationStatus(Names powerModeQualificationStatus) {
public void setPowerModeQualificationStatus(PowerModeQualificationStatus powerModeQualificationStatus) {
if (powerModeQualificationStatus != null) {
store.put(Names.powerModeQualificationStatus, powerModeQualificationStatus);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,17 @@ public void setTextFields( Vector<TextField> textFields ) {



public Vector<TextField> getImageFields() {
public Vector<ImageField> getImageFields() {
if (store.get(Names.imageFields) instanceof Vector<?>) {
Vector<?> list = (Vector<?>)store.get(Names.imageFields);
if (list != null && list.size() > 0) {
Object obj = list.get(0);
if (obj instanceof TextField) {
return (Vector<TextField>) list;
if (obj instanceof ImageField) {
return (Vector<ImageField>) list;
} else if (obj instanceof Hashtable) {
Vector<TextField> newList = new Vector<TextField>();
Vector<ImageField> newList = new Vector<ImageField>();
for (Object hashObj : list) {
newList.add(new TextField((Hashtable)hashObj));
newList.add(new ImageField((Hashtable)hashObj));
}
return newList;
}
Expand All @@ -143,7 +143,7 @@ public Vector<TextField> getImageFields() {
return null;
}

public void setImageFields( Vector<TextField> imageFields ) {
public void setImageFields( Vector<ImageField> imageFields ) {
if (imageFields != null) {
store.put(Names.imageFields, imageFields );
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ public void setSecondaryGraphic(Image secondaryGraphic) {
}


public Image setSecondaryGraphic() {
public Image getSecondaryGraphic() {
Object obj = parameters.get(Names.secondaryGraphic);
if (obj instanceof Image) {
return (Image) obj;
Expand Down