Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JBIDE-21032] update template params for local template #801

Merged
merged 1 commit into from
Nov 2, 2015
Merged

[JBIDE-21032] update template params for local template #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ft.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ protected IStatus doRun(IProgressMonitor monitor) {
for (Label label : labels) {
template.addObjectLabel(label.getName(), label.getValue());
}



IStatus status = project.accept(new CapabilityVisitor<IProjectTemplateProcessing, IStatus>() {

@Override
Expand Down
16 changes: 7 additions & 9 deletions ...hift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,26 +98,24 @@ public void addPages() {
public boolean performFinish() {
final CreateApplicationFromTemplateJob createJob = new CreateApplicationFromTemplateJob(
model.getProject(),
model.getServerTemplate(),
model.getSelectedTemplate(),
model.getParameters(),
model.getLabels()
);
model.getLabels());

createJob.addJobChangeListener(new JobChangeAdapter(){

@Override
public void done(IJobChangeEvent event) {
IStatus status = event.getResult();
if(JobUtils.isOk(status) || JobUtils.isWarning(status)) {
if(JobUtils.isOk(status)
|| JobUtils.isWarning(status)) {
Display.getDefault().syncExec(new Runnable() {
@Override
public void run() {
final String message = NLS.bind(
"Results of creating the resources from the {0} template.",
model.getServerTemplate().getName());
new NewApplicationSummaryDialog(
getShell(),
createJob,
message).open();
model.getSelectedTemplate().getName());
new NewApplicationSummaryDialog(getShell(), createJob, message).open();
}
});
UIUtils.showOpenShiftExplorerView();
Expand Down
8 changes: 4 additions & 4 deletions ...ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ private void update(boolean useUploadTemplate, IProject selectedProject, List<Ob
updateProjectItems(projectItems);
firePropertyChange(PROPERTY_PROJECT, this.project, this.project = getProjectOrDefault(selectedProject, projectItems));
firePropertyChange(PROPERTY_TEMPLATES, this.projectTemplates, this.projectTemplates = getProjectTemplates(project, projectItems) );
updateTemplate(useUploadTemplate, serverTemplate, localTemplate, localTemplateFilename);
initTemplateParameters(serverTemplate);
updateSelectedTemplate(useUploadTemplate, serverTemplate, localTemplate, localTemplateFilename);
updateTemplateParameters(selectedTemplate);
}

private void updateTemplate(boolean useLoadlTemplate, ITemplate serverTemplate, ITemplate localTemplate, String localTemplateFilename) {
private void updateSelectedTemplate(boolean useLoadlTemplate, ITemplate serverTemplate, ITemplate localTemplate, String localTemplateFilename) {
ITemplate template = null;
if (useLoadlTemplate) {
if (!ObjectUtils.equals(localTemplateFilename, this.localTemplateFilename)) {
Expand Down Expand Up @@ -151,7 +151,7 @@ public ITemplate getSelectedTemplate() {
return selectedTemplate;
}

private void initTemplateParameters(ITemplate template) {
private void updateTemplateParameters(ITemplate template) {
if (template == null) {
return;
}
Expand Down