Author: ronvoe122
Date: 2007-12-22 14:06:41-0800
New Revision: 10517
Removed:
trunk/src/java/org/tigris/scarab/tools/ScarabToolManager.java
trunk/src/test/org/tigris/scarab/tools/
Modified:
trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java
trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java
trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java
Log:
Remove ScarabToolManager:
While it's more than true that ScarabRequestTool contains too much business logic, it helps nothing to move the BL into another global "manager"-class.
In the long term the BL should be moved into the domain objects, where it belongs.
Modified: trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java?view=diff&rev=10517&p1=trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java&p2=trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java&r1=10516&r2=10517
==============================================================================
--- trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java (original)
+++ trunk/src/java/org/tigris/scarab/feeds/IssueFeed.java 2007-12-22 14:06:41-0800
@@ -12,7 +12,6 @@
import org.tigris.scarab.om.ActivitySet;
import org.tigris.scarab.om.Issue;
import org.tigris.scarab.tools.ScarabLocalizationTool;
-import org.tigris.scarab.tools.ScarabToolManager;
import org.tigris.scarab.util.ScarabLink;
import com.sun.syndication.feed.synd.SyndContent;
@@ -35,13 +34,11 @@
private Issue issue;
private ScarabLink scarabLink;
- private ScarabToolManager scarabToolManager;
private ScarabLocalizationTool l10nTool;
- public IssueFeed(Issue issue,ScarabLink scarabLink,ScarabToolManager scarabToolManager, ScarabLocalizationTool l10nTool) {
+ public IssueFeed(Issue issue,ScarabLink scarabLink, ScarabLocalizationTool l10nTool) {
this.issue = issue;
this.scarabLink = scarabLink;
- this.scarabToolManager = scarabToolManager;
this.l10nTool = l10nTool;
}
Modified: trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java?view=diff&rev=10517&p1=trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java&p2=trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java&r1=10516&r2=10517
==============================================================================
--- trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java (original)
+++ trunk/src/java/org/tigris/scarab/screens/RSSDataExport.java 2007-12-22 14:06:41-0800
@@ -131,14 +131,13 @@
ScarabLink scarabLink= getScarabLinkTool(context);
Feed feedSource = null;
- ScarabToolManager scarabToolManager = new ScarabToolManager(getLocalizationTool(context));
if (feedType.equals("IssueFeed")){
String issueId = parser.getString(ISSUE_ID_KEY);
if(issueId.equals("")){
throw new IllegalArgumentException("Issue ID is missing. Should be appended like: /issueId/xxx");
}
Issue issue = IssueManager.getIssueById(issueId);
- feedSource = new IssueFeed(issue,scarabLink,scarabToolManager, getLocalizationTool(context));
+ feedSource = new IssueFeed(issue,scarabLink, getLocalizationTool(context));
}
else {
throw new Exception("Couldn't find feed for type:" + feedType);
Modified: trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java?view=diff&rev=10517&p1=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&p2=trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java&r1=10516&r2=10517
==============================================================================
--- trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java (original)
+++ trunk/src/java/org/tigris/scarab/tools/ScarabRequestTool.java 2007-12-22 14:06:41-0800
@@ -631,6 +631,64 @@
}
/**
+ * First attempts to get the RModuleUserAttributes from the user. If it is
+ * empty, then it will try to get the defaults from the module. If anything
+ * fails, it will return an empty list.
+ */
+ private List getRModuleUserAttributes(ScarabUser user, Module module, IssueType issueType) {
+ List issueListColumns = null;
+ try {
+ //
+ // First check whether an MIT list is currently
+ // active and if so, whether it has attributes
+ // associated with it.
+ //
+ MITList currentList = user.getCurrentMITList();
+ if (currentList != null) {
+ //
+ // Here we fetch the collection of attributes
+ // associated with the current MIT list.
+ //
+
+ //issueListColumns = currentList.getCommonRModuleUserAttributes();
+ issueListColumns = currentList.getAllRModuleUserAttributes();
+
+ //
+ // If there are no attributes associated with
+ // the list, and the list only contains a single
+ // module and a single issue type, get the default
+ // attributes for that combination of module and
+ // issue type.
+ //
+ if (issueListColumns.isEmpty()
+ && currentList.isSingleModuleIssueType()) {
+ issueListColumns = currentList.getModule()
+ .getDefaultRModuleUserAttributes(
+ currentList.getIssueType());
+ }
+ }
+
+ if (issueListColumns == null) {
+ issueListColumns = user.getRModuleUserAttributes(module,
+ issueType);
+ if (issueListColumns.isEmpty()) {
+ issueListColumns = module
+ .getDefaultRModuleUserAttributes(issueType);
+ }
+ }
+ if (issueListColumns == null)
+ {
+ issueListColumns = Collections.EMPTY_LIST;
+ }
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+
+ return issueListColumns;
+ }
+
+ /**
* First attempts to get the RModuleUserAttributes from the user.
* If it is empty, then it will try to get the defaults from the module.
* If anything fails, it will return an empty list.
@@ -640,9 +698,7 @@
ScarabUser user = (ScarabUser)data.getUser();
if(issueListColumns == null){
- ScarabLocalizationTool l10n = getLocalizationTool();
- ScarabToolManager toolManager = new ScarabToolManager(l10n);
- issueListColumns= toolManager.getRModuleUserAttributes(user, user.getCurrentModule(), issueType);
+ issueListColumns= getRModuleUserAttributes(user, user.getCurrentModule(), issueType);
if (issueListColumns == null)
{
issueListColumns = Collections.EMPTY_LIST;
Removed: trunk/src/java/org/tigris/scarab/tools/ScarabToolManager.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/tools/ScarabToolManager.java?view=auto&rev=10516
Modified: trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java?view=diff&rev=10517&p1=trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java&p2=trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java&r1=10516&r2=10517
==============================================================================
--- trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java (original)
+++ trunk/src/test/org/tigris/scarab/feeds/IssueFeedTest.java 2007-12-22 14:06:41-0800
@@ -48,7 +48,6 @@
import org.tigris.scarab.test.BaseScarabTestCase;
import org.tigris.scarab.test.mocks.MockScarabLink;
import org.tigris.scarab.test.mocks.MockScarabLocalizationTool;
-import org.tigris.scarab.tools.ScarabToolManager;
import com.sun.syndication.feed.synd.SyndFeed;
import com.sun.syndication.io.SyndFeedOutput;
@@ -60,10 +59,8 @@
public class IssueFeedTest extends BaseScarabTestCase {
public void testCreatingFeed() throws Exception {
- ScarabToolManager stm = new ScarabToolManager(
- new MockScarabLocalizationTool());
Issue issue = getIssue0();
- Feed feed = new IssueFeed(issue, new MockScarabLink(), stm, new MockScarabLocalizationTool());
+ Feed feed = new IssueFeed(issue, new MockScarabLink(), new MockScarabLocalizationTool());
SyndFeed syndFeed = feed.getFeed();
syndFeed.setFeedType("rss_2.0");
SyndFeedOutput out = new SyndFeedOutput();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.