[jboss-svn-commits] JBL Code SVN: r5253 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service: . impl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Jul 22 09:45:40 EDT 2006
Author: wrzep
Date: 2006-07-22 09:45:36 -0400 (Sat, 22 Jul 2006)
New Revision: 5253
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
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/ShotokuScoresRepositoryManager.java
Log:
JBLAB-689
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -34,4 +34,8 @@
public void save(PluginsValues pluginsValues);
public PluginsValues get(Calendar date);
+
+ public long getValue(String pluginId, String projectId, Calendar cal);
+
+ public boolean hasValue(String pluginId, String projectId, Calendar cal);
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -27,6 +27,7 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
/**
@@ -40,4 +41,10 @@
public PluginsValues get(Calendar cal)
throws GetScoresException;
+
+ public PluginValues getPluginValues(String pluginId, Calendar cal)
+ throws GetScoresException;
+
+ public long getValue(String pluginId, String projectId, Calendar cal)
+ throws GetScoresException;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -48,4 +48,7 @@
throws GetScoresException;
public boolean hasPluginsValues(Calendar cal);
+
+ public long getValue(String pluginId, String projectId, Calendar cal)
+ throws GetScoresException;
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -34,8 +34,8 @@
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.DBService;
import org.jboss.forge.status.service.ScoresRepositoryManager;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.tools.Tools;
/**
@@ -64,10 +64,8 @@
public PluginsValues get(Calendar cal) throws GetScoresException {
- PluginsValues pv = null;
+ PluginsValues pv = null;
- Tools.truncate(cal);
-
try {
pv = service.get(cal);
} catch (Exception e) {
@@ -90,4 +88,26 @@
return service;
}
+
+ public long getValue(String pluginId, String projectId, Calendar cal)
+ throws GetScoresException {
+
+ if (!service.hasValue(pluginId, projectId, cal)) {
+ throw new GetScoresException("Value not available.");
+ }
+
+ return service.getValue(pluginId, projectId, cal);
+ }
+
+ public PluginValues getPluginValues(String pluginId, Calendar cal)
+ throws GetScoresException {
+
+ PluginsValues pluginsValues = get(cal);
+
+ if (pluginsValues == null) {
+ throw new GetScoresException();
+ }
+
+ return pluginsValues.getPluginValues(pluginId);
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -39,6 +39,7 @@
import org.jboss.forge.status.common.Constants;
import org.jboss.forge.status.service.DBService;
import org.jboss.forge.status.service.protocol.PluginsValues;
+import org.jboss.forge.status.tools.Tools;
/**
@@ -58,7 +59,8 @@
PluginsValues pv = get(toSave.getDate());
- if (pv.getDate().equals(toSave.getDate())) {
+ if ((pv != null) &&
+ (pv.getDate().equals(toSave.getDate()))) {
em.remove(pv);
}
@@ -67,6 +69,8 @@
}
public PluginsValues get(Calendar date) {
+
+ Tools.truncate(date);
List list = null;
@@ -80,9 +84,22 @@
list = query.getResultList();
- System.out.println("get(0): " + list.get(0));
+ System.out.println("get(0): " +
+ (list.size() == 0 ? null : (PluginsValues) list.get(0)));
return (list.size() == 0 ? null : (PluginsValues) list.get(0));
+ }
+
+ public long getValue(String pluginId, String projectId, Calendar cal) {
+
+ // TODO
+ return 0;
+ }
+
+ public boolean hasValue(String pluginId, String projectId, Calendar cal) {
+
+ // TODO
+ return false;
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -109,21 +109,6 @@
log.info("Saving...");
repositoryManager.save(pluginsValues);
-
- // <DEBUG>
- /*
- ScoresRepositoryManager dbrm;
- try {
- dbrm = new DBScoresRepositoryManager();
- PluginsValues ple = (new DBScoresFactory()).
- createPluginsValues(projects, plugins);
- dbrm.save(ple);
- } catch (NamingException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- */
- // </DEBUG>
}
@@ -153,5 +138,11 @@
}
return (pluginsValues != null);
+ }
+
+ public long getValue(String pluginId, String projectId, Calendar cal)
+ throws GetScoresException {
+
+ return repositoryManager.getValue(pluginId, projectId, cal);
}
}
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-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -190,20 +190,7 @@
Calendar cal)
throws GetScoresException {
- PluginsValues pluginsValues = getScores(cal);
-
- Long val = null;
- PluginValues pluginValues = pluginsValues.getPluginValues(pluginId);
-
- if (pluginValues != null) {
- val = pluginValues.getValue(projectId);
- }
-
- if (val == null) {
- throw new GetScoresException();
- }
-
- return val;
+ return service.getValue(pluginId, projectId, cal);
}
/**
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java 2006-07-22 13:36:04 UTC (rev 5252)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java 2006-07-22 13:45:36 UTC (rev 5253)
@@ -36,6 +36,7 @@
import org.jboss.forge.status.exceptions.GetScoresException;
import org.jboss.forge.status.exceptions.ScoresSaveException;
import org.jboss.forge.status.service.ScoresRepositoryManager;
+import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.logging.Logger;
import org.jboss.shotoku.ContentManager;
@@ -306,5 +307,29 @@
return values;
}
+
+ public long getValue(String pluginId, String projectId, Calendar cal)
+ throws GetScoresException {
+
+ PluginValues pluginValues = getPluginValues(pluginId, cal);
+
+ if (pluginValues == null) {
+ throw new GetScoresException();
+ }
+
+ return pluginValues.getValue(projectId);
+ }
+
+ public PluginValues getPluginValues(String pluginId, Calendar cal)
+ throws GetScoresException {
+
+ PluginsValues pluginsValues = get(cal);
+
+ if (pluginsValues == null) {
+ throw new GetScoresException();
+ }
+
+ return pluginsValues.getPluginValues(pluginId);
+ }
}
More information about the jboss-svn-commits
mailing list