[JBIDE-21032] update template params for local template

jbosstools · Nov 2, 2015 · cc298bf · cc298bf
1 parent 1752caa
commit cc298bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/...ft.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java b/...ft.ui/src/org/jboss/tools/openshift/internal/ui/job/CreateApplicationFromTemplateJob.java
@@ -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

diff --git a/...hift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java b/...hift.ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizard.java
@@ -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();

diff --git a/...ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java b/...ui/src/org/jboss/tools/openshift/internal/ui/wizard/newapp/NewApplicationWizardModel.java
@@ -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)) {
@@ -151,7 +151,7 @@ public ITemplate getSelectedTemplate() {
 		return selectedTemplate;
 	}
 
-	private void initTemplateParameters(ITemplate template) {
+	private void updateTemplateParameters(ITemplate template) {
 		if (template == null) {
 			return;
 		}