You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/05/20 06:22:39 UTC
svn commit: r1680455 - in
/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web:
common/OmLabel.java pages/install/InstallWizard.java
Author: solomax
Date: Wed May 20 04:22:39 2015
New Revision: 1680455
URL: http://svn.apache.org/r1680455
Log:
Compilation errors caused by changes in Wicket API are fixed
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmLabel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmLabel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmLabel.java?rev=1680455&r1=1680454&r2=1680455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmLabel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmLabel.java Wed May 20 04:22:39 2015
@@ -26,6 +26,6 @@ public class OmLabel extends Label {
public OmLabel(String id, String key, Object... parameters) {
super(id);
- setDefaultModel(new StringResourceModel(key, this, null, parameters));
+ setDefaultModel(new StringResourceModel(key, this).setParameters(parameters));
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1680455&r1=1680454&r2=1680455&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Wed May 20 04:22:39 2015
@@ -244,7 +244,7 @@ public class InstallWizard extends Wizar
try {
Class.forName(props.getDriver());
} catch (Exception e) {
- form.error(new StringResourceModel("install.wizard.db.step.nodriver", InstallWizard.this, null, null, getString("install.wizard.db.step.instructions." + props.getDbType().name())).getObject());
+ form.error(new StringResourceModel("install.wizard.db.step.nodriver", InstallWizard.this).setParameters(getString("install.wizard.db.step.instructions." + props.getDbType().name())).getObject());
return;
}
Connection conn = null;
@@ -299,7 +299,7 @@ public class InstallWizard extends Wizar
LocalEntityManagerFactoryBean emb = f.getBean(LocalEntityManagerFactoryBean.class);
emb.afterPropertiesSet();
} catch (Exception e) {
- form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this, null, null, e.getMessage()).getObject());
+ form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this).setParameters(e.getMessage()).getObject());
log.error("error while patching", e);
}
}