dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02078
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 696: Codestyle fix.
------------------------------------------------------------
revno: 696
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-09-14 15:32:34 +0200
message:
Codestyle fix.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelNormal.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelItemNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelNameComparator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/status/DataEntryStatus.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/reportexcel/ReportExcel.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcel.java 2009-09-14 13:32:34 +0000
@@ -37,7 +37,6 @@
*/
public abstract class ReportExcel
{
-
public static class TYPE
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelItem.java 2009-09-14 13:32:34 +0000
@@ -1,3 +1,5 @@
+package org.hisp.dhis.reportexcel;
+
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -24,14 +26,13 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.hisp.dhis.reportexcel;
+
/**
* @author Tran Thanh Tri
* @version $Id$
*/
public class ReportExcelItem
{
-
private int id;
private String name;
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelNormal.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelNormal.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/ReportExcelNormal.java 2009-09-14 13:32:34 +0000
@@ -8,7 +8,6 @@
public class ReportExcelNormal
extends ReportExcel
{
-
public ReportExcelNormal()
{
super();
@@ -20,7 +19,6 @@
{
super( name, excelTemplateFile, periodRow, periodColumn, organisationRow, organisationColumn, reportItems,
organisationAssocitions, userRoles, group );
- // TODO Auto-generated constructor stub
}
@Override
@@ -28,9 +26,4 @@
{
return ReportExcel.TYPE.NORMAL;
}
-
-
-
-
-
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelItemNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelItemNameComparator.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelItemNameComparator.java 2009-09-14 13:32:34 +0000
@@ -1,3 +1,5 @@
+package org.hisp.dhis.reportexcel.comparator;
+
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -24,23 +26,19 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.hisp.dhis.reportexcel.comparator;
import java.util.Comparator;
import org.hisp.dhis.reportexcel.ReportExcelItem;
+
/**
* @author Tran Thanh Tri
* @version $Id$
*/
public class ReportExcelItemNameComparator implements Comparator<ReportExcelItem>
{
-
public int compare( ReportExcelItem arg0, ReportExcelItem arg1 )
{
return arg0.getName().compareToIgnoreCase( arg1.getName() );
}
-
-
-
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelNameComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelNameComparator.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/comparator/ReportExcelNameComparator.java 2009-09-14 13:32:34 +0000
@@ -1,3 +1,5 @@
+package org.hisp.dhis.reportexcel.comparator;
+
/*
* Copyright (c) 2004-2007, University of Oslo
* All rights reserved.
@@ -24,7 +26,6 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-package org.hisp.dhis.reportexcel.comparator;
import java.util.Comparator;
@@ -41,6 +42,4 @@
{
return o1.getName().compareToIgnoreCase( o2.getName() );
}
-
-
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/status/DataEntryStatus.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/status/DataEntryStatus.java 2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reportexcel/status/DataEntryStatus.java 2009-09-14 13:32:34 +0000
@@ -134,5 +134,4 @@
return false;
return true;
}
-
}