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/10/06 20:09:31 UTC

svn commit: r1707112 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/ branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/ trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetin...

Author: solomax
Date: Tue Oct  6 18:09:30 2015
New Revision: 1707112

URL: http://svn.apache.org/viewvc?rev=1707112&view=rev
Log:
[OPENMEETINGS-1263] getString is removed from component constructors

Modified:
    openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
    openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java

Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1707112&r1=1707111&r2=1707112&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Tue Oct  6 18:09:30 2015
@@ -152,8 +152,13 @@ public class InstallWizard extends Abstr
 
 		public BaseStep(IDynamicWizardStep prev) {
 			super(prev);
+			setSummaryModel(Model.of(""));
+		}
+		
+		@Override
+		protected void onInitialize() {
+			super.onInitialize();
 			InstallWizard.this.setTitle(Model.of(getModelObject().appName + " - " + getString("install.wizard.install.header")));
-            setSummaryModel(Model.of(""));
 		}
 	}
 	
@@ -162,10 +167,15 @@ public class InstallWizard extends Abstr
 
 		public WelcomeStep() {
 			super(null);
-			add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return false;
 		}
@@ -280,8 +290,8 @@ public class InstallWizard extends Abstr
         			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());
-					log.error("error while patching", e);
+				form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this, null, null, e.getMessage()).getObject());
+				log.error("error while patching", e);
         		}
         	}
         };
@@ -345,16 +355,20 @@ public class InstallWizard extends Abstr
 		
 		public DbStep() {
 			super(welcomeStep);
-			//TODO localize
-			add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby")
-				, getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
-				, getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
-				, getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
 			add(form.setOutputMarkupId(true));
 			initForm(false, null);
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby")
+					, getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
+					, getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
+					, getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return false;
 		}
