hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 02:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-707] Corrected equals comparison

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@5586 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Graham Triggs
2010-10-24 12:06:32 +00:00
parent a44931df72
commit aa622e669e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dspace-xmlui/dspace-xmlui-wing/src/main/java/org/dspace/app/xmlui/wing/element/Data.java
View File

@@ -227,7 +227,7 @@ public class Data extends AbstractWingElement
boolean unknownType = false; boolean unknownType = false;
if (dictionaryParameter.getClass().equals(Date.class.getName())) if (dictionaryParameter instanceof Date)
{ {
Date date = (Date) dictionaryParameter; Date date = (Date) dictionaryParameter;
DateFormat dateFormater = DateFormat DateFormat dateFormater = DateFormat
@@ -237,31 +237,31 @@ public class Data extends AbstractWingElement
attributes.put(A_VALUE, dateFormater.format(date)); attributes.put(A_VALUE, dateFormater.format(date));
// If no pattern is given then the default format is assumed. // If no pattern is given then the default format is assumed.
} }
else if (dictionaryParameter.getClass().equals(Integer.class.getName())) else if (dictionaryParameter instanceof Integer)
{ {
Integer value = (Integer) dictionaryParameter; Integer value = (Integer) dictionaryParameter;
attributes.put(A_TYPE, TYPE_NUMBER); attributes.put(A_TYPE, TYPE_NUMBER);
attributes.put(A_VALUE, String.valueOf(value)); attributes.put(A_VALUE, String.valueOf(value));
} }
else if (dictionaryParameter.getClass().equals(Double.class.getName())) else if (dictionaryParameter instanceof Double)
{ {
Double value = (Double) dictionaryParameter; Double value = (Double) dictionaryParameter;
attributes.put(A_TYPE, TYPE_NUMBER); attributes.put(A_TYPE, TYPE_NUMBER);
attributes.put(A_VALUE, String.valueOf(value)); attributes.put(A_VALUE, String.valueOf(value));
} }
else if (dictionaryParameter.getClass().equals(Long.class.getName())) else if (dictionaryParameter instanceof Long)
{ {
Long value = (Long) dictionaryParameter; Long value = (Long) dictionaryParameter;
attributes.put(A_TYPE, TYPE_NUMBER); attributes.put(A_TYPE, TYPE_NUMBER);
attributes.put(A_VALUE, String.valueOf(value)); attributes.put(A_VALUE, String.valueOf(value));
} }
else if (dictionaryParameter.getClass().equals(Short.class.getName())) else if (dictionaryParameter instanceof Short)
{ {
Short value = (Short) dictionaryParameter; Short value = (Short) dictionaryParameter;
attributes.put(A_TYPE, TYPE_NUMBER); attributes.put(A_TYPE, TYPE_NUMBER);
attributes.put(A_VALUE, String.valueOf(value)); attributes.put(A_VALUE, String.valueOf(value));
} }
else if (dictionaryParameter.getClass().equals(Float.class.getName())) else if (dictionaryParameter instanceof Float)
{ {
Float value = (Float) dictionaryParameter; Float value = (Float) dictionaryParameter;
attributes.put(A_TYPE, TYPE_NUMBER); attributes.put(A_TYPE, TYPE_NUMBER);
@@ -273,15 +273,15 @@ public class Data extends AbstractWingElement
unknownType = true; unknownType = true;
} }
startElement(contentHandler, namespaces, WingConstants.I18N, E_PARAM, startElement(contentHandler, namespaces, WingConstants.I18N, E_PARAM, attributes);
attributes);
// If the type is unknown then the value is not included as an attribute // If the type is unknown then the value is not included as an attribute
// and instead is sent as the contents of the elements. // and instead is sent as the contents of the elements.
if (unknownType)
{ // NOTE: Used to only do this if unknownType was true. However, due to flaw in logic above,
sendCharacters(contentHandler, dictionaryParameter.toString()); // it was always true, and so always called.
} // In order not to break anything, we will now call sendCharacters regardless of whether we matched a Type
sendCharacters(contentHandler, dictionaryParameter.toString());
endElement(contentHandler, namespaces, WingConstants.I18N, E_PARAM); endElement(contentHandler, namespaces, WingConstants.I18N, E_PARAM);
} }