Scarab commit: svn commit: r11250 - branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab: actions actions/admin actions/base pipeline screens screens/admin
[email protected] Fri, 4 May 2012 08:06:29 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-05-04 08:06:29-0700
New Revision: 11250
Modified:
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java
branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java
Log:
CHG - Method .setTarget(RunData, String) -> .RunData.setScreenTemplate(String)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ChangePassword.java 2012-05-04 08:06:29-0700
@@ -108,7 +108,7 @@
if (oldPassword.equals(password))
{
scarabR.setInfoMessage(L10NKeySet.PasswordSame);
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
else if (password.equals(passwordConfirm))
{
@@ -130,24 +130,24 @@
// Remove NEXT_TEMPLATE, so we will start again from home after login
data.getParameters().remove(ScarabConstants.NEXT_TEMPLATE);
- setTarget(data, "Login.vm");
+ data.setScreenTemplate("Login.vm");
}
catch (PasswordMismatchException pme)
{
scarabR.setAlertMessage(l10n.getMessage(pme));
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
else /* !password.equals(passwordConfirm) */
{
scarabR.setAlertMessage(L10NKeySet.PasswordsDoNotMatch);
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
else
{
scarabR.setAlertMessage("Failed to process form input.");
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureIssueList.java 2012-05-04 08:06:29-0700
@@ -128,7 +128,7 @@
if (attributes.isEmpty())
{
scarabR.setAlertMessage(L10NKeySet.MustSelectAtLeastOneAttribute);
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.TEMPLATE,
"ConfigureIssueList.vm"));
return;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ConfigureReport.java 2012-05-04 08:06:29-0700
@@ -128,7 +128,7 @@
if (!report.isEditable((ScarabUser)data.getUser()))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
}
else if (intake.isAllValid())
{
@@ -143,7 +143,7 @@
l10n.get(L10NKeySet.ReportUpdated) :
l10n.get(L10NKeySet.ReportUpdatedNotSaved);
scarabR.setConfirmMessage(msg);
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
else
{
@@ -151,7 +151,7 @@
l10n.get("ReportUpdatedPleaseAddRowAndColumnCriteria") :
l10n.get("ReportUpdatedNotSavedPleaseAddRowAndColumnCriteria");
scarabR.setConfirmMessage(msg);
- setTarget(data, "reports,AxisConfiguration.vm");
+ data.setScreenTemplate("reports,AxisConfiguration.vm");
}
}
else
@@ -160,14 +160,14 @@
// null, but since the conditional was here, don't fail silently
scarabR.setAlertMessage(
L10NKeySet.ThisShouldNotHappenPleaseContactAdmin);
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
}
else
{
scarabR.setAlertMessage(
L10NKeySet.InvalidData);
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
}
@@ -241,7 +241,7 @@
if (!report.isEditable((ScarabUser)data.getUser()))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
}
else if (intake.isAllValid())
{
@@ -371,7 +371,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -431,7 +431,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -489,7 +489,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -562,7 +562,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -602,7 +602,7 @@
.getAxis(axis).getReportHeadings().get(level);
if (heading.calculateType() == 0)
{
- setTarget(data, "reports,EditGroups.vm");
+ data.setScreenTemplate("reports,EditGroups.vm");
}
else
{
@@ -626,7 +626,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -648,7 +648,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -714,7 +714,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -764,7 +764,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -805,7 +805,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -883,7 +883,7 @@
if (success)
{
- setTarget(data, "reports,AxisConfiguration.vm");
+ data.setScreenTemplate("reports,AxisConfiguration.vm");
}
}
@@ -895,7 +895,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -940,7 +940,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -1041,7 +1041,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -1073,7 +1073,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -1108,7 +1108,7 @@
// list the current user's list.
user.setCurrentMITList(
report.getMITList());
- setTarget(data, "reports,XModuleList.vm");
+ data.setScreenTemplate("reports,XModuleList.vm");
}
public void doConfinedataset(RunData data, Context context)
@@ -1119,7 +1119,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -1140,7 +1140,7 @@
report.setDefaultDate(null);
}
scarabR.setConfirmMessage(L10NKeySet.ChangesSaved);
- setTarget(data, "reports,ConfineDataset.vm");
+ data.setScreenTemplate("reports,ConfineDataset.vm");
}
@@ -1152,7 +1152,7 @@
if (!report.isEditable(user))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -1228,11 +1228,11 @@
{
// The ReportExport screen has no corresponding template.
data.getParameters().setString(ExportFormat.KEY_NAME, format);
- setTarget(data, "ReportExport.vm");
+ data.setScreenTemplate("ReportExport.vm");
}
else
{
- setTarget(data, "reports,Report_1.vm");
+ data.setScreenTemplate("reports,Report_1.vm");
}
}
@@ -1252,11 +1252,11 @@
if (user.getCurrentMITList() == null)
{
//context.add("report", Boolean.TRUE);
- setTarget(data, "reports,XModuleList.vm");
+ data.setScreenTemplate("reports,XModuleList.vm");
}
else
{
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
}
@@ -1269,7 +1269,7 @@
if (!report.isSavable((ScarabUser)data.getUser()))
{
setNoPermissionMessage();
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
}
else if (intake.isAllValid())
{
@@ -1286,7 +1286,7 @@
if (report.getName() == null || report.getName().trim().length() == 0)
{
scarabR.setAlertMessage(L10NKeySet.SavedReportsMustHaveName);
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
else
{
@@ -1307,7 +1307,7 @@
else
{
scarabR.setAlertMessage(L10NKeySet.ReportNameNotUnique);
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/DefineXModuleList.java 2012-05-04 08:06:29-0700
@@ -121,7 +121,7 @@
user.setCurrentMITList(list);
// reset selected users map
scarabR.resetSelectedUsers();
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.NEXT_TEMPLATE));
}
}
@@ -139,7 +139,7 @@
if (currentList != null && !currentList.isEmpty())
{
- setTarget(data, user.getQueryTarget());
+ data.setScreenTemplate(user.getQueryTarget());
}
else
{
@@ -160,7 +160,7 @@
if (!report.isEditable(user))
{
scarabR.setAlertMessage(NO_PERMISSION_MESSAGE);
- setTarget(data, "reports,ReportList.vm");
+ data.setScreenTemplate("reports,ReportList.vm");
return;
}
@@ -176,12 +176,12 @@
report.setScopeId(Scope.PERSONAL__PK);
scarabR.setInfoMessage(L10NKeySet.ScopeChangedToPersonal);
}
- setTarget(data, "reports,Info.vm");
+ data.setScreenTemplate("reports,Info.vm");
}
catch (IncompatibleMITListException e)
{
scarabR.setAlertMessage(L10NKeySet.IncompatibleMITListReport);
- setTarget(data, "reports,XModuleList.vm");
+ data.setScreenTemplate("reports,XModuleList.vm");
}
}
@@ -240,13 +240,13 @@
String queryId = data.getParameters().getString("queryId");
if (queryId != null && queryId.length() > 0)
{
- setTarget(data, "EditQuery.vm");
+ data.setScreenTemplate("EditQuery.vm");
}
}
else
{
list.setName(null);
- setTarget(data, "EditXModuleList.vm");
+ data.setScreenTemplate("EditXModuleList.vm");
}
}
@@ -291,7 +291,7 @@
user.setCurrentMITList(null);
scarabR.setConfirmMessage(DEFAULT_MSG);
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.LAST_TEMPLATE));
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ForgotPassword.java 2012-05-04 08:06:29-0700
@@ -90,7 +90,7 @@
IntakeTool intake = getIntakeTool(context);
if (intake.isAllValid() && forgotPassword(data, context))
{
- setTarget(data, "Login.vm");
+ data.setScreenTemplate("Login.vm");
}
}
@@ -135,7 +135,7 @@
Localizable msg = new L10NMessage(L10NKeySet.InvalidUsername,username);
getScarabRequestTool(context).setAlertMessage(msg);
Log.get().error("ForgotPassword: ", e);
- setTarget(data, "ForgotPassword.vm");
+ data.setScreenTemplate("ForgotPassword.vm");
return false;
}
return true;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/HandleRoleRequests.java 2012-05-04 08:06:29-0700
@@ -168,7 +168,7 @@
scarabR.setInfoMessage(msg);
}
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
private void deleteRoleRequests(ScarabUser user, ScarabModule module)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Login.java 2012-05-04 08:06:29-0700
@@ -205,7 +205,7 @@
String template = data.getParameters()
.getString(ScarabConstants.NEXT_TEMPLATE,
"SelectModule.vm");
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
@@ -287,7 +287,7 @@
setUser(scarabR, user);
setAlertMessage(scarabR,L10NKeySet.YourPasswordHasExpired);
- setTarget(data, "ChangePassword.vm");
+ data.setScreenTemplate("ChangePassword.vm");
//change next screen to allow password reset.
data.save();
return false;
@@ -378,7 +378,7 @@
private static void failAction(RunData data, String template)
{
anonymousLogin(data);
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Logout.java 2012-05-04 08:06:29-0700
@@ -89,7 +89,7 @@
scarabR.setConfirmMessage(L10NKeySet.YouHaveBeenLoggedOut);
}
}
- setTarget(data, "Login.vm");
+ data.setScreenTemplate("Login.vm");
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyIssue.java 2012-05-04 08:06:29-0700
@@ -1717,7 +1717,7 @@
data.getParameters().add("id", issue.getUniqueId());
data.getParameters().add("issue_ids", issue.getUniqueId());
scarabR.resetAssociatedUsers();
- setTarget(data, "AssignIssue.vm");
+ data.setScreenTemplate("AssignIssue.vm");
}
else
{
@@ -1755,12 +1755,12 @@
{
pp.add("issue_ids", currentIssueId);
}
- setTarget(data, "MoveIssue.vm");
+ data.setScreenTemplate("MoveIssue.vm");
}
else
{
scarabR.setAlertMessage(NO_PERMISSION_MESSAGE);
- setTarget(data, "ViewIssue.vm");
+ data.setScreenTemplate("ViewIssue.vm");
}
}
@@ -1787,7 +1787,7 @@
{
pp.add("issue_ids", currentIssueId);
}
- setTarget(data, "MoveIssue.vm");
+ data.setScreenTemplate("MoveIssue.vm");
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ModifyModule.java 2012-05-04 08:06:29-0700
@@ -114,7 +114,7 @@
if (moduleGroup == null)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
scarabR.setAlertMessage(
L10NKeySet.CouldNotLocateModuleGroup);
return;
@@ -129,7 +129,7 @@
{
scarabR.setAlertMessage(NO_PERMISSION_MESSAGE);
intake.remove(moduleGroup);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
return;
}
@@ -143,14 +143,14 @@
{
scarabR.setAlertMessage(L10NKeySet.CircularParentChildRelationship);
intake.remove(moduleGroup);
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
else if (!user.hasPermission(ScarabSecurity.MODULE__EDIT, origParent) &&
origParent.getModuleId() != newParent.getModuleId())
{
scarabR.setAlertMessage(L10NKeySet.NoPermissionInParentModule);
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
@@ -192,7 +192,7 @@
updateModuleParameters(data, me);
intake.remove(moduleGroup);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
scarabR.setConfirmMessage(L10NKeySet.ModuleUpdated);
}
}
@@ -302,7 +302,7 @@
catch(Exception e){
if(e instanceof ScarabRuntimeException){
scarabR.setAlertMessage(((ScarabRuntimeException)e).getMessage(l10n));
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
else{
@@ -313,9 +313,9 @@
}
else
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/MoveIssue.java 2012-05-04 08:06:29-0700
@@ -222,7 +222,7 @@
context.put("newModuleId", newModuleId.toString());
context.put("newIssueTypeId", newIssueTypeId.toString());
String nextTemplate = getNextTemplate(data);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
/**
@@ -240,7 +240,7 @@
if (collisionOccurred)
{
// Report the collision to the user.
- setTarget(data, "ViewIssue.vm");
+ data.setScreenTemplate("ViewIssue.vm");
return;
}
@@ -364,11 +364,11 @@
{
data.getParameters().remove("id");
data.getParameters().add("id", newIssue.getUniqueId().toString());
- setTarget(data, "ViewIssue.vm");
+ data.setScreenTemplate("ViewIssue.vm");
}
else
{
- setTarget(data, "IssueList.vm");
+ data.setScreenTemplate("IssueList.vm");
}
scarabR.setConfirmMessage(DEFAULT_MSG);
@@ -379,7 +379,7 @@
*/
public void doBacktoone(RunData data, Context context) throws Exception
{
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.CANCEL_TEMPLATE, "MoveIssue.vm"));
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/QueryList.java 2012-05-04 08:06:29-0700
@@ -191,7 +191,7 @@
user.setCurrentMITList(null);
// reset selected users map
getScarabRequestTool(context).resetSelectedUsers();
- setTarget(data, user.getQueryTarget());
+ data.setScreenTemplate(user.getQueryTarget());
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Redirect.java 2012-05-04 08:06:29-0700
@@ -76,7 +76,7 @@
.getString(ScarabConstants.NEXT_TEMPLATE,
((ScarabUser)data.getUser()).getHomePage());
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Register.java 2012-05-04 08:06:29-0700
@@ -103,7 +103,7 @@
if (!password.equals(passwordConfirm))
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
scarabR.setAlertMessage(L10NKeySet.PasswordsDoNotMatch);
return;
}
@@ -113,7 +113,7 @@
if(!su.hasValidEmailAddress())
{
- setTarget(data,template);
+ data.setScreenTemplate(template);
scarabR.setAlertMessage(L10NKeySet.EnterValidEmailAddress);
return;
}
@@ -121,13 +121,13 @@
ScarabUser existingUser=ScarabUserManager.getInstance(su.getUserName());
if (existingUser!=null)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
scarabR.setAlertMessage(L10NKeySet.UsernameExistsAlready);
return;
}
data.getUser().setTemp(ScarabConstants.SESSION_REGISTER, su);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
public void doConfirmregistration(RunData data, Context context)
@@ -141,7 +141,7 @@
if (su == null)
{
- setTarget(data, "Register.vm");
+ data.setScreenTemplate("Register.vm");
return;
}
@@ -159,7 +159,7 @@
{
Localizable msg = new L10NMessage(L10NKeySet.UsernameExistsAlready);
scarabR.setAlertMessage(msg);
- setTarget(data, "Login.vm");
+ data.setScreenTemplate("Login.vm");
return;
}
else
@@ -172,7 +172,7 @@
scarabR.setUser(su);
sendConfirmationEmail(su, context);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
/**
@@ -181,7 +181,7 @@
public void doBack(RunData data, Context context)
throws Exception
{
- setTarget(data, data.getParameters().getString(
+ data.setScreenTemplate(data.getParameters().getString(
ScarabConstants.CANCEL_TEMPLATE, "Register.vm"));
}
@@ -219,7 +219,7 @@
if (u.isConfirmed())
{
scarabR.setAlertMessage(L10NKeySet.AccountConfirmedSuccess);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
else
{
@@ -229,12 +229,12 @@
data.getUser().setTemp(ScarabConstants.SESSION_REGISTER, null);
scarabR.setConfirmMessage(L10NKeySet.AccountConfirmedSuccess);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
else
{
scarabR.setAlertMessage(L10NKeySet.InvalidConfirmationCode);
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
}
@@ -258,7 +258,7 @@
{
String template = getCurrentTemplate(data, null);
scarabR.setAlertMessage(L10NKeySet.InvalidUsername);
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
@@ -266,14 +266,14 @@
{
String template = getCurrentTemplate(data, null);
scarabR.setAlertMessage(L10NKeySet.AccountConfirmedSuccess);
- setTarget(data, template);
+ data.setScreenTemplate(template);
return;
}
scarabR.setUser(user);
sendConfirmationEmail(user, context);
scarabR.setConfirmMessage(L10NKeySet.ConfirmationCodeSent);
- setTarget(data, "Confirm.vm");
+ data.setScreenTemplate("Confirm.vm");
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ReportIssue.java 2012-05-04 08:06:29-0700
@@ -131,7 +131,7 @@
if (!isValid)
{
scarabR.setAlertMessage(L10NKeySet.IssueTypeUnavailable);
- data.setTarget( ((ScarabUser)data.getUser()).getHomePage());
+ data.setScreenTemplate( ((ScarabUser)data.getUser()).getHomePage());
cleanup(data, context);
}
return isValid;
@@ -171,7 +171,7 @@
L10NMessage l10nMessage = new L10NMessage(L10NKeySet.ErrorExceptionMessage,e);
scarabR.setAlertMessage(l10nMessage);
Log.get().error("Error while checking for duplicates", e);
- setTarget(data, "entry,Wizard1.vm");
+ data.setScreenTemplate("entry,Wizard1.vm");
return;
}
@@ -221,7 +221,7 @@
}
if (!hasSetValues)
{
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
return true;
}
@@ -249,7 +249,7 @@
template = nextTemplate;
}
- setTarget(data, template);
+ data.setScreenTemplate(template);
return dupThresholdExceeded;
}
@@ -839,7 +839,7 @@
public void doGotowizard3(RunData data, Context context)
throws Exception
{
- setTarget(data, "entry,Wizard3.vm");
+ data.setScreenTemplate("entry,Wizard3.vm");
}
public void doUsetemplates(RunData data, Context context)
@@ -953,7 +953,7 @@
}
break;
}
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
public void doStart(RunData data, Context context)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/ScarabSessionValidator.java 2012-05-04 08:06:29-0700
@@ -112,7 +112,7 @@
.setAlertMessage( msg );
data.setAction("");
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.CANCEL_TEMPLATE, null));
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/Search.java 2012-05-04 08:06:29-0700
@@ -133,7 +133,7 @@
{
// Send to the IssueListExport screen (which actually
// has no corresponding Velocity template).
- setTarget(data, "IssueListExport.vm");
+ data.setScreenTemplate("IssueListExport.vm");
}
else if (StringUtils.isNotEmpty(next))
{
@@ -167,7 +167,7 @@
if (issueIds.size() <= ScarabConstants.ISSUE_MAX_ASSIGN)
{
scarabR.resetAssociatedUsers();
- setTarget(data, "AssignIssue.vm");
+ data.setScreenTemplate("AssignIssue.vm");
}
else
{
@@ -192,7 +192,7 @@
{
if (issueIds.size() <= ScarabConstants.ISSUE_MAX_VIEW)
{
- setTarget(data, "ViewIssueLong.vm");
+ data.setScreenTemplate("ViewIssueLong.vm");
}
else
{
@@ -218,7 +218,7 @@
if (issueIds.size() <= ScarabConstants.ISSUE_MAX_COPY)
{
data.getParameters().add("mv_0rb", "copy");
- setTarget(data, "MoveIssue.vm");
+ data.setScreenTemplate("MoveIssue.vm");
}
else
{
@@ -243,7 +243,7 @@
if (issueIds.size() <= ScarabConstants.ISSUE_MAX_MOVE)
{
data.getParameters().add("mv_0rb", "move");
- setTarget(data, "MoveIssue.vm");
+ data.setScreenTemplate("MoveIssue.vm");
}
else
{
@@ -267,7 +267,7 @@
String template = data.getParameters()
.getString(ScarabConstants.NEXT_TEMPLATE,
getIssueListTarget());
- setTarget(data, template);
+ data.setScreenTemplate(template);
}
}
@@ -300,7 +300,7 @@
if (scarabR.hasPermission(ScarabSecurity.USER__EDIT_PREFERENCES))
{
- setTarget(data, "SaveQuery.vm");
+ data.setScreenTemplate("SaveQuery.vm");
}
else
{
@@ -312,7 +312,7 @@
throws Exception
{
data.getParameters().setString("queryString", getQueryString(data));
- setTarget(data, "IssueTypeList.vm");
+ data.setScreenTemplate("IssueTypeList.vm");
}
/**
@@ -442,7 +442,7 @@
// l10n.format("NotifyPendingApproval",
// l10n.get("Query").toLowerCase()));
}
- setTarget(data, "QueryList.vm");
+ data.setScreenTemplate("QueryList.vm");
}
}
else
@@ -484,7 +484,7 @@
//scarabR.setInfoMessage(
// l10n.format("NotifyPendingApproval",
// l10n.get("Query").toLowerCase()));
- setTarget(data, data.getParameters().getString(
+ data.setScreenTemplate(data.getParameters().getString(
ScarabConstants.CANCEL_TEMPLATE));
}
@@ -550,7 +550,7 @@
translateSortorder(data, query.getValue());
- setTarget(data, getIssueListTarget());
+ data.setScreenTemplate(getIssueListTarget());
}
private void translateSortorder(RunData data, String queryString) throws Exception
@@ -617,11 +617,11 @@
}
// reset selected users map
scarabR.resetSelectedUsers();
- setTarget(data, user.getQueryTarget());
+ data.setScreenTemplate(user.getQueryTarget());
}
else if (go.equals("mostRecent"))
{
- setTarget(data, getIssueListTarget());
+ data.setScreenTemplate(getIssueListTarget());
}
else if (go.equals("myIssuesThisModule"))
{
@@ -635,7 +635,7 @@
.append("&user_attr_").append(userId).append("=any")
.toString();
setRecentQuery(query);
- setTarget(data, getIssueListTarget());
+ data.setScreenTemplate(getIssueListTarget());
}
else if (go.equals("myIssuesAllModules"))
{
@@ -647,7 +647,7 @@
.append("&user_attr_").append(userId).append("=any")
.toString();
setRecentQuery(query);
- setTarget(data, getIssueListTarget());
+ data.setScreenTemplate(getIssueListTarget());
}
else if (go.equals("quickSearch"))
{
@@ -683,16 +683,16 @@
}
quickSearch(searchString, attributeMap, user);
}
- setTarget(data, getIssueListTarget());
+ data.setScreenTemplate(getIssueListTarget());
}
else if (go.equals("privateQueries")
||go.equals("publicQueries"))
{
- setTarget(data,"QueryList.vm");
+ data.setScreenTemplate("QueryList.vm");
}
else
{
- setTarget(data, go);
+ data.setScreenTemplate(go);
}
}
else
@@ -702,7 +702,7 @@
.getString(ScarabConstants.NEXT_TEMPLATE,
Turbine.getConfiguration()
.getString("template.homepage", "Index.vm"));
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
}
@@ -772,7 +772,7 @@
throws Exception
{
context.put("refine", "true");
- setTarget(data, "AdvancedQuery.vm");
+ data.setScreenTemplate("AdvancedQuery.vm");
}
@@ -994,7 +994,7 @@
IssueSearch search = scarabR.getPopulatedSearch();
if (search != null)
{
- setTarget(data, "UserList.vm");
+ data.setScreenTemplate("UserList.vm");
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/TemplateList.java 2012-05-04 08:06:29-0700
@@ -185,7 +185,7 @@
scarabR.setInfoMessage(
l10n.format("NotifyPendingApproval",
l10n.get("Template").toLowerCase()));
- setTarget(data, "TemplateList.vm");
+ data.setScreenTemplate("TemplateList.vm");
doPerform(data, context);
}
}
@@ -339,7 +339,7 @@
scarabR.setInfoMessage(
l10n.format("NotifyPendingApproval",
l10n.get("Template").toLowerCase()));
- setTarget(data, data.getParameters().getString(
+ data.setScreenTemplate(data.getParameters().getString(
ScarabConstants.CANCEL_TEMPLATE));
}
}
@@ -415,7 +415,7 @@
{
IssueType templateType = IssueManager.getInstance(
new Long(templateId)).getIssueType();
- setTarget(data, scarabR.getNextEntryTemplate(
+ data.setScreenTemplate(scarabR.getNextEntryTemplate(
templateType.getIssueTypeForTemplateType()));
ReportIssue.cleanOutStaleIssue(data, context);
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/Approval.java 2012-05-04 08:06:29-0700
@@ -353,7 +353,7 @@
}
scarabR.setConfirmMessage(L10NKeySet.AllRolesProcessed);
}
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ArtifactTypeEdit.java 2012-05-04 08:06:29-0700
@@ -481,7 +481,7 @@
Group attGroup = intake.get("Attribute", IntakeTool.DEFAULT_KEY);
intake.remove(attGroup);
scarabR.setAttribute(null);
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/AttributeGroupEdit.java 2012-05-04 08:06:29-0700
@@ -545,7 +545,7 @@
Group attGroup = intake.get("Attribute", IntakeTool.DEFAULT_KEY);
intake.remove(attGroup);
scarabR.setAttribute(null);
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/BaseConditionEdit.java 2012-05-04 08:06:29-0700
@@ -193,7 +193,7 @@
String lastTemplate = getCancelTemplate(data);
if (lastTemplate != null)
{
- setTarget(data, lastTemplate);
+ data.setScreenTemplate(lastTemplate);
}
else
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalArtifactTypeCreate.java 2012-05-04 08:06:29-0700
@@ -262,7 +262,7 @@
Group attGroup = intake.get("Attribute", IntakeTool.DEFAULT_KEY);
intake.remove(attGroup);
scarabR.setAttribute(null);
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributeEdit.java 2012-05-04 08:06:29-0700
@@ -204,7 +204,7 @@
attr.setDeleted(true);
attr.save();
scarabR.setConfirmMessage(getLocalizationTool(context).get(DEFAULT_MSG));
- setTarget(data, getCancelTemplate(data));
+ data.setScreenTemplate(getCancelTemplate(data));
}
}
@@ -583,7 +583,7 @@
String lastTemplate = getCancelTemplate(data);
if (lastTemplate != null)
{
- setTarget(data, lastTemplate);
+ data.setScreenTemplate(lastTemplate);
}
else
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/GlobalAttributes.java 2012-05-04 08:06:29-0700
@@ -80,7 +80,7 @@
{
String nextTemplate = data.getParameters().getString(
ScarabConstants.OTHER_TEMPLATE, "admin, GlobalAttributeEdit.vm");
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
ScarabRequestTool scarabR = getScarabRequestTool(context);
scarabR.setAttribute(AttributeManager.getInstance());
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageArtifactTypes.java 2012-05-04 08:06:29-0700
@@ -157,7 +157,7 @@
module.addIssueType(issueType);
ScarabCache.clear();
scarabR.setConfirmMessage(l10n.get("IssueTypeAddedToModule"));
- setTarget(data, "admin,ManageArtifactTypes.vm");
+ data.setScreenTemplate("admin,ManageArtifactTypes.vm");
}
}
@@ -169,7 +169,7 @@
throws Exception
{
data.getParameters().remove("issueTypeId");
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManagePermissions.java 2012-05-04 08:06:29-0700
@@ -82,7 +82,7 @@
public void doGotoaddpermission(RunData data, Context context)
throws Exception
{
- setTarget(data, "admin,AddPermission.vm");
+ data.setScreenTemplate("admin,AddPermission.vm");
}
/**
@@ -91,7 +91,7 @@
public void doGotodeletepermission(RunData data, Context context)
throws Exception
{
- setTarget(data, "admin,DeletePermission.vm");
+ data.setScreenTemplate("admin,DeletePermission.vm");
}
/**
@@ -155,7 +155,7 @@
ScarabLocalizationTool l10n = getLocalizationTool(context);
String msg = l10n.format("PermissionDeleted", name);
getScarabRequestTool(context).setConfirmMessage(msg);
- setTarget(data, data.getParameters().getString(ScarabConstants.NEXT_TEMPLATE, "admin,ManagePermissions.vm"));
+ data.setScreenTemplate(data.getParameters().getString(ScarabConstants.NEXT_TEMPLATE, "admin,ManagePermissions.vm"));
}
@@ -165,7 +165,7 @@
*/
public void doCancel(RunData data, Context context) throws Exception
{
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.CANCEL_TEMPLATE, "admin,AdminIndex.vm"));
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageRoles.java 2012-05-04 08:06:29-0700
@@ -83,7 +83,7 @@
public void doGotoaddrole(RunData data, Context context)
throws Exception
{
- setTarget(data, "admin,AddRole.vm");
+ data.setScreenTemplate("admin,AddRole.vm");
}
/**
@@ -227,7 +227,7 @@
String msg = l10n.format("RoleDeleted", name);
getScarabRequestTool(context).setConfirmMessage(msg);
- setTarget(data, data.getParameters()
+ data.setScreenTemplate(data.getParameters()
.getString(ScarabConstants.NEXT_TEMPLATE, "admin,ManageRoles.vm"));
}
@@ -257,13 +257,13 @@
ScarabLocalizationTool l10n = getLocalizationTool(context);
String msg = l10n.get("NoRoleSelected");
getScarabRequestTool(context).setConfirmMessage(msg);
- setTarget(data, "admin,ManageRoles.vm");
+ data.setScreenTemplate("admin,ManageRoles.vm");
}
else
{
if (target != null)
{
- setTarget(data, target);
+ data.setScreenTemplate(target);
}
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/ManageUser.java 2012-05-04 08:06:29-0700
@@ -128,7 +128,7 @@
su = ScarabUserManager.reactivateUserIfDeleted(su);
if(su == null)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
scarabR.setAlertMessage(L10NKeySet.UsernameExistsAlready);
data.getParameters().setString("errorLast","true");
data.getParameters().setString("state","showadduser");
@@ -150,12 +150,12 @@
data.getParameters().setString("state","showadduser");
data.getParameters().setString("lastAction","addeduser");
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
return;
}
catch (Exception e)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
data.getParameters().setString("lastAction","");
Localizable msg = new L10NMessage(L10NKeySet.ExceptionGeneric,e);
scarabR.setAlertMessage (msg);
@@ -298,7 +298,7 @@
data.getParameters().setString("state", "showedituser");
data.getParameters().setString("lastAction", "editeduser");
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
return;
}
else
@@ -310,7 +310,7 @@
}
catch (Exception e)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
data.getParameters().setString("lastAction","");
Localizable msg = new L10NMessage(L10NKeySet.ExceptionGeneric,e);
scarabR.setAlertMessage (msg);
@@ -358,14 +358,14 @@
data.getParameters().setString("state", "showedituser");
data.getParameters().setString("lastAction", "editeduser");
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
return;
}
catch (Exception e)
{
- setTarget(data, template);
+ data.setScreenTemplate(template);
data.getParameters().setString("lastAction","");
Localizable msg = new L10NMessage(L10NKeySet.ExceptionGeneric,e);
scarabR.setAlertMessage (msg);
@@ -436,7 +436,7 @@
if ((userName != null) && (userName.length() > 0))
{
data.getParameters().setString("state","showedituser");
- setTarget(data, "admin,EditUser.vm");
+ data.setScreenTemplate("admin,EditUser.vm");
}
else
{
@@ -453,7 +453,7 @@
String userName = data.getParameters().getString("username");
if ((userName != null) && (userName.length() > 0))
{
- setTarget(data, "admin,EditUserRoles.vm");
+ data.setScreenTemplate("admin,EditUserRoles.vm");
}
else
{
@@ -467,7 +467,7 @@
public void doGotodeleteuser(RunData data, Context context)
throws Exception
{
- setTarget(data, "admin,DeleteUser.vm");
+ data.setScreenTemplate("admin,DeleteUser.vm");
}
/**
@@ -476,7 +476,7 @@
public void doGotoadduser(RunData data, Context context)
throws Exception
{
- setTarget(data, "admin,AddUser.vm");
+ data.setScreenTemplate("admin,AddUser.vm");
}
/**
@@ -499,7 +499,7 @@
scarabR.setGlobalUserSearchParam("ascOrDesc", ascOrDesc);
scarabR.setGlobalUserSearchParam("resultsPerPage", resultsPerPage);
- setTarget(data, "admin,ManageUserSearch.vm");
+ data.setScreenTemplate("admin,ManageUserSearch.vm");
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/admin/UpdateSearchIndex.java 2012-05-04 08:06:29-0700
@@ -102,7 +102,7 @@
String template = getCurrentTemplate(data, null);
String nextTemplate = getNextTemplate(data, template);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
public void doCancel(RunData data, Context context)
@@ -116,7 +116,7 @@
String template = getCurrentTemplate(data, null);
String nextTemplate = getNextTemplate(data, template);
- setTarget(data, nextTemplate);
+ data.setScreenTemplate(nextTemplate);
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/RequireLoginFirstAction.java 2012-05-04 08:06:29-0700
@@ -282,7 +282,7 @@
public void doGonext(RunData data, Context context)
throws Exception
{
- setTarget(data, getNextTemplate(data));
+ data.setScreenTemplate(getNextTemplate(data));
}
public void doGotoothertemplate(RunData data,
@@ -291,13 +291,13 @@
{
data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE,
getCurrentTemplate(data));
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
public void doRefresh(RunData data, Context context)
throws Exception
{
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
public void doRefreshresultsperpage(RunData data, Context context)
@@ -317,7 +317,7 @@
params.remove("oldResultsPerPage");
params.remove("pageNum");
params.add("pageNum", newPageNum);
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
@@ -326,13 +326,13 @@
{
IntakeTool intake = getIntakeTool(context);
intake.removeAll();
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
public void doCancel(RunData data, Context context)
throws Exception
{
- setTarget(data, getCancelTemplate(data));
+ data.setScreenTemplate(getCancelTemplate(data));
}
public void doDone(RunData data, Context context)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/actions/base/ScarabTemplateAction.java 2012-05-04 08:06:29-0700
@@ -219,7 +219,7 @@
public void doGonext(RunData data, Context context)
throws Exception
{
- setTarget(data, getNextTemplate(data));
+ data.setScreenTemplate(getNextTemplate(data));
}
public void doGotoothertemplate(RunData data,
@@ -228,13 +228,13 @@
{
data.getParameters().setString(ScarabConstants.CANCEL_TEMPLATE,
getCurrentTemplate(data));
- setTarget(data, getOtherTemplate(data));
+ data.setScreenTemplate(getOtherTemplate(data));
}
public void doRefresh(RunData data, Context context)
throws Exception
{
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
public void doReset(RunData data, Context context)
@@ -242,13 +242,13 @@
{
IntakeTool intake = getIntakeTool(context);
intake.removeAll();
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
public void doCancel(RunData data, Context context)
throws Exception
{
- setTarget(data, getCancelTemplate(data));
+ data.setScreenTemplate(getCancelTemplate(data));
}
public void doDone(RunData data, Context context)
@@ -280,6 +280,6 @@
params.remove("oldResultsPerPage");
params.remove("pageNum");
params.add("pageNum", newPageNum);
- setTarget(data, getCurrentTemplate(data));
+ data.setScreenTemplate(getCurrentTemplate(data));
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java 2012-05-04 08:06:29-0700
@@ -93,21 +93,21 @@
// Allows short link to public/personal queries
// $scarabRoot/issues/query/<queryId>/curmodule/<moduleId>
if (target == null) target="IssueList.vm";
- data.setTarget(target);
+ data.setScreenTemplate(target);
if (parameters.getString("tqk") == null) parameters.setString("tqk", ""+0);
if (parameters.getString("action") == null) data.setAction("Search");
if (parameters.getString("go") == null) parameters.setString("go",query);
}
else if (target != null)
{
- data.setTarget(target);
+ data.setScreenTemplate(target);
Log.get().debug("Set target from request parameter");
}
else if (parameters.getString("id") != null)
{
// Allows short link to issue
// $scarabRoot/issues/id/<issueId>
- data.setTarget("ViewIssue.vm");
+ data.setScreenTemplate("ViewIssue.vm");
}
else
{
@@ -141,7 +141,7 @@
target = Turbine.getConfiguration().getString(
Turbine.TEMPLATE_HOMEPAGE);
}
- data.setTarget(target);
+ data.setScreenTemplate(target);
Log.get().debug("Set target to ["+target+"]");
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/FreshenUserValve.java 2012-05-04 08:06:29-0700
@@ -120,7 +120,7 @@
// Under no conditions an expired password will be
// accepted. The request is always forwarded to the
// password change mask until the password has been reset. [HD]
- data.setTarget("ChangePassword.vm");
+ data.setScreenTemplate("ChangePassword.vm");
data.save();
context.invokeNext(data);
return;
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/pipeline/NTLMLoginValve.java 2012-05-04 08:06:29-0700
@@ -174,7 +174,7 @@
l10n.init(user.getLocale());
data.setMessage(mesg.getMessage(l10n));
}
- data.setTarget("SelectModule.vm");
+ data.setScreenTemplate("SelectModule.vm");
}
catch (DataBackendException e)
{
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/DataExport.java 2012-05-04 08:06:29-0700
@@ -139,7 +139,7 @@
//writeRows(printer, mitlist, l10n, scarabR, rmuas);
// Above we sent the response, so no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/Default.java 2012-05-04 08:06:29-0700
@@ -125,7 +125,7 @@
{
// Pass control to the alternate target.
scarabR.setAlertMessage(L10NKeySet.IssueTypeUnavailable);
- setTarget(data, altTarget);
+ data.setScreenTemplate(altTarget);
}
else
{
@@ -269,8 +269,7 @@
ScarabConstants.NEXT_TEMPLATE,
data.getParameters().getString(ScarabConstants.NEXT_TEMPLATE));
- setTarget(
- data,
+ data.setScreenTemplate(
Turbine.getConfiguration().getString(
"scarab.CurrentModuleTemplate",
"SelectModule.vm"));
@@ -281,7 +280,7 @@
getContext(data).put(
ScarabConstants.NEXT_TEMPLATE,
data.getParameters().getString("template"));
- setTarget(data, "Login.vm");
+ data.setScreenTemplate("Login.vm");
}
/**
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/MoveIssue.java 2012-05-04 08:06:29-0700
@@ -102,7 +102,7 @@
else
{
scarabR.setAlertMessage(l10n.get("NoActionSpecified"));
- setTarget(data, "ViewIssue.vm");
+ data.setScreenTemplate("ViewIssue.vm");
}
}
catch (Exception e)
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/RSSDataExport.java 2012-05-04 08:06:29-0700
@@ -107,7 +107,7 @@
data.getResponse().setContentType(MIME_TYPE);
// we will send the response, so no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
Writer writer = data.getResponse().getWriter();
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/ViewAttachment.java 2012-05-04 08:06:29-0700
@@ -102,7 +102,7 @@
LocalizationKey key = L10NKeySet.AttachmentDoesNotExist;
L10NMessage msg = new L10NMessage(key,attachment.getFullPath());
getScarabRequestTool(context).setAlertMessage(msg);
- data.setTarget("Error.vm");
+ data.setScreenTemplate("Error.vm");
}
else
{
@@ -138,7 +138,7 @@
}
}
// we already sent the response, there is no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportIssues.java 2012-05-04 08:06:29-0700
@@ -139,7 +139,7 @@
context.put("exportissues", ids);
if (ids == null || ids.length() == 0)
{
- data.setTarget("admin,XMLExportIssues.vm");
+ data.setScreenTemplate("admin,XMLExportIssues.vm");
scarabR.setAlertMessage(l10n.get("EnterIssues"));
return;
}
@@ -156,7 +156,7 @@
}
catch (Exception e)
{
- data.setTarget("admin,XMLExportIssues.vm");
+ data.setScreenTemplate("admin,XMLExportIssues.vm");
scarabR.setAlertMessage(l10n.getMessage(e));
return;
}
@@ -183,13 +183,13 @@
}
if (issueIdList.isEmpty())
{
- data.setTarget("admin,XMLExportIssues.vm");
+ data.setScreenTemplate("admin,XMLExportIssues.vm");
scarabR.setAlertMessage(l10n.get("NoValidIssuesCouldBeLocated"));
return;
}
else if (!badIdList.isEmpty())
{
- data.setTarget("admin,XMLExportIssues.vm");
+ data.setScreenTemplate("admin,XMLExportIssues.vm");
scarabR.setAlertMessage(
l10n.format("FollowingIssueIdsAreInvalid",
badIdList.toString()));
@@ -247,7 +247,7 @@
}
// we already sent the response, there is no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
}
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/ViewXMLExportSettings.java 2012-05-04 08:06:29-0700
@@ -116,6 +116,6 @@
context.remove("renderedFromScreen");
// we already sent the response, there is no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
}
}
Modified: branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java?view=diff&pathrev=11250&r1=11249&r2=11250
==============================================================================
--- branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java (original)
+++ branches/SCB3100_Turbine4.0-M1/src/java/org/tigris/scarab/screens/admin/XMLImportIssuesResults.java 2012-05-04 08:06:29-0700
@@ -168,7 +168,7 @@
data.getResponse().getOutputStream().print(result);
// we already sent the response, there is no target to render
- data.setTarget(null);
+ data.setScreenTemplate(null);
}
}
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2957674