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 2017/03/01 06:11:15 UTC
svn commit: r1784854 [3/8] - in /openmeetings/application:
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/
branches/3.2....
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Wed Mar 1 06:11:13 2017
@@ -85,14 +85,14 @@ public class GroupForm extends AdminBase
}
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
- super(id, new CompoundPropertyModel<Group>(group));
+ super(id, new CompoundPropertyModel<>(group));
this.groupList = groupList;
setOutputMarkupId(true);
usersPanel = new GroupUsersPanel("users", getGroupId());
add(usersPanel);
- add(userToadd = new Select2Choice<User>("user2add", Model.of((User)null), new AdminUserChoiceProvider() {
+ add(userToadd = new Select2Choice<>("user2add", Model.of((User)null), new AdminUserChoiceProvider() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Wed Mar 1 06:11:13 2017
@@ -43,7 +43,7 @@ import org.apache.wicket.markup.repeater
public class GroupUsersPanel extends Panel {
private static final long serialVersionUID = 1L;
private long groupId;
- private List<GroupUser> users2add = new ArrayList<GroupUser>();
+ private List<GroupUser> users2add = new ArrayList<>();
public GroupUsersPanel(String id, long groupId) {
super(id);
@@ -147,7 +147,7 @@ public class GroupUsersPanel extends Pan
@Override
public java.util.Iterator<? extends GroupUser> iterator(long first, long count) {
- List<GroupUser> list = new ArrayList<GroupUser>();
+ List<GroupUser> list = new ArrayList<>();
list.addAll(users2add);
list.addAll(search == null && getSort() == null
? getDao().get(groupId, (int)first, (int)count)
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Wed Mar 1 06:11:13 2017
@@ -40,9 +40,9 @@ import org.apache.wicket.markup.repeater
/**
* Modify/ CRUD operations for {@link Group} and
* {@link GroupUser}
- *
+ *
* @author swagner
- *
+ *
*/
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
public class GroupsPanel extends AdminPanel {
@@ -65,7 +65,7 @@ public class GroupsPanel extends AdminPa
add(form);
//List view
- SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableGroupAdminDataProvider<Group>(GroupDao.class)) {
+ SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableGroupAdminDataProvider<>(GroupDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -99,9 +99,9 @@ public class GroupsPanel extends AdminPa
target.add(listContainer);
}
};
- DataViewContainer<Group> container = new DataViewContainer<Group>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Group>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Group>("orderByName", "name", container));
+ DataViewContainer<Group> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container));
add(container.getLinks());
add(navigator);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java Wed Mar 1 06:11:13 2017
@@ -45,7 +45,7 @@ public class AddLanguageDialog extends A
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final DialogButton add = new DialogButton("add", Application.getString(366L));
private final Form<Void> form = new Form<>("addLangForm");
- private final RequiredTextField<String> iso = new RequiredTextField<String>("iso", Model.of(""));
+ private final RequiredTextField<String> iso = new RequiredTextField<>("iso", Model.of(""));
private final LangPanel langPanel;
public AddLanguageDialog(String id, final LangPanel langPanel) {
@@ -73,7 +73,7 @@ public class AddLanguageDialog extends A
}
});
}
-
+
@Override
public Form<?> getForm() {
return form;
@@ -83,7 +83,7 @@ public class AddLanguageDialog extends A
protected List<DialogButton> getButtons() {
return Arrays.asList(add);
}
-
+
@Override
public DialogButton getSubmitButton() {
return add;
@@ -95,7 +95,7 @@ public class AddLanguageDialog extends A
handler.add(iso);
super.onOpen(handler);
}
-
+
@Override
protected void onError(AjaxRequestTarget target) {
target.add(feedback);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java Wed Mar 1 06:11:13 2017
@@ -32,9 +32,9 @@ import org.apache.wicket.model.CompoundP
/**
* Add/edit/delete {@link StringLabel}
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class LabelsForm extends AdminBaseForm<StringLabel> {
private static final long serialVersionUID = 1L;
@@ -42,11 +42,11 @@ public class LabelsForm extends AdminBas
private String key, value;
public LabelsForm(String id, LangPanel panel, StringLabel label) {
- super(id, new CompoundPropertyModel<StringLabel>(label));
+ super(id, new CompoundPropertyModel<>(label));
this.panel = panel;
key = label.getKey();
value = label.getValue();
-
+
add(new RequiredTextField<String>("key"));
add(new TextArea<String>("value"));
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java Wed Mar 1 06:11:13 2017
@@ -37,22 +37,22 @@ import org.apache.wicket.util.time.Durat
/**
* Modify the language selection, add/delete language
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class LangForm extends Form<Void> {
private static final long serialVersionUID = 1L;
private DropDownChoice<Map.Entry<Long, Locale>> languages;
static List<Map.Entry<Long, Locale>> getLanguages() {
- List<Map.Entry<Long, Locale>> list = new ArrayList<Map.Entry<Long, Locale>>();
+ List<Map.Entry<Long, Locale>> list = new ArrayList<>();
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet()) {
- list.add(new AbstractMap.SimpleEntry<Long,Locale>(e.getKey(), e.getValue()));
+ list.add(new AbstractMap.SimpleEntry<>(e.getKey(), e.getValue()));
}
return list;
}
-
+
public void updateLanguages(AjaxRequestTarget target) {
languages.setChoices(getLanguages());
target.add(languages);
@@ -60,7 +60,7 @@ public class LangForm extends Form<Void>
/**
* Render Main
- *
+ *
* @param id
* @param listContainer
* @param language
@@ -70,7 +70,7 @@ public class LangForm extends Form<Void>
super(id);
setOutputMarkupId(true);
- languages = new DropDownChoice<Map.Entry<Long, Locale>>("language"
+ languages = new DropDownChoice<>("language"
, new PropertyModel<Map.Entry<Long, Locale>>(langPanel, "language")
, getLanguages()
, new ChoiceRenderer<Map.Entry<Long, Locale>>() {
@@ -86,7 +86,7 @@ public class LangForm extends Form<Void>
return "" + object.getKey();
}
});
-
+
languages.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Wed Mar 1 06:11:13 2017
@@ -90,7 +90,7 @@ public class LangPanel extends AdminPane
// Create feedback panels
add(feedback.setOutputMarkupId(true));
- language = new AbstractMap.SimpleEntry<Long, Locale>(1L, Locale.ENGLISH);
+ language = new AbstractMap.SimpleEntry<>(1L, Locale.ENGLISH);
final LabelsForm form = new LabelsForm("form", this, new StringLabel(null, null));
form.showNewRecord();
@@ -148,10 +148,10 @@ public class LangPanel extends AdminPane
target.add(listContainer);
}
};
- DataViewContainer<StringLabel> container = new DataViewContainer<StringLabel>(listContainer, dataView, navigator);
+ DataViewContainer<StringLabel> container = new DataViewContainer<>(listContainer, dataView, navigator);
container
- .addLink(new OmOrderByBorder<StringLabel>("orderByName", "key", container))
- .addLink(new OmOrderByBorder<StringLabel>("orderByValue", "value", container));
+ .addLink(new OmOrderByBorder<>("orderByName", "key", container))
+ .addLink(new OmOrderByBorder<>("orderByValue", "value", container));
add(container.getLinks());
add(navigator);
langForm = new LangForm("langForm", listContainer, this);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Wed Mar 1 06:11:13 2017
@@ -19,8 +19,8 @@
package org.apache.openmeetings.web.admin.ldaps;
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -42,19 +42,19 @@ import org.apache.wicket.util.time.Durat
/**
* Form components to insert/update/delete {@link LdapConfig}
- *
+ *
* @author swagner
- *
+ *
*/
public class LdapForm extends AdminBaseForm<LdapConfig> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
public LdapForm(String id, WebMarkupContainer listContainer, final LdapConfig ldapConfig) {
- super(id, new CompoundPropertyModel<LdapConfig>(ldapConfig));
+ super(id, new CompoundPropertyModel<>(ldapConfig));
setOutputMarkupId(true);
this.listContainer = listContainer;
-
+
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1108))));
add(new CheckBox("active"));
add(forDatePattern("inserted", WEB_DATE_PATTERN));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Wed Mar 1 06:11:13 2017
@@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater
/**
* {@link AdminPanel} to list and modify {@link LdapConfig}
- *
+ *
* @author swagner
- *
+ *
*/
public class LdapsPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -56,7 +56,7 @@ public class LdapsPanel extends AdminPan
public LdapsPanel(String id) {
super(id);
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
- , new SearchableDataProvider<LdapConfig>(LdapConfigDao.class)) {
+ , new SearchableDataProvider<>(LdapConfigDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -88,13 +88,13 @@ public class LdapsPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "id", container))
- .addLink(new OmOrderByBorder<LdapConfig>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ DataViewContainer<LdapConfig> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByFile", "configFileName", container));
add(container.getLinks());
add(navigator);
-
+
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java Wed Mar 1 06:11:13 2017
@@ -46,31 +46,31 @@ public class OAuthForm extends AdminBase
private TextField<String> redirectUriText;
public OAuthForm(String id, WebMarkupContainer listContainer, OAuthServer server) {
- super(id, new CompoundPropertyModel<OAuthServer>(server));
+ super(id, new CompoundPropertyModel<>(server));
this.listContainer = listContainer;
setOutputMarkupId(true);
-
+
add(new CheckBox("isEnabled"));
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1573))));
add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString(1575))));
add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString(1576))));
add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString(1577))));
- add(redirectUriText = (TextField<String>) new TextField<String>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587))));
+ add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587))));
add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString(1578))));
add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString(1579))));
add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString(1586))));
add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString(1580))));
- add(new DropDownChoice<RequestMethod>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
+ add(new DropDownChoice<>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString(1582))));
add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString(1583))));
add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString(1584))));
add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString(1585))));
-
+
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected void onModelChanged() {
super.onModelChanged();
@@ -121,24 +121,24 @@ public class OAuthForm extends AdminBase
@Override
protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
-
+
@Override
protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
@Override
protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
- }
-
+
+ }
+
@Override
protected void onNewError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Wed Mar 1 06:11:13 2017
@@ -41,7 +41,7 @@ public class OAuthPanel extends AdminPan
public OAuthPanel(String id) {
super(id);
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
- new SearchableDataProvider<OAuthServer>(OAuth2Dao.class))
+ new SearchableDataProvider<>(OAuth2Dao.class))
{
private static final long serialVersionUID = 1L;
@@ -63,9 +63,9 @@ public class OAuthPanel extends AdminPan
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
}
-
+
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@@ -75,12 +75,12 @@ public class OAuthPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<OAuthServer> container = new DataViewContainer<OAuthServer>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "id", container))
- .addLink(new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
+ DataViewContainer<OAuthServer> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container));
add(container.getLinks());
add(navigator);
-
+
form = new OAuthForm("form", listContainer, new OAuthServer());
form.showNewRecord();
add(form);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Wed Mar 1 06:11:13 2017
@@ -107,7 +107,7 @@ public class RoomForm extends AdminBaseF
private IModel<User> moderator2add = Model.of((User)null);
public RoomForm(String id, WebMarkupContainer roomList, final Room room) {
- super(id, new CompoundPropertyModel<Room>(room));
+ super(id, new CompoundPropertyModel<>(room));
this.roomList = roomList;
setOutputMarkupId(true);
}
@@ -115,11 +115,11 @@ public class RoomForm extends AdminBaseF
@Override
protected void onInitialize() {
super.onInitialize();
- RequiredTextField<String> name = new RequiredTextField<String>("name");
- name.setLabel(new Model<String>(Application.getString(193)));
+ RequiredTextField<String> name = new RequiredTextField<>("name");
+ name.setLabel(new Model<>(Application.getString(193)));
add(name);
- add(new DropDownChoice<Long>("numberOfPartizipants", //
+ add(new DropDownChoice<>("numberOfPartizipants", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
@@ -144,11 +144,11 @@ public class RoomForm extends AdminBaseF
List<Group> orgList = isGroupAdmin
? getBean(GroupDao.class).get(null, getUserId(), 0, Integer.MAX_VALUE, null)
: getBean(GroupDao.class).get(0, Integer.MAX_VALUE);
- final List<RoomGroup> orgRooms = new ArrayList<RoomGroup>(orgList.size());
+ final List<RoomGroup> orgRooms = new ArrayList<>(orgList.size());
for (Group org : orgList) {
orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new ChoiceProvider<RoomGroup>() {
+ add(new Select2MultiChoice<>("roomGroups", null, new ChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
@@ -174,11 +174,11 @@ public class RoomForm extends AdminBaseF
@Override
public Collection<RoomGroup> toChoices(Collection<String> _ids) {
- List<Long> ids = new ArrayList<Long>();
+ List<Long> ids = new ArrayList<>();
for (String id : _ids) {
ids.add(Long.valueOf(id));
}
- List<RoomGroup> list = new ArrayList<RoomGroup>();
+ List<RoomGroup> list = new ArrayList<>();
for (Group o : getBean(GroupDao.class).get(ids)) {
list.add(new RoomGroup(o, RoomForm.this.getModelObject()));
}
@@ -187,8 +187,8 @@ public class RoomForm extends AdminBaseF
}).setLabel(Model.of(getString("828"))).setRequired(isGroupAdmin));
add(new CheckBox("isDemoRoom"));
- TextField<Integer> demoTime = new TextField<Integer>("demoTime");
- demoTime.setLabel(new Model<String>(Application.getString(637)));
+ TextField<Integer> demoTime = new TextField<>("demoTime");
+ demoTime.setLabel(new Model<>(Application.getString(637)));
add(demoTime);
add(new CheckBox("allowUserQuestions"));
add(new CheckBox("audioOnly"));
@@ -198,7 +198,7 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("allowRecording"));
add(new CheckBox("chatModerated"));
- add(new Select2MultiChoice<RoomElement>("hiddenElements", null, new ChoiceProvider<RoomElement>() {
+ add(new Select2MultiChoice<>("hiddenElements", null, new ChoiceProvider<RoomElement>() {
private static final long serialVersionUID = 1L;
@Override
@@ -237,7 +237,7 @@ public class RoomForm extends AdminBaseF
add(clientsContainer.add(clients.setOutputMarkupId(true)).setOutputMarkupId(true));
// Moderators
- final Select2Choice<User> moderatorChoice = new Select2Choice<User>("moderator2add", moderator2add, new AdminUserChoiceProvider() {
+ final Select2Choice<User> moderatorChoice = new Select2Choice<>("moderator2add", moderator2add, new AdminUserChoiceProvider() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Wed Mar 1 06:11:13 2017
@@ -47,7 +47,7 @@ public class RoomsPanel extends AdminPan
private final static JavaScriptResourceReference ROOM_FUNCTIONS = new JavaScriptResourceReference(RoomsPanel.class, "room.js");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -57,7 +57,7 @@ public class RoomsPanel extends AdminPan
public RoomsPanel(String id) {
super(id);
- SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableGroupAdminDataProvider<Room>(RoomDao.class)) {
+ SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableGroupAdminDataProvider<>(RoomDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -82,7 +82,7 @@ public class RoomsPanel extends AdminPan
item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
}
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@@ -92,16 +92,16 @@ public class RoomsPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Room>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Room>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
+ DataViewContainer<Room> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByPublic", "ispublic", container));
add(container.getLinks());
add(navigator);
add(form = new RoomForm("form", listContainer, new Room()));
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Wed Mar 1 06:11:13 2017
@@ -41,16 +41,16 @@ import org.apache.wicket.util.time.Durat
/**
* Form component to insert/update/delete {@link Server}
- *
+ *
* @author swagner
- *
+ *
*/
public class ServerForm extends AdminBaseForm<Server> {
private final WebMarkupContainer listContainer;
private static final long serialVersionUID = 1L;
public ServerForm(String id, WebMarkupContainer listContainer, final Server server) {
- super(id, new CompoundPropertyModel<Server>(server));
+ super(id, new CompoundPropertyModel<>(server));
setOutputMarkupId(true);
this.listContainer = listContainer;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Wed Mar 1 06:11:13 2017
@@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater
/**
* Form component with list and form to manipulate {@link Server}
- *
+ *
* @author swagner
- *
+ *
*/
public class ServersPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private ServerForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -56,7 +56,7 @@ public class ServersPanel extends AdminP
public ServersPanel(String id) {
super(id);
SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList",
- new SearchableDataProvider<Server>(ServerDao.class)) {
+ new SearchableDataProvider<>(ServerDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -79,7 +79,7 @@ public class ServersPanel extends AdminP
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
}
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 1L;
@@ -89,16 +89,16 @@ public class ServersPanel extends AdminP
target.add(listContainer);
}
};
- DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Server>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Server>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ DataViewContainer<Server> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByAddress", "address", container));
add(container.getLinks());
add(navigator);
-
+
form = new ServerForm("form", listContainer, new Server());
form.showNewRecord();
add(form);
-
+
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Wed Mar 1 06:11:13 2017
@@ -86,12 +86,12 @@ public class UserForm extends AdminBaseF
private final WebMarkupContainer listContainer;
private final WebMarkupContainer domain = new WebMarkupContainer("domain");
private GeneralUserForm generalForm;
- private final RequiredTextField<String> login = new RequiredTextField<String>("login");
+ private final RequiredTextField<String> login = new RequiredTextField<>("login");
private final MessageDialog warning;
- private final DropDownChoice<Long> domainId = new DropDownChoice<Long>("domainId");
+ private final DropDownChoice<Long> domainId = new DropDownChoice<>("domainId");
public UserForm(String id, WebMarkupContainer listContainer, final User user, MessageDialog warning) {
- super(id, new CompoundPropertyModel<User>(user));
+ super(id, new CompoundPropertyModel<>(user));
setOutputMarkupId(true);
this.listContainer = listContainer;
this.warning = warning;
@@ -176,7 +176,7 @@ public class UserForm extends AdminBaseF
add(generalForm = new GeneralUserForm("general", getModel(), true));
- add(new DropDownChoice<Type>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
+ add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@Override
@@ -192,7 +192,7 @@ public class UserForm extends AdminBaseF
add(new CheckBox("forceTimeZoneCheck"));
- add(new Select2MultiChoice<Right>("rights", null, new ChoiceProvider<Right>() {
+ add(new Select2MultiChoice<>("rights", null, new ChoiceProvider<Right>() {
private static final long serialVersionUID = 1L;
@Override
@@ -235,8 +235,8 @@ public class UserForm extends AdminBaseF
public void updateDomain(AjaxRequestTarget target) {
User u = getModelObject();
- final Map<Long, String> values = new Hashtable<Long, String>();
- List<Long> ids = new ArrayList<Long>();
+ final Map<Long, String> values = new Hashtable<>();
+ List<Long> ids = new ArrayList<>();
if (u.getType() == Type.ldap) {
for (LdapConfig c : getBean(LdapConfigDao.class).getActive()) {
ids.add(c.getId());
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Wed Mar 1 06:11:13 2017
@@ -69,7 +69,7 @@ public class UsersPanel extends AdminPan
public UsersPanel(String id) {
super(id);
- final SearchableDataView<User> dataView = new SearchableDataView<User>("userList", new SearchableGroupAdminDataProvider<User>(UserDao.class)) {
+ final SearchableDataView<User> dataView = new SearchableDataView<User>("userList", new SearchableGroupAdminDataProvider<>(UserDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -102,11 +102,11 @@ public class UsersPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<User> container = new DataViewContainer<User>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<User>("orderById", "id", container))
- .addLink(new OmOrderByBorder<User>("orderByLogin", "login", container))
- .addLink(new OmOrderByBorder<User>("orderByFirstName", "firstname", container))
- .addLink(new OmOrderByBorder<User>("orderByLastName", "lastname", container));
+ DataViewContainer<User> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByLogin", "login", container))
+ .addLink(new OmOrderByBorder<>("orderByFirstName", "firstname", container))
+ .addLink(new OmOrderByBorder<>("orderByLastName", "lastname", container));
add(container.getLinks());
add(navigator);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Wed Mar 1 06:11:13 2017
@@ -320,7 +320,7 @@ public class Application extends Authent
}
public static List<Client> getClients() {
- return new ArrayList<Client>(ONLINE_USERS.values());
+ return new ArrayList<>(ONLINE_USERS.values());
}
public static List<Client> getClients(Long userId) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java Wed Mar 1 06:11:13 2017
@@ -27,14 +27,14 @@ import org.apache.wicket.resource.loader
/**
* Map property values to OpenMeetings labelid's and get the string
- *
+ *
* @author swagner
*
*/
public class LabelResourceLoader implements IStringResourceLoader {
-
- private static Map<String,Long> STRING_LABEL_MAPPING = new HashMap<String,Long>();
-
+
+ private static Map<String,Long> STRING_LABEL_MAPPING = new HashMap<>();
+
static {
STRING_LABEL_MAPPING.put("PagingNavigator.first", 368L);
STRING_LABEL_MAPPING.put("PagingNavigator.previous", 369L);
@@ -53,7 +53,7 @@ public class LabelResourceLoader impleme
Locale locale, String style, String variation) {
return getStringByPropertyKey(key);
}
-
+
private static String getStringByPropertyKey(String key) {
Long labelId = STRING_LABEL_MAPPING.get(key);
if (labelId == null) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java Wed Mar 1 06:11:13 2017
@@ -95,10 +95,10 @@ public class WebSession extends Abstract
private static final Logger log = getLogger(WebSession.class, webAppRootKey);
public static final int MILLIS_IN_MINUTE = 60000;
public static final List<String> AVAILABLE_TIMEZONES = Arrays.asList(TimeZone.getAvailableIDs());
- public static final Set<String> AVAILABLE_TIMEZONE_SET = new LinkedHashSet<String>(AVAILABLE_TIMEZONES);
+ public static final Set<String> AVAILABLE_TIMEZONE_SET = new LinkedHashSet<>(AVAILABLE_TIMEZONES);
public static final String WICKET_ROOM_ID = "wicketroomid";
private Long userId = null;
- private Set<Right> rights = new HashSet<User.Right>(); //TODO renew somehow on user edit !!!!
+ private Set<Right> rights = new HashSet<>(); //TODO renew somehow on user edit !!!!
private long languageId = -1; //TODO renew somehow on user edit !!!!
private String SID = null;
private OmUrlFragment area = null;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java Wed Mar 1 06:11:13 2017
@@ -52,7 +52,7 @@ public abstract class AddFolderDialog ex
form = new Form<String>("form", getModel()) {
private static final long serialVersionUID = 1L;
{
- add(title = new RequiredTextField<String>("title", getModel()));
+ add(title = new RequiredTextField<>("title", getModel()));
title.setLabel(Model.of(Application.getString(572)));
add(feedback.setOutputMarkupId(true));
add(new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java Wed Mar 1 06:11:13 2017
@@ -34,7 +34,7 @@ public class ComunityUserForm extends Fo
public ComunityUserForm(String id, IModel<User> model) {
super(id, model);
- RadioGroup<Long> rg = new RadioGroup<Long>("community_settings", new IModel<Long>() {
+ RadioGroup<Long> rg = new RadioGroup<>("community_settings", new IModel<Long>() {
private static final long serialVersionUID = 1L;
@Override
@@ -67,14 +67,14 @@ public class ComunityUserForm extends Fo
public void detach() {
}
});
- add(rg.add(new Radio<Long>("everybody", Model.of(1L)), new Radio<Long>("contact", Model.of(2L))
- , new Radio<Long>("nobody", Model.of(3L))).setOutputMarkupId(true).setRenderBodyOnly(false)
+ add(rg.add(new Radio<>("everybody", Model.of(1L)), new Radio<>("contact", Model.of(2L))
+ , new Radio<>("nobody", Model.of(3L))).setOutputMarkupId(true).setRenderBodyOnly(false)
);
add(new TextArea<String>("userOffers"));
add(new TextArea<String>("userSearchs"));
}
-
+
@Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Wed Mar 1 06:11:13 2017
@@ -85,7 +85,7 @@ public class GeneralUserForm extends For
passwordField.setResetPassword(false).setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
updateModelObject(getModelObject(), isAdminForm);
- add(new DropDownChoice<Salutation>("salutation"
+ add(new DropDownChoice<>("salutation"
, Arrays.asList(Salutation.values())
, new ChoiceRenderer<Salutation>() {
private static final long serialVersionUID = 1L;
@@ -103,11 +103,11 @@ public class GeneralUserForm extends For
add(new TextField<String>("firstname"));
add(new TextField<String>("lastname"));
- add(new DropDownChoice<String>("timeZoneId", AVAILABLE_TIMEZONES));
+ add(new DropDownChoice<>("timeZoneId", AVAILABLE_TIMEZONES));
add(new LanguageDropDown("languageId"));
- add(email = new RequiredTextField<String>("address.email"));
+ add(email = new RequiredTextField<>("address.email"));
email.setLabel(Model.of(Application.getString(137)));
email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new TextField<String>("address.phone"));
@@ -132,7 +132,7 @@ public class GeneralUserForm extends For
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Select2MultiChoice<GroupUser>("groupUsers", null, new ChoiceProvider<GroupUser>() {
+ add(new Select2MultiChoice<>("groupUsers", null, new ChoiceProvider<GroupUser>() {
private static final long serialVersionUID = 1L;
@Override
@@ -157,11 +157,11 @@ public class GeneralUserForm extends For
@Override
public Collection<GroupUser> toChoices(Collection<String> _ids) {
- List<Long> ids = new ArrayList<Long>();
+ List<Long> ids = new ArrayList<>();
for (String id : _ids) {
ids.add(Long.parseLong(id));
}
- List<GroupUser> list = new ArrayList<GroupUser>();
+ List<GroupUser> list = new ArrayList<>();
User u = GeneralUserForm.this.getModelObject();
for (Group g : getBean(GroupDao.class).get(ids)) {
GroupUser gu = new GroupUser(g, u);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html Wed Mar 1 06:11:13 2017
@@ -7,16 +7,16 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -31,7 +31,7 @@
<div class="column data"><textarea wicket:id="message" style="width: 280px; height: 70px;"></textarea></div>
</div>
<div>
- <input wicket:id="passwordProtected" type="checkbox"/> <label
+ <input wicket:id="passwordProtected" type="checkbox"/> <label
wicket:for="passwordProtected"><wicket:message key="524" /></label>
</div>
<div>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java Wed Mar 1 06:11:13 2017
@@ -70,18 +70,18 @@ public abstract class InvitationForm ext
private static final Logger log = Red5LoggerFactory.getLogger(InvitationForm.class, webAppRootKey);
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final PasswordTextField passwd;
- private final DropDownChoice<String> timeZoneId = new DropDownChoice<String>("timeZoneId", Model.of((String)null), AVAILABLE_TIMEZONES);
+ private final DropDownChoice<String> timeZoneId = new DropDownChoice<>("timeZoneId", Model.of((String)null), AVAILABLE_TIMEZONES);
private final OmDateTimePicker from = new OmDateTimePicker("from", Model.of(LocalDateTime.now()));
private final OmDateTimePicker to = new OmDateTimePicker("to", Model.of(LocalDateTime.now()));
private final LanguageDropDown lang = new LanguageDropDown("language", Model.of((Long)null));
- protected final TextField<String> subject = new TextField<String>("subject", Model.of((String)null));
- protected final TextArea<String> message = new TextArea<String>("message", Model.of((String)null));
- protected final TextField<String> url = new TextField<String>("url", Model.of((String)null));
- protected final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<User>(new ArrayList<User>()));
+ protected final TextField<String> subject = new TextField<>("subject", Model.of((String)null));
+ protected final TextArea<String> message = new TextArea<>("message", Model.of((String)null));
+ protected final TextField<String> url = new TextField<>("url", Model.of((String)null));
+ protected final UserMultiChoice recipients = new UserMultiChoice("recipients", new CollectionModel<>(new ArrayList<User>()));
protected InvitationDialog dialog;
public InvitationForm(String id) {
- super(id, new CompoundPropertyModel<Invitation>(new Invitation()));
+ super(id, new CompoundPropertyModel<>(new Invitation()));
setOutputMarkupId(true);
add(subject, message);
@@ -104,7 +104,7 @@ public abstract class InvitationForm ext
target.add(passwd);
}
});
- RadioGroup<Valid> valid = new RadioGroup<Valid>("valid");
+ RadioGroup<Valid> valid = new RadioGroup<>("valid");
valid.add(new AjaxFormChoiceComponentUpdatingBehavior() {
private static final long serialVersionUID = 1L;
@@ -114,9 +114,9 @@ public abstract class InvitationForm ext
target.add(from.setEnabled(dateEnabled), to.setEnabled(dateEnabled), timeZoneId.setEnabled(dateEnabled));
}
});
- add(valid.add(new Radio<Valid>("one", Model.of(Valid.OneTime))
- , new Radio<Valid>("period", Model.of(Valid.Period))
- , new Radio<Valid>("endless", Model.of(Valid.Endless))));
+ add(valid.add(new Radio<>("one", Model.of(Valid.OneTime))
+ , new Radio<>("period", Model.of(Valid.Period))
+ , new Radio<>("endless", Model.of(Valid.Endless))));
add(passwd = new PasswordTextField("password"));
Invitation i = getModelObject();
passwd.setLabel(Model.of(Application.getString(525))).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java Wed Mar 1 06:11:13 2017
@@ -30,18 +30,18 @@ import org.apache.wicket.model.IModel;
public class LanguageDropDown extends DropDownChoice<Long> {
private static final long serialVersionUID = 1L;
- private final List<Long> languages = new ArrayList<Long>();
+ private final List<Long> languages = new ArrayList<>();
public LanguageDropDown(String id, IModel<Long> model) {
super(id, model, new ArrayList<Long>());
internalInit();
}
-
+
public LanguageDropDown(String id) {
super(id);
internalInit();
}
-
+
private void internalInit() {
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet()) {
languages.add(e.getKey());
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java Wed Mar 1 06:11:13 2017
@@ -156,7 +156,7 @@ public class MainPanel extends Panel {
add(new EmptyPanel("dev").setVisible(false));
}
add(about, chat = new ChatPanel("chatPanel"));
- add(newMessage = new MessageDialog("newMessageDialog", new CompoundPropertyModel<PrivateMessage>(new PrivateMessage())) {
+ add(newMessage = new MessageDialog("newMessageDialog", new CompoundPropertyModel<>(new PrivateMessage())) {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Wed Mar 1 06:11:13 2017
@@ -48,9 +48,9 @@ public abstract class PagedEntityListPan
};
final SearchableDataProvider<? extends IDataProviderEntity> dp = dataView.getDataProvider();
- Form<Void> searchForm = new Form<Void>("searchForm");
+ Form<Void> searchForm = new Form<>("searchForm");
add(searchForm.setOutputMarkupId(true));
- searchForm.add(new TextField<String>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
+ searchForm.add(new TextField<>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
AjaxButton b = new AjaxButton("search", searchForm) {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java Wed Mar 1 06:11:13 2017
@@ -31,22 +31,22 @@ import org.apache.wicket.model.PropertyM
public abstract class PagingNavigatorPanel extends Panel {
private static final long serialVersionUID = 1L;
private int entitiesPerPage;
-
+
public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers) {
this(id, dataView, numbers, 50);
}
-
+
public PagingNavigatorPanel(String id, final DataView<?> dataView, List<Integer> numbers, int _entitiesPerPage) {
super(id);
setOutputMarkupId(true);
this.entitiesPerPage = _entitiesPerPage;
dataView.setItemsPerPage(entitiesPerPage);
- final Form<Void> f = new Form<Void>("pagingForm");
+ final Form<Void> f = new Form<>("pagingForm");
f.add(new OmPagingNavigator("navigator", dataView).setOutputMarkupId(true))
- .add(new DropDownChoice<Integer>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
+ .add(new DropDownChoice<>("entitiesPerPage", new PropertyModel<Integer>(this, "entitiesPerPage"), numbers)
.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onUpdate(AjaxRequestTarget target) {
long newPage = dataView.getCurrentPage() * dataView.getItemsPerPage() / entitiesPerPage;
@@ -62,10 +62,10 @@ public abstract class PagingNavigatorPan
public int getEntitiesPerPage() {
return entitiesPerPage;
}
-
+
public void setEntitiesPerPage(int entitiesPerPage) {
this.entitiesPerPage = entitiesPerPage;
}
-
+
protected abstract void onEvent(AjaxRequestTarget target);
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java Wed Mar 1 06:11:13 2017
@@ -68,7 +68,7 @@ public abstract class UploadableImagePan
@Override
protected void onInitialize() {
super.onInitialize();
- final Form<Void> form = new Form<Void>("form");
+ final Form<Void> form = new Form<>("form");
form.setMultiPart(true);
form.setMaxSize(Bytes.bytes(getBean(ConfigurationDao.class).getMaxUploadSize()));
// Model is necessary here to avoid writing image to the User object
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java Wed Mar 1 06:11:13 2017
@@ -37,13 +37,13 @@ public abstract class UserPanel extends
public UserPanel(String id) {
super(id);
}
-
+
public UserPanel(String id, IModel<?> model) {
super(id, model);
}
-
+
public static List<Room> getMyRooms() {
- List<Room> result = new ArrayList<Room>();
+ List<Room> result = new ArrayList<>();
result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.conference, Application.getString(1306L)));
result.add(getBean(RoomDao.class).getUserRoom(getUserId(), Room.Type.restricted, Application.getString(1307L)));
result.addAll(getBean(RoomDao.class).getAppointedRoomsByUser(getUserId()));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java Wed Mar 1 06:11:13 2017
@@ -61,7 +61,7 @@ public class ConvertingErrorsDialog exte
public int getWidth() {
return 600;
}
-
+
@Override
public boolean isResizable() {
return true;
@@ -76,7 +76,7 @@ public class ConvertingErrorsDialog exte
super(id, Application.getString(887), model);
add(container.add(message.setVisible(false), logView.setVisible(false)).setOutputMarkupId(true));
}
-
+
@Override
protected void onOpen(IPartialPageRequestHandler handler) {
FileItem f = getModelObject();
@@ -98,13 +98,13 @@ public class ConvertingErrorsDialog exte
handler.add(container);
super.onOpen(handler);
}
-
+
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
}
-
+
@Override
protected List<DialogButton> getButtons() {
- return new ArrayList<DialogButton>();
+ return new ArrayList<>();
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java Wed Mar 1 06:11:13 2017
@@ -91,7 +91,7 @@ public abstract class FileTreePanel exte
item.onClick(target);
}
};
- private final Form<Void> form = new Form<Void>("form");
+ private final Form<Void> form = new Form<>("form");
private final AddFolderDialog addFolder;
private final ConfirmableBorderDialog trashConfirm;
private ConfirmableAjaxBorder trashBorder;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java Wed Mar 1 06:11:13 2017
@@ -32,19 +32,19 @@ public class DataViewContainer<T extends
public WebMarkupContainer container;
public SearchableDataView<T> view;
public PagedEntityListPanel navigator;
- private List<OmOrderByBorder<T>> orderLinks = new ArrayList<OmOrderByBorder<T>>();
-
+ private List<OmOrderByBorder<T>> orderLinks = new ArrayList<>();
+
public DataViewContainer(WebMarkupContainer container, SearchableDataView<T> view, PagedEntityListPanel navigator) {
this.container = container;
this.view = view;
this.navigator = navigator;
}
-
+
public DataViewContainer<T> addLink(OmOrderByBorder<T> link) {
orderLinks.add(link);
return this;
}
-
+
public OmOrderByBorder<T>[] getLinks() {
@SuppressWarnings("unchecked")
OmOrderByBorder<T>[] a = new OmOrderByBorder[0];
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java Wed Mar 1 06:11:13 2017
@@ -30,16 +30,16 @@ import org.apache.wicket.model.IModel;
/**
* provides function to fill paging tables
- *
+ *
* @author swagner
- *
+ *
* @param <T>
*/
public class SearchableDataProvider<T extends IDataProviderEntity> extends SortableDataProvider<T, String> {
private static final long serialVersionUID = 1L;
protected Class<? extends IDataProviderDao<T>> clazz;
protected String search = null;
-
+
public SearchableDataProvider(Class<? extends IDataProviderDao<T>> c) {
this.clazz = c;
}
@@ -75,7 +75,7 @@ public class SearchableDataProvider<T ex
@Override
public IModel<T> model(T object) {
- return new CompoundPropertyModel<T>(object);
+ return new CompoundPropertyModel<>(object);
}
public void setSearch(String search) {
@@ -85,7 +85,7 @@ public class SearchableDataProvider<T ex
this.search = null;
}
}
-
+
public String getSearch() {
return search;
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java Wed Mar 1 06:11:13 2017
@@ -55,7 +55,7 @@ public abstract class BasePage extends A
protected abstract String getApplicationName();
public BasePage() {
- options = new HashMap<String, String>();
+ options = new HashMap<>();
options.put("fragmentIdentifierSuffix", "");
options.put("keyValueDelimiter", "/");
String appName = getApplicationName();
@@ -64,7 +64,7 @@ public abstract class BasePage extends A
add(new TransparentWebMarkupContainer("html")
.add(new AttributeModifier("xml:lang", code))
.add(new AttributeModifier("lang", code))
- .add(new AttributeModifier("dir", isRtl() ? "rtl" : "ltr")));
+ .add(new AttributeModifier("dir", isRtl() ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
add(header = new HeaderPanel("header", appName));
}
@@ -91,11 +91,11 @@ public abstract class BasePage extends A
protected String getGaCode() {
return getBean(ConfigurationDao.class).getConfValue(CONFIG_GOOGLE_ANALYTICS_CODE, String.class, null);
}
-
+
protected boolean isMainPage() {
return false;
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
response.render(new PriorityHeaderItem(JavaScriptHeaderItem.forReference(Application.get().getJavaScriptLibrarySettings().getJQueryReference())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java Wed Mar 1 06:11:13 2017
@@ -85,11 +85,11 @@ public class ForgetPasswordDialog extend
{
add(feedback.setOutputMarkupId(true));
add(label.setOutputMarkupId(true));
- add(nameField = new RequiredTextField<String>("name", new PropertyModel<String>(ForgetPasswordDialog.this, "name")));
+ add(nameField = new RequiredTextField<>("name", new PropertyModel<String>(ForgetPasswordDialog.this, "name")));
nameField.setLabel(Model.of(Application.getString(type == Type.email ? 315 : 316)));
- RadioGroup<Type> rg = new RadioGroup<Type>("type", new PropertyModel<Type>(ForgetPasswordDialog.this, "type"));
- add(rg.add(new Radio<Type>("email", Model.of(Type.email)).setOutputMarkupId(true))
- .add(new Radio<Type>("login", Model.of(Type.login)).setOutputMarkupId(true))
+ RadioGroup<Type> rg = new RadioGroup<>("type", new PropertyModel<Type>(ForgetPasswordDialog.this, "type"));
+ add(rg.add(new Radio<>("email", Model.of(Type.email)).setOutputMarkupId(true))
+ .add(new Radio<>("login", Model.of(Type.login)).setOutputMarkupId(true))
.setOutputMarkupId(true));
rg.add(new AjaxFormChoiceComponentUpdatingBehavior() {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java Wed Mar 1 06:11:13 2017
@@ -71,7 +71,7 @@ public class RegisterDialog extends Abst
private DialogButton registerBtn = new DialogButton("register", Application.getString(121));
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode());
- private final DropDownChoice<String> tzDropDown = new DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
+ private final DropDownChoice<String> tzDropDown = new DropDownChoice<>("tz", tzModel, AVAILABLE_TIMEZONES);
private RegisterForm form;
private SignInDialog s;
private String firstName;
@@ -230,13 +230,13 @@ public class RegisterDialog extends Abst
super(id);
add(feedback.setOutputMarkupId(true));
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- add(firstNameField = new RequiredTextField<String>("firstName", new PropertyModel<String>(
+ add(firstNameField = new RequiredTextField<>("firstName", new PropertyModel<String>(
RegisterDialog.this, "firstName")));
firstNameField.setLabel(Model.of(Application.getString(117)));
- add(lastNameField = new RequiredTextField<String>("lastName", new PropertyModel<String>(
+ add(lastNameField = new RequiredTextField<>("lastName", new PropertyModel<String>(
RegisterDialog.this, "lastName")));
lastNameField.setLabel(Model.of(Application.getString(118)));
- add(loginField = new RequiredTextField<String>("login", new PropertyModel<String>(RegisterDialog.this,
+ add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(RegisterDialog.this,
"login")));
loginField.setLabel(Model.of(Application.getString(114)));
loginField.add(minimumLength(getMinLoginLength(cfgDao)));
@@ -246,7 +246,7 @@ public class RegisterDialog extends Abst
passwordField.setResetPassword(true).add(minimumLength(getMinPasswdLength(cfgDao)));
add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>()).setResetPassword(true));
confirmPassword.setLabel(Model.of(Application.getString(116)));
- add(emailField = new RequiredTextField<String>("email", new PropertyModel<String>(RegisterDialog.this,
+ add(emailField = new RequiredTextField<>("email", new PropertyModel<String>(RegisterDialog.this,
"email")));
emailField.setLabel(Model.of(Application.getString(119)));
emailField.add(RfcCompliantEmailAddressValidator.getInstance());
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java Wed Mar 1 06:11:13 2017
@@ -64,7 +64,7 @@ public class ResetPasswordDialog extends
private PasswordTextField confirmPassword;
{
add(feedback.setOutputMarkupId(true));
- add(login = new TextField<String>("login", Model.of(user.getLogin())));
+ add(login = new TextField<>("login", Model.of(user.getLogin())));
login.setOutputMarkupId(true);
add(password = new PasswordTextField("password", new Model<String>()));
password.setOutputMarkupId(true);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java Wed Mar 1 06:11:13 2017
@@ -132,7 +132,7 @@ public class SignInDialog extends Abstra
@Override
protected List<DialogButton> getButtons() {
- List<DialogButton> list = new ArrayList<DialogButton>();
+ List<DialogButton> list = new ArrayList<>();
if (allowRegister()) {
list.add(registerBtn);
}
@@ -206,7 +206,7 @@ public class SignInDialog extends Abstra
alreadyLoggedIn();
}
add(feedback.setOutputMarkupId(true));
- add(loginField = new RequiredTextField<String>("login", new PropertyModel<String>(SignInDialog.this, "login")));
+ add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(SignInDialog.this, "login")));
loginField.setLabel(Model.of(Application.getString(114)));
add(passField = new PasswordTextField("pass", new PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
passField.setLabel(Model.of(Application.getString(115)));
@@ -214,7 +214,7 @@ public class SignInDialog extends Abstra
int selectedLdap = getBean(ConfigurationDao.class).getConfValue(CONFIG_DEFAULT_LDAP_ID, Integer.class, "0");
domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0);
add(new WebMarkupContainer("ldap")
- .add(new DropDownChoice<LdapConfig>("domain", new PropertyModel<LdapConfig>(SignInDialog.this, "domain")
+ .add(new DropDownChoice<>("domain", new PropertyModel<LdapConfig>(SignInDialog.this, "domain")
, ldaps, new ChoiceRenderer<LdapConfig>("name", "id"))).setVisible(ldaps.size() > 1));
add(new CheckBox("rememberMe", new PropertyModel<Boolean>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true));
AjaxButton ab = new AjaxButton("submit") { //FAKE button so "submit-on-enter" works as expected
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Wed Mar 1 06:11:13 2017
@@ -115,7 +115,7 @@ public class InstallWizard extends Abstr
//onInit, applyState
public InstallWizard(String id, String title) {
- super(id, title, new CompoundPropertyModel<InstallationConfig>(new InstallationConfig()), true);
+ super(id, title, new CompoundPropertyModel<>(new InstallationConfig()), true);
setTitle(Model.of(getModelObject().appName));
welcomeStep = new WelcomeStep();
dbStep = new DbStep();
@@ -211,12 +211,12 @@ public class InstallWizard extends Abstr
private static final long serialVersionUID = 1L;
private final WebMarkupContainer hostelem = new WebMarkupContainer("hostelem");
private final WebMarkupContainer portelem = new WebMarkupContainer("portelem");
- private final RequiredTextField<String> host = new RequiredTextField<String>("host", Model.of(""));
- private final RequiredTextField<Integer> port = new RequiredTextField<Integer>("port", Model.of(0));
- private final RequiredTextField<String> dbname = new RequiredTextField<String>("dbname", Model.of(""));
- private final Form<ConnectionProperties> form = new Form<ConnectionProperties>("form", new CompoundPropertyModel<ConnectionProperties>(getProps(null))) {
+ private final RequiredTextField<String> host = new RequiredTextField<>("host", Model.of(""));
+ private final RequiredTextField<Integer> port = new RequiredTextField<>("port", Model.of(0));
+ private final RequiredTextField<String> dbname = new RequiredTextField<>("dbname", Model.of(""));
+ private final Form<ConnectionProperties> form = new Form<ConnectionProperties>("form", new CompoundPropertyModel<>(getProps(null))) {
private static final long serialVersionUID = 1L;
- private final DropDownChoice<DbType> db = new DropDownChoice<DbType>("dbType", Arrays.asList(DbType.values()), new ChoiceRenderer<DbType>() {
+ private final DropDownChoice<DbType> db = new DropDownChoice<>("dbType", Arrays.asList(DbType.values()), new ChoiceRenderer<DbType>() {
private static final long serialVersionUID = 1L;
@Override
@@ -229,8 +229,8 @@ public class InstallWizard extends Abstr
return object.name();
}
});
- private final RequiredTextField<String> user = new RequiredTextField<String>("login");
- private final TextField<String> pass = new TextField<String>("password");
+ private final RequiredTextField<String> user = new RequiredTextField<>("login");
+ private final TextField<String> pass = new TextField<>("password");
{
add(db.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -467,7 +467,7 @@ public class InstallWizard extends Abstr
//TODO check mail server
add(new YesNoDropDown("replyToOrganizer"));
add(new LangDropDown("defaultLangId"));
- add(new DropDownChoice<String>("defaultExportFont", allFonts));
+ add(new DropDownChoice<>("defaultExportFont", allFonts));
}
@Override
@@ -500,7 +500,7 @@ public class InstallWizard extends Abstr
add(new TextField<Integer>("swfZoom").setRequired(true).add(range(50, 600)));
add(new TextField<Integer>("swfJpegQuality").setRequired(true).add(range(1, 100)));
- add(swfPath = new TextField<String>("swfPath"));
+ add(swfPath = new TextField<>("swfPath"));
add(new AjaxButton("validateSwf") {
private static final long serialVersionUID = 1L;
@Override
@@ -509,7 +509,7 @@ public class InstallWizard extends Abstr
target.add(getFeedbackPanel());
}
});
- add(imageMagicPath = new TextField<String>("imageMagicPath"));
+ add(imageMagicPath = new TextField<>("imageMagicPath"));
add(new AjaxButton("validateImageMagic") {
private static final long serialVersionUID = 1L;
@Override
@@ -518,7 +518,7 @@ public class InstallWizard extends Abstr
target.add(getFeedbackPanel());
}
});
- add(ffmpegPath = new TextField<String>("ffmpegPath"));
+ add(ffmpegPath = new TextField<>("ffmpegPath"));
add(new AjaxButton("validateFfmpeg") {
private static final long serialVersionUID = 1L;
@Override
@@ -527,7 +527,7 @@ public class InstallWizard extends Abstr
target.add(getFeedbackPanel());
}
});
- add(soxPath = new TextField<String>("soxPath"));
+ add(soxPath = new TextField<>("soxPath"));
add(new AjaxButton("validateSox") {
private static final long serialVersionUID = 1L;
@Override
@@ -536,7 +536,7 @@ public class InstallWizard extends Abstr
target.add(getFeedbackPanel());
}
});
- add(officePath = new TextField<String>("officePath"));
+ add(officePath = new TextField<>("officePath"));
add(new AjaxButton("validateOffice") {
private static final long serialVersionUID = 1L;
@Override
@@ -696,7 +696,7 @@ public class InstallWizard extends Abstr
}
}
});
- container.add(progressBar = new ProgressBar("progress", new Model<Integer>(0)) {
+ container.add(progressBar = new ProgressBar("progress", new Model<>(0)) {
private static final long serialVersionUID = 1L;
@Override
@@ -865,7 +865,7 @@ public class InstallWizard extends Abstr
public LangDropDown(String id) {
super(id);
- List<SelectOption> list = new ArrayList<SelectOption>();
+ List<SelectOption> list = new ArrayList<>();
for (Map.Entry<Long, Locale> me : LabelDao.languages.entrySet()) {
SelectOption op = new SelectOption(me.getKey().toString(), me.getValue().getDisplayName());
if (getSession().getLocale().equals(me.getValue())) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java Wed Mar 1 06:11:13 2017
@@ -177,7 +177,7 @@ public class SwfPanel extends BasePanel
long minimum = -1;
Server result = null;
- HashMap<Server, List<Long>> activeRoomsMap = new HashMap<Server, List<Long>>();
+ Map<Server, List<Long>> activeRoomsMap = new HashMap<>();
for (Server server : serverList) {
List<Long> roomIds = getBean(SessionManager.class).getActiveRoomIdsByServer(server);
if (roomIds.contains(roomId)) {