Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1839 - in trunk/labs/kosmos/src/java/hu/midori/kosmos/server: . cc jira svn
|
From: <jbo...@li...> - 2005-12-18 10:32:09
|
Author: aron.gombas
Date: 2005-12-18 05:31:58 -0500 (Sun, 18 Dec 2005)
New Revision: 1839
Modified:
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java
Log:
Naming fixed
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-12-18 00:30:58 UTC (rev 1838)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/AbstractKosmosService.java 2005-12-18 10:31:58 UTC (rev 1839)
@@ -129,7 +129,7 @@
* Must be called before the first file gets stored.
* @see CachedDataStore
*/
- protected void beginXxx() {
+ protected void beginStoreSession() {
log.debug(String.format("Beginning store session...."));
store.begin();
}
@@ -138,7 +138,7 @@
* Must be called after the last file got stored.
* @see CachedDataStore
*/
- protected void endXxx() {
+ protected void endStoreSession() {
log.debug(String.format("Ending store session..."));
store.end();
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-12-18 00:30:58 UTC (rev 1838)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-12-18 10:31:58 UTC (rev 1839)
@@ -76,7 +76,7 @@
String url = key.toString();
List<CcProject> projects = new ArrayList<CcProject>();
- beginXxx();
+ beginStoreSession();
try {
Document dom = ScrapingUtils.downloadHtmlDom(new URL(url));
@@ -160,7 +160,7 @@
log.error("Unable to scrape", ex);
}
- endXxx();
+ endStoreSession();
return projects;
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-12-18 00:30:58 UTC (rev 1838)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-12-18 10:31:58 UTC (rev 1839)
@@ -73,7 +73,7 @@
String url = key.toString();
List<JiraProject> projects = new ArrayList<JiraProject>();
- beginXxx();
+ beginStoreSession();
try {
// download database info
@@ -274,7 +274,7 @@
log.error("Unable to scrape", ex);
}
- endXxx();
+ endStoreSession();
return projects;
}
Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java
===================================================================
--- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-12-18 00:30:58 UTC (rev 1838)
+++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-12-18 10:31:58 UTC (rev 1839)
@@ -102,7 +102,7 @@
String url = key.toString();
List<SvnRepository> repositories = new ArrayList<SvnRepository>();
- beginXxx();
+ beginStoreSession();
try {
// get repository info
@@ -129,7 +129,7 @@
log.error("Unable to process the SVN repo", ex);
}
- endXxx();
+ endStoreSession();
return repositories;
}
@@ -228,7 +228,7 @@
SvnRepositoryLogStats stats = new SvnRepositoryLogStats();
log.info(String.format("Analyzing log of \"%s\" repository...", repository.getLocation().toString()));
- Collection<SVNLogEntry> logEntries = (Collection<SVNLogEntry>)repository.log(new String[] {""}, null, 0, repository.getLatestRevision(), true, true);// TODO set the target path here
+ Collection<SVNLogEntry> logEntries = (Collection<SVNLogEntry>)repository.log(new String[] {""}, null, 0, repository.getLatestRevision(), true, false);
log.info(String.format("%d log-entries received.", logEntries.size()));
// analyze
@@ -288,15 +288,17 @@
char type = logEntryPath.getType();
// skip copied branches
- if(logEntryPath.getCopyPath() != null)// TODO can this fix the physFileNo+phyDirNo != countedDirEntryNo problem?
- continue;
+ //if(logEntryPath.getCopyPath() != null)
+ // continue;
- // TODO merge this method with the 2adder stuff
+ // update repo entry counters
+ int repoEntryAdder = 0;
switch(type) {
- case 'A': addedFiles++; break; // 'add'
- case 'D': deletedFiles++; break;// 'delete'
+ case 'A': addedFiles++; repoEntryAdder = 1; break; // 'add'
+ case 'D': deletedFiles++; repoEntryAdder = -1; break; // 'delete'
case 'M': modifiedFiles++; break; // 'modify'
case 'R': replacedFiles++; break; // 'replace'
+ default: throw new IllegalArgumentException(String.format("Unknown commit type '%c'", type));
}
// count commits-per-file
@@ -306,9 +308,9 @@
// count files-per-week
TimeSeriesDataItem repoEntriesPerCurrentWeek = stats.repoEntriesPerWeek.getDataItem(commitWeek);
if(repoEntriesPerCurrentWeek != null)
- stats.repoEntriesPerWeek.addOrUpdate(commitWeek, repoEntriesPerCurrentWeek.getValue().intValue() + commitTypeToAdder(type));
+ stats.repoEntriesPerWeek.addOrUpdate(commitWeek, repoEntriesPerCurrentWeek.getValue().intValue() + repoEntryAdder);
else
- stats.repoEntriesPerWeek.add(commitWeek, commitTypeToAdder(type));
+ stats.repoEntriesPerWeek.add(commitWeek, repoEntryAdder);
}
}
@@ -326,17 +328,6 @@
return stats;
}
- /** Returns the Subversion commit types as adders in file count ('A' meaning 'add' will return +1). */
- protected int commitTypeToAdder(char type) {
- switch(type) {
- case 'A': return 1; // 'add'
- case 'D': return -1; // 'delete'
- case 'M': return 0; // 'modify'
- case 'R': return 0; // 'replace'
- default: throw new IllegalArgumentException(String.format("Unknown commit type '%c'", type));
- }
- }
-
/** Wraps the stats retrieved from the log of a SVN repository. */
private class SvnRepositoryContentStats {
public int dirs;
|
