dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #36487
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 18662: minor cleanup
------------------------------------------------------------
revno: 18662
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-03-23 16:24:15 +0700
message:
minor cleanup
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/DataType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventOutputType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodSerializer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/DataType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/DataType.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/DataType.java 2015-03-23 09:24:15 +0000
@@ -33,5 +33,5 @@
*/
public enum DataType
{
- NUMERIC, TEXT;
+ NUMERIC, TEXT
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventOutputType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventOutputType.java 2015-02-16 13:05:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/analytics/EventOutputType.java 2015-03-23 09:24:15 +0000
@@ -33,5 +33,5 @@
*/
public enum EventOutputType
{
- EVENT, ENROLLMENT, TRACKED_ENTITY_INSTANCE;
+ EVENT, ENROLLMENT, TRACKED_ENTITY_INSTANCE
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonOrganisationUnitChildrenSerializer.java 2015-03-23 09:24:15 +0000
@@ -50,7 +50,7 @@
private static DateFormat format = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssZ" );
@Override
- public void serialize( OrganisationUnit value, JsonGenerator jgen, SerializerProvider provider ) throws IOException, JsonProcessingException
+ public void serialize( OrganisationUnit value, JsonGenerator jgen, SerializerProvider provider ) throws IOException
{
if ( ToXmlGenerator.class.isAssignableFrom( jgen.getClass() ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodDeserializer.java 2015-03-23 09:24:15 +0000
@@ -76,7 +76,7 @@
{
@Override
public Period deserialize( JsonParser jp, DeserializationContext ctxt )
- throws IOException, JsonProcessingException
+ throws IOException
{
LocalPeriod p = jp.readValueAs( LocalPeriod.class );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodSerializer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodSerializer.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/adapter/JacksonPeriodSerializer.java 2015-03-23 09:24:15 +0000
@@ -43,7 +43,7 @@
extends JsonSerializer<Period>
{
@Override
- public void serialize( Period value, JsonGenerator jgen, SerializerProvider provider ) throws IOException, JsonProcessingException
+ public void serialize( Period value, JsonGenerator jgen, SerializerProvider provider ) throws IOException
{
if ( value != null && value.getIsoDate() != null )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java 2015-02-09 14:08:57 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryComboMap.java 2015-03-23 09:24:15 +0000
@@ -140,7 +140,7 @@
*/
public DataElementCategoryOptionCombo getCategoryOptionCombo( String compositeIdentifier )
{
- return (DataElementCategoryOptionCombo) ccMap.get( compositeIdentifier );
+ return ccMap.get( compositeIdentifier );
}
/**