Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ public void modifyText(ModifyEvent e)
partnersLabel.setVisible(false);
partnersLabel2.setVisible(false);
partners.setVisible(false);
username.setVisible(false);
password.setVisible(false);

setControl(composite);

Expand Down Expand Up @@ -393,7 +395,78 @@ private boolean usesPartnersParameter(SubmissionTarget target)
return false;
}
}


private boolean needsUsername(SubmissionTarget target)
{
try
{
Map<String, String> params;
params = target.getPackagerParameters();
for (Map.Entry<String, String> paramEntry : params.entrySet())
{
if (paramEntry.getValue().contains("${username}")) //$NON-NLS-1$
{
return true;
}
}

params = target.getTransportParameters();
for (Map.Entry<String, String> paramEntry : params.entrySet())
{
if (paramEntry.getValue().contains("${username}")) //$NON-NLS-1$
{
return true;
}
}

String transport = target.getTransport();

if(transport.contains("${username}")) //$NON-NLS-1$
{
return true;
}
return false;
}
catch (SubmissionTargetException e) {
return false;
}
}

private boolean needsPassword(SubmissionTarget target)
{
try
{
Map<String, String> params;
params = target.getPackagerParameters();
for (Map.Entry<String, String> paramEntry : params.entrySet())
{
if (paramEntry.getValue().contains("${password}")) //$NON-NLS-1$
{
return true;
}
}

params = target.getTransportParameters();
for (Map.Entry<String, String> paramEntry : params.entrySet())
{
if (paramEntry.getValue().contains("${password}")) //$NON-NLS-1$
{
return true;
}
}

String transport = target.getTransport();

if(transport.contains("${password}")) //$NON-NLS-1$
{
return true;
}
return false;
}
catch (SubmissionTargetException e) {
return false;
}
}

// ----------------------------------------------------------
private void assignmentTreeSelectionChanged()
Expand Down Expand Up @@ -462,6 +535,8 @@ private void updatePageComplete()
partnersLabel.setVisible(usesPartners);
partnersLabel2.setVisible(usesPartners);
partners.setVisible(usesPartners);
username.setVisible(target != null && needsUsername(target));
password.setVisible(target != null && needsPassword(target));

setErrorMessage(null);
}
Expand Down