Skip to content
Snippets Groups Projects
Commit 9782a34e authored by Nicole Merkle's avatar Nicole Merkle
Browse files

little bug in installation process was fixed

parent bba8c582
No related branches found
No related tags found
No related merge requests found
......@@ -238,7 +238,7 @@ public class DeploymentInfoController implements Button.ClickListener,
conf = configurator;
}
}
NoConfigurationWindow ncw = null;
if (conf != null) {
ConfigurationOverviewWindow cow = new ConfigurationOverviewWindow(
conf);
......@@ -246,16 +246,17 @@ public class DeploymentInfoController implements Button.ClickListener,
app.getMainWindow().addWindow(cow);
} else {
SuccessWindow ncw = new SuccessWindow(
bundle.getString("success.install.msg"), app);
app.getMainWindow().addWindow(ncw);
ncw = new NoConfigurationWindow(
bundle.getString("installed.note"));
// addEntry((new StringBuilder()).append(Constants.uAAL_MIDDLEWARE_LOCAL_ID_PREFIX).append(/*"saied"*/DesktopController.getCurrentUser()).toString(),
// /*"Nutritional Advisor"*/aal.getServiceId(), /*"http://www.tsb.upv.es/"*/aal.getProvider(),
// "http://ontology.universAAL.org/Nutrition.owl#NutritionService", /*"app/Nutritional_Advisor.png"*/ "");
}
bc.ungetService(configRef);
SuccessWindow sw = new SuccessWindow(bundle.getString("success.install.msg"), app, ncw);
app.getMainWindow().addWindow(sw);
} else if(res.getGlobalResult().toString().equals(InstallationResults.APPLICATION_ALREADY_INSTALLED.name())){
// get parts mapping from config
System.out.println("[DeploymentInfoController] global result: " + res.getGlobalResult().toString());
......
......@@ -17,12 +17,14 @@ public class SuccessWindow extends Window implements Button.ClickListener {
private String base;
private ResourceBundle bundle;
private UccUI app;
private NoConfigurationWindow nw;
public SuccessWindow(String msg, UccUI app) {
public SuccessWindow(String msg, UccUI app, NoConfigurationWindow nw) {
base = "resources.ucc";
bundle = ResourceBundle.getBundle(base);
setCaption(bundle.getString("result.installation"));
this.app = app;
this.nw = nw;
setWidth("425px");
setHeight("300px");
Label label = new Label("<b>" + msg + "</b>", Label.CONTENT_XHTML);
......@@ -52,9 +54,10 @@ public class SuccessWindow extends Window implements Button.ClickListener {
}
public void buttonClick(ClickEvent event) {
NoConfigurationWindow ncw = new NoConfigurationWindow(
bundle.getString("installed.note"));
app.getMainWindow().addWindow(ncw);
if(nw != null) {
app.getMainWindow().addWindow(nw);
}
close();
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment