fxies

Author: skyhit

conf/objectFactory_config.xml

@@ -251,16 +251,6 @@
                 </Property>
             </Property>
         </Property>
-
-        <!--
-                    Configuration for ConfluenceUserService implementation
-                    @since: Jira & Confluence User Sync Service
-                    -->
-        <Property name="confluenceUserServiceKey">
-            <Property name="type">
-                <Value>com.topcoder.confluence.client.impl.ConfluenceUserServiceImpl</Value>
-            </Property>
-        </Property>
     </Config>
 
     <!--

src/java/main/com/topcoder/direct/services/view/action/contest/SoftwareContestSubmissionsAction.java

@@ -132,7 +132,7 @@
  * load these data via ajax instead after the page finishes loading.
  * </p>
  *
- * @author GreatKevin, Veve, TCCoder 
+ * @author GreatKevin, Veve
  * @version 1.9
  */
 public class SoftwareContestSubmissionsAction extends StudioOrSoftwareContestAction {
@@ -662,6 +662,8 @@ public int compare(SoftwareSubmissionDTO o1, SoftwareSubmissionDTO o2) {
             // set project bug race fee configuration
             ProjectData directProjectData = getProjectServiceFacade().getProject(currentUser,
                     softwareCompetition.getProjectHeader().getTcDirectProjectId());
+            setFixedBugRaceFee(directProjectData.getFixedBugContestFee());
+            setPercentageBugRaceFee(directProjectData.getPercentageBugContestFee());
 
             enableCopilotPostingSubmissionPreview = true;
 

src/java/main/com/topcoder/direct/services/view/action/project/ProjectOverviewAction.java

@@ -618,7 +618,7 @@ private void setProjectGeneralInfo(ProjectData project) throws Exception {
             } else if (keyId == 5L) {
                 // jira
                 getViewData().getProjectGeneralInfo().setJira(m.getMetadataValue());
-            } if (keyId == 6L) {
+            } else if (keyId == 6L) {
                 // planned duration
                 getViewData().getProjectGeneralInfo().setPlannedDuration(Integer.parseInt(m.getMetadataValue()));
             } else if (keyId == 10L) {

src/java/main/com/topcoder/direct/services/view/action/project/edit/EditCockpitProjectAction.java

@@ -132,10 +132,9 @@
  * - Removes the statements to populate the right sidebar direct projects and project contests. It's changed to
  * load these data via ajax instead after the page finishes loading.
  * </p>
- * 
- * @author GreatKevin, freegod, FireIce, Veve
+ *
  * @version 2.6
- * 
+ * @author GreatKevin, freegod, FireIce, Veve
  */
 @WriteProject
 public class EditCockpitProjectAction extends BaseDirectStrutsAction implements FormAction<ProjectIdForm>,

src/java/main/com/topcoder/direct/services/view/action/report/DashboardBillingCostReportAction.java

@@ -321,10 +321,10 @@ protected void executeAction() throws Exception {
                 if(contestEntries != null && contestEntries.size() > 0) {
                     // filter by project category id - the contestEntries contains records for the same contest
                     // so we only need to check any record in the list first - we check the 1st record
-					if (contestEntries.get(0).getContestType() == null || contestEntries.get(0).getContestType().getId() == 0)
-					{
-						 viewData.addAll(contestEntries);
-					}
+                    if (contestEntries.get(0).getContestType() == null || contestEntries.get(0).getContestType().getId() == 0)
+                    {
+                        viewData.addAll(contestEntries);
+                    }
                     if(contestCategoriesSet.contains(contestEntries.get(0).getContestType().getId())) {
                         viewData.addAll(contestEntries);
                     }
@@ -373,25 +373,25 @@ public int compare(BillingCostReportEntryDTO one, BillingCostReportEntryDTO othe
 
             getViewData().setEntries(viewData);
 
-		        // count the total contest number and  bug race number
-		        Set<Long> uniqueContestSet = new HashSet<Long>();
+                // count the total contest number and  bug race number
+                Set<Long> uniqueContestSet = new HashSet<Long>();
                 Set<String> uniqueBugRaces = new HashSet<String>();
-		
-		        for(BillingCostReportEntryDTO entry : getViewData().getEntries()) {
-		            if(entry.getContest() != null) {
-		                // ignore the items linked to project
-		                if (entry.getPaymentId() <= 0 || entry.getContest().getName() != null) {
-		                    uniqueContestSet.add(entry.getContest().getId());
-		                }
-		            }
-		            if (entry.getPaymentType().trim().equalsIgnoreCase("bugs") ||
-		                (entry.getPaymentId() > 0 && entry.getContest().getName() == null && entry.getReferenceId() != null)) {
+
+                for(BillingCostReportEntryDTO entry : getViewData().getEntries()) {
+                    if(entry.getContest() != null) {
+                        // ignore the items linked to project
+                        if (entry.getPaymentId() <= 0 || entry.getContest().getName() != null) {
+                            uniqueContestSet.add(entry.getContest().getId());
+                        }
+                    }
+                    if (entry.getPaymentType().trim().equalsIgnoreCase("bugs") ||
+                        (entry.getPaymentId() > 0 && entry.getContest().getName() == null && entry.getReferenceId() != null)) {
                         uniqueBugRaces.add(entry.getReferenceId());
-		            }
-		        }
-		
-		        // set aggregation stats
-		        getViewData().setTotalContestsNumber(uniqueContestSet.size());
+                    }
+                }
+
+                // set aggregation stats
+                getViewData().setTotalContestsNumber(uniqueContestSet.size());
                 getViewData().setTotalBugRacesNumber(uniqueBugRaces.size());
 
         }