dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21646
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-01-07 16:21:47 +0100
message:
  Unused code
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataSetMetadata.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-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2016-01-07 10:07:11 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java	2016-01-07 15:21:47 +0000
@@ -205,14 +205,9 @@
     @Override
     public List<SystemSetting> getAllSystemSettings()
     {
-
-        /*
-         * Remove confidential settings from this list!
-         */
         return systemSettingStore.getAll().stream()
             .filter( systemSetting -> !isConfidential( systemSetting.getName() ) )
             .collect( Collectors.toList() );
-
     }
 
     @Override

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataSetMetadata.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataSetMetadata.java	2016-01-06 11:43:22 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/adx/AdxDataSetMetadata.java	2016-01-07 15:21:47 +0000
@@ -38,22 +38,17 @@
 import org.hisp.dhis.dataset.DataSet;
 
 /**
- *
  * @author bobj
  */
 public class AdxDataSetMetadata
 {
-    private final DataSet dataSet;
-
-    // Lookup category options per catoptcombo
+    // Lookup category options per cat option combo
     
     private final Map<Integer, Map<String, String>> categoryOptionMap;
 
     AdxDataSetMetadata( DataSet dataSet )
         throws AdxException
     {
-        this.dataSet = dataSet;
-
         categoryOptionMap = new HashMap<>();
 
         Set<DataElementCategoryCombo> catCombos = new HashSet<>();