[jboss-svn-commits] JBL Code SVN: r6086 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: plugins/codelines service/impl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 5 12:19:50 EDT 2006
Author: wrzep
Date: 2006-09-05 12:19:43 -0400 (Tue, 05 Sep 2006)
New Revision: 6086
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CheckOutEditor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesTotalPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
Log:
JBLAB-751
Cleanup.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CheckOutEditor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CheckOutEditor.java 2006-09-05 15:55:26 UTC (rev 6085)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CheckOutEditor.java 2006-09-05 16:19:43 UTC (rev 6086)
@@ -30,6 +30,8 @@
import org.jboss.logging.Logger;
import org.tmatesoft.svn.core.SVNCommitInfo;
+import org.tmatesoft.svn.core.SVNErrorCode;
+import org.tmatesoft.svn.core.SVNErrorMessage;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNProperty;
import org.tmatesoft.svn.core.io.ISVNEditor;
@@ -77,7 +79,7 @@
public void addFile(String path, String copyFromPath, long copyFromRevision)
throws SVNException {
- log.debug("Adding file " + path + "(" + codeLines + ")");
+ log.debug("File: " + path);
isTextMimeType = true;
}
@@ -91,7 +93,8 @@
}
}
- public void applyTextDelta(String path, String baseChecksum) throws SVNException {
+ public void applyTextDelta(String path, String baseChecksum)
+ throws SVNException {
if (!isTextMimeType) {
return;
@@ -100,8 +103,9 @@
try {
file = File.createTempFile("JBoss", "CodeLinesEvaluator");
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+ throw new SVNException(SVNErrorMessage.
+ create(SVNErrorCode.UNKNOWN),e);
}
myDeltaProcessor.applyTextDelta(null, file, false);
@@ -134,12 +138,13 @@
codeLines += lnReader.getLineNumber();
- log.debug("File: " + path + " Number of code lines: "
+ log.debug("File: " + path + ". Number of code lines: "
+ lnReader.getLineNumber() + ".");
} catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+
+ throw new SVNException(SVNErrorMessage.
+ create(SVNErrorCode.UNKNOWN),e);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java 2006-09-05 15:55:26 UTC (rev 6085)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java 2006-09-05 16:19:43 UTC (rev 6086)
@@ -77,21 +77,16 @@
* @param userName user's name used in authorisation
* @param password user's password used in authorisation
* @return number of code lines
+ * @throws SVNException
*/
public static long getCodeLinesNumberFast(String url, String userName,
- String password) {
+ String password) throws SVNException {
SVNRepository repository = getRepository(url, userName, password);
CheckOutEditor editor = new CheckOutEditor();
-
- try {
- repository.checkout(SVNRevision.HEAD.getNumber(), "", true, editor);
- } catch (SVNException e) {
- e.printStackTrace();
- return 0;
- //TODO exceptions should be handled inside plugin not evaluator
- }
+
+ repository.checkout(SVNRevision.HEAD.getNumber(), "", true, editor);
return editor.getCodeLines();
}
@@ -112,8 +107,9 @@
*
* @param url SVN repository adress
* @return number of code lines
+ * @throws SVNException
*/
- public static long getCodeLinesNumberFast(String url) {
+ public static long getCodeLinesNumberFast(String url) throws SVNException {
return getCodeLinesNumberFast(url, "anonymus", "anonymus");
}
@@ -170,9 +166,6 @@
ISVNAuthenticationManager authManager = SVNWCUtil.createDefaultAuthenticationManager(userName, password);
repository.setAuthenticationManager(authManager);
- /* Analyze */
- log.info("Analyzing repository " + repository.getLocation() + ".");
-
return repository;
}
@@ -186,6 +179,8 @@
*/
private static long getCodeLinesNumber(SVNRepository repository, String path) {
+ log.debug("Analyzing " + path + ".");
+
Collection<SVNDirEntry> dirEntries = getDirEntries(repository, path);
if (dirEntries == null) {
@@ -263,8 +258,6 @@
@SuppressWarnings("unchecked")
private static Collection<SVNDirEntry> getDirEntries(SVNRepository repository, String path) {
- log.debug("Analyzing " + path + ".");
-
Map fileProperties = new HashMap();
Collection<SVNDirEntry> dirEntries = null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-09-05 15:55:26 UTC (rev 6085)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-09-05 16:19:43 UTC (rev 6086)
@@ -27,6 +27,7 @@
import org.jboss.forge.common.projects.Repository;
import org.jboss.forge.status.plugins.Plugin;
+import org.jboss.logging.Logger;
/**
* @author Pawel Wrzeszcz
@@ -49,6 +50,8 @@
/** Binds project ids with their values */
private Map<String,Long> cachedValues;
+ protected Logger log = Logger.getLogger(CodeLinesPlugin.class);
+
public CodeLinesPlugin() {
super();
cachedValues = new HashMap<String,Long>();
@@ -57,8 +60,6 @@
@Override
public long getValue(String projectId) {
- projectId = "shotoku"; //DBG
-
if (!cachedValues.containsKey(projectId)) {
long cl = 0;
@@ -72,6 +73,10 @@
String password = repo.getPassword();
cl = getValue(url, userName, password);
+
+ log.debug("Project " + projectId +
+ ". Number of code lines: " + cl);
+
cachedValues.put(projectId, new Long(cl));
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesTotalPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesTotalPlugin.java 2006-09-05 15:55:26 UTC (rev 6085)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesTotalPlugin.java 2006-09-05 16:19:43 UTC (rev 6086)
@@ -22,13 +22,15 @@
package org.jboss.forge.status.plugins.codelines;
+import org.tmatesoft.svn.core.SVNException;
+
/**
* @author Pawel Wrzeszcz
* Plugin returns total number of lines of code in project svn repository.
*/
public class CodeLinesTotalPlugin extends CodeLinesPlugin {
-
+
@Override
protected long getValue(String url, String userName, String password) {
@@ -36,7 +38,16 @@
return CodeLinesEvaluator.getCodeLinesNumber(url, userName, password);
}
- return CodeLinesEvaluator.getCodeLinesNumberFast(url);
+ long cl = 0;
+
+ try {
+ cl = CodeLinesEvaluator.getCodeLinesNumberFast(url);
+ } catch (SVNException e) {
+
+ log.warn("Unable to evaluate number of code lines. URL: " + url, e);
+ }
+
+ return cl;
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-09-05 15:55:26 UTC (rev 6085)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-09-05 16:19:43 UTC (rev 6086)
@@ -151,7 +151,7 @@
for(;;) {
- log.info("Trying " + cal.getTime().toString());
+ log.debug("Trying " + cal.getTime().toString());
boolean hasScores;
@@ -204,9 +204,6 @@
public long getValue(String pluginId, String projectId,
Calendar start, Calendar end) throws GetScoresException {
- /*
- */
-
return service.getValue(pluginId, projectId, start, end);
}
More information about the jboss-svn-commits
mailing list