dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13879
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4569: Codestyle
------------------------------------------------------------
revno: 4569
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-09-12 11:13:33 +0200
message:
Codestyle
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/CategoryOptionCombo.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataElement.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSet.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSetLinks.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValueSet.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Dxf.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Link.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnit.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnitLinks.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilder.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.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-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/CategoryOptionCombo.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/CategoryOptionCombo.java 2011-02-25 18:08:38 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/CategoryOptionCombo.java 2011-09-12 09:13:33 +0000
@@ -1,6 +1,6 @@
package org.hisp.dhis.importexport.dxf2.model;
-public class CategoryOptionCombo extends Link
+public class CategoryOptionCombo
+ extends Link
{
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataElement.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataElement.java 2011-02-25 18:08:38 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataElement.java 2011-09-12 09:13:33 +0000
@@ -8,7 +8,6 @@
public class DataElement extends Link
{
-
@XmlAttribute
private String type;
@@ -16,7 +15,6 @@
@XmlElement(name="categoryOptionCombo")
private List<CategoryOptionCombo> categoryOptionCombos;
-
public String getType()
{
return type;
@@ -36,5 +34,4 @@
{
this.categoryOptionCombos = categoryOptionCombos;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSet.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSet.java 2011-02-25 18:08:38 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSet.java 2011-09-12 09:13:33 +0000
@@ -105,7 +105,5 @@
public void setOrgUnitLinks( List<Link> orgUnitLinks )
{
this.orgUnitLinks = orgUnitLinks;
- }
-
-
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSetLinks.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSetLinks.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataSetLinks.java 2011-09-12 09:13:33 +0000
@@ -4,12 +4,10 @@
import javax.xml.bind.annotation.XmlRootElement;
-
@XmlRootElement
public class DataSetLinks
{
-
- List<Link> dataSet;
+ private List<Link> dataSet;
public DataSetLinks()
{
@@ -29,5 +27,4 @@
{
this.dataSet = dataSet;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java 2011-09-06 16:29:46 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java 2011-09-12 09:13:33 +0000
@@ -50,8 +50,6 @@
public static final String ATTR_ORGUNIT = "orgunit";
- // ---------------------------------------------------------------------------
-
@XmlAttribute( name = ATTR_DATAELEMENT, required = true )
private String dataElementIdentifier;
@@ -102,6 +100,7 @@
{
dimensions = new HashMap<QName,Object>();
}
+
return dimensions;
}
@@ -119,5 +118,4 @@
{
this.value = value;
}
-
-}
\ No newline at end of file
+}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValueSet.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValueSet.java 2011-09-06 16:29:46 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValueSet.java 2011-09-12 09:13:33 +0000
@@ -39,7 +39,6 @@
@XmlAccessorType( XmlAccessType.FIELD )
public class DataValueSet
{
-
// ---------------------------------------------------------------------------
// Element and attribute names
// ---------------------------------------------------------------------------
@@ -58,8 +57,6 @@
public static final String DATAVALUE = "dataValue";
- // ---------------------------------------------------------------------------
-
public enum IdentificationStrategy { INTERNAL, UUID, CODE };
/**
@@ -144,5 +141,4 @@
{
this.dataValues = dataValues;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Dxf.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Dxf.java 2011-09-06 16:29:46 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Dxf.java 2011-09-12 09:13:33 +0000
@@ -39,7 +39,6 @@
@XmlAccessorType( XmlAccessType.FIELD )
public class Dxf
{
-
// ---------------------------------------------------------------------------
// Element and attribute names
// ---------------------------------------------------------------------------
@@ -57,7 +56,6 @@
public static final String DATAVALUESET = "dataValueSet";
public static final String MINOR_VERSION_10 = "1.0";
- // ---------------------------------------------------------------------------
@XmlElementWrapper( name="dataSets" )
@XmlElement( name="dataSet" )
@@ -100,6 +98,4 @@
{
this.orgUnits = orgUnits;
}
-
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Link.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Link.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/Link.java 2011-09-12 09:13:33 +0000
@@ -7,7 +7,6 @@
@XmlAccessorType( XmlAccessType.FIELD )
public class Link
{
-
@XmlAttribute( name = "id", required = true )
private String id;
@@ -46,5 +45,4 @@
{
this.name = name;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnit.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnit.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnit.java 2011-09-12 09:13:33 +0000
@@ -9,14 +9,12 @@
@XmlRootElement
public class OrgUnit extends Link
{
-
private Link parent;
@XmlElementWrapper(name="children")
@XmlElement(name="orgUnit")
private List<Link> children;
-
@XmlElementWrapper(name="dataSets")
@XmlElement(name="dataSet")
private List<Link> dataSets;
@@ -49,7 +47,5 @@
public void setParent( Link parent )
{
this.parent = parent;
- }
-
-
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnitLinks.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnitLinks.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/OrgUnitLinks.java 2011-09-12 09:13:33 +0000
@@ -4,12 +4,10 @@
import javax.xml.bind.annotation.XmlRootElement;
-
@XmlRootElement
public class OrgUnitLinks
{
-
- List<Link> orgUnit;
+ private List<Link> orgUnit;
public OrgUnitLinks()
{
@@ -28,8 +26,5 @@
public void setOrgUnit( List<Link> orgUnit )
{
this.orgUnit = orgUnit;
- }
-
-
-
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java 2011-04-22 21:04:14 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java 2011-09-12 09:13:33 +0000
@@ -71,7 +71,7 @@
dxfCombo.setName( optionCombo.getName() );
dxfCombos.add( dxfCombo );
}
+
return dxfCombos;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilder.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilder.java 2011-04-01 09:57:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilder.java 2011-09-12 09:13:33 +0000
@@ -8,9 +8,7 @@
public interface LinkBuilder
{
-
public List<Link> getLinks( Collection<? extends AbstractIdentifiableObject> targets );
public Link get( AbstractIdentifiableObject target );
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java 2011-04-01 09:57:53 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java 2011-09-12 09:13:33 +0000
@@ -29,5 +29,4 @@
return link;
}
-
}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java 2011-02-25 04:16:18 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java 2011-09-12 09:13:33 +0000
@@ -7,7 +7,6 @@
public class OrgUnitMapper
{
-
private LinkBuilder linkBuilder = new LinkBuilderImpl();
public OrgUnit get( OrganisationUnit unit )
@@ -29,5 +28,4 @@
return dxfUnit;
}
-
}