@@ -371,10 +385,15 @@ public class InstallWizard extends Abstr
 
 		public ParamsStep1() {
 			super(dbStep);
+			add(tzDropDown = new TzDropDown("ical_timeZone"));
+		}
+
+		@Override
+		protected void onInitialize() {
+			super.onInitialize();
 			add(new RequiredTextField<String>("username").setLabel(Model.of(getString("install.wizard.params.step1.username"))).add(minimumLength(USER_LOGIN_MINIMUM_LENGTH)));
 			add(new PasswordTextField("password").setLabel(Model.of(getString("install.wizard.params.step1.password"))).add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
 			add(new RequiredTextField<String>("email").setLabel(Model.of(getString("install.wizard.params.step1.email"))).add(RfcCompliantEmailAddressValidator.getInstance()));
-			add(tzDropDown = new TzDropDown("ical_timeZone"));
 			add(new RequiredTextField<String>("group").setLabel(Model.of(getString("install.wizard.params.step1.group"))));
 		}
 
@@ -517,10 +536,10 @@ public class InstallWizard extends Abstr
 	private final class InstallStep extends BaseStep {
 		private static final long serialVersionUID = 1L;
 		private final CongratulationsPanel congrat;
-		private WebMarkupContainer container = new WebMarkupContainer("container");
-		private AbstractAjaxTimerBehavior timer;
-		private ProgressBar progressBar;
-		private Label desc = new Label("desc", getString("install.wizard.install.desc"));
+		private final WebMarkupContainer container = new WebMarkupContainer("container");
+		private final AbstractAjaxTimerBehavior timer;
+		private final ProgressBar progressBar;
+		private final Label desc = new Label("desc", "");
 		private boolean started = false;
 		
 		public void startInstallation(AjaxRequestTarget target) {
@@ -536,7 +555,6 @@ public class InstallWizard extends Abstr
 		public InstallStep() {
 			super(paramsStep4);
 			
-			add(desc.setOutputMarkupId(true));
 			// Timer //
 			container.add(timer = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
 				private static final long serialVersionUID = 1L;
@@ -584,6 +602,13 @@ public class InstallWizard extends Abstr
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			desc.setDefaultModelObject(getString("install.wizard.install.desc"));
+			add(desc.setOutputMarkupId(true));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return true;
 		}

Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1707112&r1=1707111&r2=1707112&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java Tue Oct  6 18:09:30 2015
@@ -55,7 +55,7 @@ import com.googlecode.wicket.jquery.ui.w
 public class VideoInfo extends Panel {
 	private static final long serialVersionUID = 1L;
 	private final Form<Void> form = new Form<Void>("form");
-	private final AjaxSplitButton downloadBtn = new AjaxSplitButton("downloadBtn", newDownloadMenuList());
+	private final AjaxSplitButton downloadBtn = new AjaxSplitButton("downloadBtn", new ArrayList<IMenuItem>());
 	private final AjaxButton reConvert = new AjaxButton("re-convert") {
 		private static final long serialVersionUID = 1L;
 
@@ -139,6 +139,12 @@ public class VideoInfo extends Panel {
 		roomName.detach();
 		super.onDetach();
 	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+		downloadBtn.setDefaultModelObject(newDownloadMenuList());
+	}
 	
 	private List<IMenuItem> newDownloadMenuList() {
 		List<IMenuItem> list = new ArrayList<>();

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=1707112&r1=1707111&r2=1707112&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 Tue Oct  6 18:09:30 2015
@@ -151,8 +151,13 @@ public class InstallWizard extends Abstr
 
 		public BaseStep(IDynamicWizardStep prev) {
 			super(prev);
+			setSummaryModel(Model.of(""));
+		}
+		
+		@Override
+		protected void onInitialize() {
+			super.onInitialize();
 			InstallWizard.this.setTitle(Model.of(getModelObject().appName + " - " + getString("install.wizard.install.header")));
-            setSummaryModel(Model.of(""));
 		}
 	}
 	
@@ -161,10 +166,15 @@ public class InstallWizard extends Abstr
 
 		public WelcomeStep() {
 			super(null);
-			add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return false;
 		}
@@ -279,8 +289,8 @@ public class InstallWizard extends Abstr
         			LocalEntityManagerFactoryBean emb = f.getBean(LocalEntityManagerFactoryBean.class);
         			emb.afterPropertiesSet();
         		} catch (Exception e) {
-					form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this).setParameters(e.getMessage()).getObject());
-					log.error("error while patching", e);
+				form.error(new StringResourceModel("install.wizard.db.step.error.patch", InstallWizard.this).setParameters(e.getMessage()).getObject());
+				log.error("error while patching", e);
         		}
         	}
         };
@@ -344,16 +354,20 @@ public class InstallWizard extends Abstr
 		
 		public DbStep() {
 			super(welcomeStep);
-			//TODO localize
-			add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby")
-				, getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
-				, getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
-				, getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
 			add(form.setOutputMarkupId(true));
 			initForm(false, null);
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby")
+					, getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
+					, getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
+					, getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return false;
 		}
@@ -370,10 +384,15 @@ public class InstallWizard extends Abstr
 
 		public ParamsStep1() {
 			super(dbStep);
+			add(tzDropDown = new TzDropDown("ical_timeZone"));
+		}
+
+		@Override
+		protected void onInitialize() {
+			super.onInitialize();
 			add(new RequiredTextField<String>("username").setLabel(Model.of(getString("install.wizard.params.step1.username"))).add(minimumLength(USER_LOGIN_MINIMUM_LENGTH)));
 			add(new PasswordTextField("password").setLabel(Model.of(getString("install.wizard.params.step1.password"))).add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
 			add(new RequiredTextField<String>("email").setLabel(Model.of(getString("install.wizard.params.step1.email"))).add(RfcCompliantEmailAddressValidator.getInstance()));
-			add(tzDropDown = new TzDropDown("ical_timeZone"));
 			add(new RequiredTextField<String>("group").setLabel(Model.of(getString("install.wizard.params.step1.group"))));
 		}
 
@@ -516,10 +535,10 @@ public class InstallWizard extends Abstr
 	private final class InstallStep extends BaseStep {
 		private static final long serialVersionUID = 1L;
 		private final CongratulationsPanel congrat;
-		private WebMarkupContainer container = new WebMarkupContainer("container");
-		private AbstractAjaxTimerBehavior timer;
-		private ProgressBar progressBar;
-		private Label desc = new Label("desc", getString("install.wizard.install.desc"));
+		private final WebMarkupContainer container = new WebMarkupContainer("container");
+		private final AbstractAjaxTimerBehavior timer;
+		private final ProgressBar progressBar;
+		private final Label desc = new Label("desc", "");
 		private boolean started = false;
 		
 		public void startInstallation(AjaxRequestTarget target) {
@@ -535,7 +554,6 @@ public class InstallWizard extends Abstr
 		public InstallStep() {
 			super(paramsStep4);
 			
-			add(desc.setOutputMarkupId(true));
 			// Timer //
 			container.add(timer = new AbstractAjaxTimerBehavior(Duration.ONE_SECOND) {
 				private static final long serialVersionUID = 1L;
@@ -583,6 +601,13 @@ public class InstallWizard extends Abstr
 		}
 
 		@Override
+		protected void onInitialize() {
+			super.onInitialize();
+			desc.setDefaultModelObject(getString("install.wizard.install.desc"));
+			add(desc.setOutputMarkupId(true));
+		}
+		
+		@Override
 		public boolean isLastStep() {
 			return true;
 		}

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1707112&r1=1707111&r2=1707112&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Tue Oct  6 18:09:30 2015
@@ -55,7 +55,7 @@ import com.googlecode.wicket.jquery.ui.w
 public class VideoInfo extends Panel {
 	private static final long serialVersionUID = 1L;
 	private final Form<Void> form = new Form<Void>("form");
-	private final AjaxSplitButton downloadBtn = new AjaxSplitButton("downloadBtn", newDownloadMenuList());
+	private final AjaxSplitButton downloadBtn = new AjaxSplitButton("downloadBtn", new ArrayList<IMenuItem>());
 	private final AjaxButton reConvert = new AjaxButton("re-convert") {
 		private static final long serialVersionUID = 1L;
 
@@ -139,6 +139,12 @@ public class VideoInfo extends Panel {
 		roomName.detach();
 		super.onDetach();
 	}
+
+	@Override
+	protected void onInitialize() {
+		super.onInitialize();
+		downloadBtn.setDefaultModelObject(newDownloadMenuList());
+	}
 	
 	private List<IMenuItem> newDownloadMenuList() {
 		List<IMenuItem> list = new ArrayList<>();