JSS-1751: [case #01712714] 'Copy from Master' no longer works in 7.2.…

…0 for subreport parameters
akingde · Jun 18, 2019 · 96b1dff · 96b1dff
1 parent 415f9b4
commit 96b1dff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...udio/src/com/jaspersoft/studio/model/subreport/command/wizard/SubreportParameterPage.java b/...udio/src/com/jaspersoft/studio/model/subreport/command/wizard/SubreportParameterPage.java
@@ -64,13 +64,14 @@ public void widgetSelected(SelectionEvent e) {
 	}
 
 	/**
-	 * Return the input of the combo, a list of the parameter names of the original subreport file
+	 * Return the input of the combo, a list of the parameter names of the
+	 * original subreport file
 	 * 
 	 * @return the list of string displayed in the combo
 	 */
 	protected List<String> createNameComboInput() {
-		List<String> result = new ArrayList<String>();
-		HashSet<String> usedParams = new HashSet<String>();
+		List<String> result = new ArrayList<>();
+		HashSet<String> usedParams = new HashSet<>();
 		for (GenericJSSParameter param : values) {
 			usedParams.add(param.getName());
 		}

diff --git a/...soft.studio/src/com/jaspersoft/studio/model/subreport/command/wizard/SubreportWizard.java b/...soft.studio/src/com/jaspersoft/studio/model/subreport/command/wizard/SubreportWizard.java
@@ -114,7 +114,7 @@ protected NewSubreportPage getSubreportPage() {
 	public IWizardPage getNextPage(IWizardPage page) {
 		if (page == step3) {
 			try {
-				step3.setJasperDesign(null);
+				step3.setJasperDesign(getConfig().getJasperDesign());
 				getContainer().run(true, true, new IRunnableWithProgress() {
 
 					@Override
@@ -170,7 +170,7 @@ else if (location.endsWith(FileExtension.PointJASPER))
 								r = (JRReport) JRLoader.loadObject(jrConf, in);
 							}
 						}
-						step3.setJasperDesign(r);
+
 					}
 
 				});