Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/LabelResourceLoader.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/AddFolderDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.html (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/LanguageDropDown.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UserPanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/DataViewContainer.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableDataProvider.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original) +++ openmeetings/application/trunk/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.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:extend> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java Wed Mar 1 06:11:13 2017 @@ -58,8 +58,8 @@ public class RoomInvitationForm extends private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user)); private final Long roomId; private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer"); - final Select2MultiChoice<Group> groups = new Select2MultiChoice<Group>("groups" - , new CollectionModel<Group>(new ArrayList<Group>()) + final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups" + , new CollectionModel<>(new ArrayList<Group>()) , new GroupChoiceProvider()); final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container"); @@ -85,17 +85,17 @@ public class RoomInvitationForm extends groupContainer.add( groups.setLabel(Model.of(Application.getString(126))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") { private static final long serialVersionUID = 1L; - + @Override protected void onUpdate(AjaxRequestTarget target) { url.setModelObject(null); updateButtons(target); } }).setOutputMarkupId(true) - , new Radio<InviteeType>("group", Model.of(InviteeType.group)) + , new Radio<>("group", Model.of(InviteeType.group)) ); rdi.add(recipients, groupContainer.setVisible(showGroups)); - rdi.add(new Radio<InviteeType>("user", Model.of(InviteeType.user))); + rdi.add(new Radio<>("user", Model.of(InviteeType.user))); add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); sipContainer.add(new Label("room.confno", "")).setVisible(false); } @@ -110,7 +110,7 @@ public class RoomInvitationForm extends dialog.generate.setEnabled(false, target); } } - + @Override public void updateModel(AjaxRequestTarget target) { super.updateModel(target); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Wed Mar 1 06:11:13 2017 @@ -56,7 +56,7 @@ public class CreatePollDialog extends Ab private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); public CreatePollDialog(String id, Long roomId) { - super(id, Application.getString(18), new CompoundPropertyModel<RoomPoll>(new RoomPoll())); + super(id, Application.getString(18), new CompoundPropertyModel<>(new RoomPoll())); this.roomId = roomId; add(form = new PollForm("form", getModel())); } @@ -106,7 +106,7 @@ public class CreatePollDialog extends Ab super(id, model); add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410)))); add(new TextArea<String>("question")); - add(new DropDownChoice<RoomPoll.Type>("type", Arrays.asList(RoomPoll.Type.values()) + add(new DropDownChoice<>("type", Arrays.asList(RoomPoll.Type.values()) , new ChoiceRenderer<RoomPoll.Type>() { private static final long serialVersionUID = 1L; Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Wed Mar 1 06:11:13 2017 @@ -46,6 +46,12 @@ import org.wicketstuff.jqplot.behavior.J import org.wicketstuff.jqplot.behavior.JqPlotCssResourceReference; import org.wicketstuff.jqplot.behavior.JqPlotJavascriptResourceReference; +import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; +import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; + import br.com.digilabs.jqplot.Chart; import br.com.digilabs.jqplot.ChartConfiguration; import br.com.digilabs.jqplot.JqPlotResources; @@ -56,12 +62,6 @@ import br.com.digilabs.jqplot.elements.H import br.com.digilabs.jqplot.elements.Location; import br.com.digilabs.jqplot.elements.RendererOptions; -import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; -import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; - /** * @author solomax * @@ -122,12 +122,12 @@ public class PollResultsDialog extends A public int getWidth() { return 500; } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(delete, close, cancel); } - + public void updateModel(AjaxRequestTarget target, boolean moderator) { selForm.updateModel(target); this.moderator = moderator; @@ -137,7 +137,7 @@ public class PollResultsDialog extends A builder.append("$('#").append(PollResultsDialog.this.getMarkupId()).append("').on('dialogopen', function( event, ui ) {"); builder.append(getScript(barChart(p))); builder.append("});"); - + target.appendJavaScript(builder.toString()); } @@ -151,13 +151,13 @@ public class PollResultsDialog extends A builder.append(");"); return builder; } - + @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render(JavaScriptHeaderItem.forReference(JqPlotJavascriptResourceReference.get())); response.render(CssHeaderItem.forReference(JqPlotCssResourceReference.get())); - Chart<?> c1 = new PieChart<Number>(null); + Chart<?> c1 = new PieChart<>(null); c1.getChartConfiguration().setHighlighter(new Highlighter()); for (Chart<?> chart : new Chart<?>[]{c1, new BarChart<Integer>(null)}) { for (String resource : JqPlotUtils.retriveJavaScriptResources(chart)) { @@ -165,42 +165,41 @@ public class PollResultsDialog extends A } } } - - private static String removeMinified(String name_) { - String name = name_; - int idxOfExtension = name.lastIndexOf('.'); - if (idxOfExtension > -1) { - String extension = name.substring(idxOfExtension); - name = name.substring(0, name.length() - extension.length() + 1); - if (name.endsWith(".min.")) - { - name = name.substring(0, name.length() - 5) + extension; - } - } - return name; - } - - @Override - public void onClick(AjaxRequestTarget target, DialogButton button) { - if (close.equals(button)) { - closeConfirm.open(target); - } else if (delete.equals(button)) { - deleteConfirm.open(target); - } else { - super.onClick(target, button); - } - } - - @Override - public void onClose(IPartialPageRequestHandler handler, DialogButton button) { - } - - private static String[] getTicks(RoomPoll p) { + + private static String removeMinified(String name_) { + String name = name_; + int idxOfExtension = name.lastIndexOf('.'); + if (idxOfExtension > -1) { + String extension = name.substring(idxOfExtension); + name = name.substring(0, name.length() - extension.length() + 1); + if (name.endsWith(".min.")) { + name = name.substring(0, name.length() - 5) + extension; + } + } + return name; + } + + @Override + public void onClick(AjaxRequestTarget target, DialogButton button) { + if (close.equals(button)) { + closeConfirm.open(target); + } else if (delete.equals(button)) { + deleteConfirm.open(target); + } else { + super.onClick(target, button); + } + } + + @Override + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + } + + private static String[] getTicks(RoomPoll p) { return p != null && RoomPoll.Type.numeric == p.getType() ? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"} : new String[] {Application.getString(34), Application.getString(35)}; - } - + } + private static Integer[] initValues(int size) { Integer[] values = new Integer[size]; for (int i = 0; i < size; ++i) { @@ -208,7 +207,7 @@ public class PollResultsDialog extends A } return values; } - + private static Integer[] getValues(RoomPoll p) { Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2); if (p != null && RoomPoll.Type.numeric == p.getType()) { @@ -222,64 +221,63 @@ public class PollResultsDialog extends A } return values; } - + private static PieChart<Integer> pieChart(RoomPoll p) { - PieChart<Integer> pieChart = new PieChart<Integer>(null); + PieChart<Integer> pieChart = new PieChart<>(null); String[] ticks = getTicks(p); Integer[] values = getValues(p); - for (int i = 0; i < values.length; ++i) { - pieChart.addValue(ticks[i], values[i]); - } - - pieChart.getSeriesDefaults().setRendererOptions( - new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) - .setFill(false).setSliceMargin(4).setLineWidth(5)); - - Highlighter h = new Highlighter(); - h.setShow(true); - h.setFormatString("%s, %P"); - h.setTooltipLocation(Location.ne); - h.setShowTooltip(true); - h.setUseAxesFormatters(false); - - pieChart.getChartConfiguration().setLegend(null).setHighlighter(h); - return pieChart; + for (int i = 0; i < values.length; ++i) { + pieChart.addValue(ticks[i], values[i]); + } + + pieChart.getSeriesDefaults().setRendererOptions(new RendererOptions().setHighlightMouseDown(true) + .setShowDataLabels(true).setFill(false).setSliceMargin(4).setLineWidth(5)); + + Highlighter h = new Highlighter(); + h.setShow(true); + h.setFormatString("%s, %P"); + h.setTooltipLocation(Location.ne); + h.setShowTooltip(true); + h.setUseAxesFormatters(false); + + pieChart.getChartConfiguration().setLegend(null).setHighlighter(h); + return pieChart; } - + private static BarChart<Integer> barChart(RoomPoll p) { String[] ticks = getTicks(p); - BarChart<Integer> barChart = new BarChart<Integer>(null); + BarChart<Integer> barChart = new BarChart<>(null); barChart.addValue(Arrays.asList(getValues(p))); - - barChart.getSeriesDefaults().setRendererOptions( - new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) - .setFill(false).setSliceMargin(4).setLineWidth(5).setBarDirection("horizontal")); - - Highlighter h = new Highlighter(); - h.setShow(true); - h.setFormatString("%s, %P"); - h.setTooltipLocation(Location.ne); - h.setShowTooltip(true); - h.setUseAxesFormatters(false); - - ChartConfiguration<Long> cfg = barChart.getChartConfiguration(); - cfg.setLegend(null).setHighlighter(h); - cfg.axesInstance().setXaxis(null); - /*cfg.axesInstance().xAxisInstance().setRenderer(JqPlotResources.AxisTickRenderer);*/ - cfg.axesInstance() - .yAxisInstance() - .setTicks(ticks) - .setRenderer(JqPlotResources.CategoryAxisRenderer); - return barChart; + + barChart.getSeriesDefaults() + .setRendererOptions(new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) + .setFill(false).setSliceMargin(4).setLineWidth(5).setBarDirection("horizontal")); + + Highlighter h = new Highlighter(); + h.setShow(true); + h.setFormatString("%s, %P"); + h.setTooltipLocation(Location.ne); + h.setShowTooltip(true); + h.setUseAxesFormatters(false); + + ChartConfiguration<Long> cfg = barChart.getChartConfiguration(); + cfg.setLegend(null).setHighlighter(h); + cfg.axesInstance().setXaxis(null); + /* + * cfg.axesInstance().xAxisInstance().setRenderer(JqPlotResources. + * AxisTickRenderer); + */ + cfg.axesInstance().yAxisInstance().setTicks(ticks).setRenderer(JqPlotResources.CategoryAxisRenderer); + return barChart; } - + private class PollSelectForm extends Form<RoomPoll> { private static final long serialVersionUID = 1L; private final DropDownChoice<RoomPoll> select; PollSelectForm(String id) { super(id); - add((select = new DropDownChoice<RoomPoll>("polls", Model.of((RoomPoll)null), new ArrayList<RoomPoll>(), new ChoiceRenderer<RoomPoll>() { + add((select = new DropDownChoice<>("polls", Model.of((RoomPoll)null), new ArrayList<RoomPoll>(), new ChoiceRenderer<RoomPoll>() { private static final long serialVersionUID = 1L; @Override @@ -303,7 +301,7 @@ public class PollResultsDialog extends A } public void updateModel(IPartialPageRequestHandler handler) { - List<RoomPoll> list = new ArrayList<RoomPoll>(); + List<RoomPoll> list = new ArrayList<>(); RoomPoll p = getBean(PollDao.class).getByRoom(roomId); if (p != null) { list.add(p); @@ -316,7 +314,7 @@ public class PollResultsDialog extends A } } } - + private class PollResultsForm extends Form<RoomPoll> { private static final long serialVersionUID = 1L; private final String SIMPLE_CHART = Application.getString(1414); @@ -324,7 +322,7 @@ public class PollResultsDialog extends A private final IModel<String> name = Model.of((String)null); private final IModel<String> question = Model.of((String)null); private final IModel<Integer> count = Model.of(0); - private final DropDownChoice<String> chartType = new DropDownChoice<String>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART)); + private final DropDownChoice<String> chartType = new DropDownChoice<>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART)); PollResultsForm(String id) { super(id, Model.of((RoomPoll)null)); @@ -342,7 +340,7 @@ public class PollResultsDialog extends A })); add(chartDiv.setOutputMarkupId(true)); } - + public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) { setModelObject(poll); name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator())); @@ -355,13 +353,13 @@ public class PollResultsDialog extends A redraw(handler); } } - + private void redraw(IPartialPageRequestHandler handler) { RoomPoll poll = getModelObject(); Chart<?> chart = SIMPLE_CHART.equals(chartType.getModelObject()) ? barChart(poll) : pieChart(poll); handler.appendJavaScript(getScript(chart)); } - + @Override protected void onDetach() { name.detach(); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Wed Mar 1 06:11:13 2017 @@ -54,7 +54,7 @@ import com.googlecode.wicket.kendo.ui.pa */ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> { private static final long serialVersionUID = 1L; - private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added + private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added private final PollAnswerForm form; private final DialogButton vote = new DialogButton("vote", Application.getString(32)); private final DialogButton cancel = new DialogButton("cancel", Application.getString(25)); @@ -63,13 +63,13 @@ public class VoteDialog extends Abstract public VoteDialog(String id) { super(id, Application.getString(18)); - add(form = new PollAnswerForm("form", new CompoundPropertyModel<RoomPollAnswer>(new RoomPollAnswer()))); + add(form = new PollAnswerForm("form", new CompoundPropertyModel<>(new RoomPollAnswer()))); } - + static String getName(User u) { return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname()); } - + public void updateModel(IPartialPageRequestHandler target, RoomPoll rp) { RoomPollAnswer a = new RoomPollAnswer(); a.setRoomPoll(rp); @@ -82,12 +82,12 @@ public class VoteDialog extends Abstract form.typeInt.setVisible(typeNum); target.add(form); } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(vote, cancel); } - + /* (non-Javadoc) * @see com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog#getSubmitButton() */ @@ -122,7 +122,7 @@ public class VoteDialog extends Abstract a.getRoomPoll().getAnswers().add(a); getBean(PollDao.class).update(a.getRoomPoll()); } - + @Override protected void onDetach() { user.detach(); @@ -139,9 +139,9 @@ public class VoteDialog extends Abstract add(new Label("user", user)); add(new Label("roomPoll.question")); add(typeBool.add(new RadioGroup<Boolean>("answer").setRequired(true) - .add(new Radio<Boolean>("true", Model.of(Boolean.TRUE))).add(new Radio<Boolean>("false", Model.of(Boolean.FALSE))) + .add(new Radio<>("true", Model.of(Boolean.TRUE))).add(new Radio<>("false", Model.of(Boolean.FALSE))) ).setOutputMarkupPlaceholderTag(true).setVisible(false)); - add(typeInt.add(new DropDownChoice<Integer>("pointList", answers).setRequired(true)) + add(typeInt.add(new DropDownChoice<>("pointList", answers).setRequired(true)) .setOutputMarkupPlaceholderTag(true).setVisible(false)); } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java Wed Mar 1 06:11:13 2017 @@ -36,10 +36,10 @@ import com.googlecode.wicket.jquery.ui.w public class AboutDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; - + public AboutDialog(String id) { super(id, Application.getString(1549)); - + add(new Label("name", getBean(ConfigurationDao.class).getAppName())); add(new Label("version", getVersion())); add(new Label("revision", getRevision())); @@ -48,7 +48,7 @@ public class AboutDialog extends Abstrac @Override protected List<DialogButton> getButtons() { - return new ArrayList<DialogButton>(); + return new ArrayList<>(); } @Override Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java Wed Mar 1 06:11:13 2017 @@ -43,10 +43,10 @@ public class InviteUserMessageDialog ext private static final long serialVersionUID = 1L; private final DialogButton send = new DialogButton("send", Application.getString(1139)); private final DialogButton cancel = new DialogButton("cancel", Application.getString(219)); - private final Form<Void> form = new Form<Void>("form"); + private final Form<Void> form = new Form<>("form"); private final TextArea<String> message = new TextArea<>("message", Model.of("")); private final CheckBox enterRoom = new CheckBox("enterRoom", Model.of(false)); - + public InviteUserMessageDialog(String id) { super(id, Application.getString(1138)); add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true)); @@ -60,12 +60,12 @@ public class InviteUserMessageDialog ext handler.add(form); open(handler); } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(send, cancel); } - + @Override public DialogButton getSubmitButton() { return send; @@ -79,12 +79,12 @@ public class InviteUserMessageDialog ext @Override protected void onError(AjaxRequestTarget target) { // TODO Auto-generated method stub - + } @Override protected void onSubmit(AjaxRequestTarget target) { // TODO Auto-generated method stub - + } } Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Wed Mar 1 06:11:13 2017 @@ -86,7 +86,7 @@ public class MessageDialog extends Abstr private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now())); private final DateTimePicker end = new OmDateTimePicker("end", Model.of(LocalDateTime.now())); private boolean isPrivate = false; - private final IModel<Collection<User>> modelTo = new CollectionModel<User>(new ArrayList<User>()); + private final IModel<Collection<User>> modelTo = new CollectionModel<>(new ArrayList<User>()); @Override public int getWidth() { @@ -131,7 +131,7 @@ public class MessageDialog extends Abstr public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) { super(id, Application.getString(1209), model); - form = new Form<PrivateMessage>("form", getModel()); + form = new Form<>("form", getModel()); form.add(feedback.setOutputMarkupId(true)); form.add(new UserMultiChoice("to", modelTo).setRequired(true)); Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.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> @@ -29,90 +29,90 @@ <li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li> </ul> <div id="tab1"> - <table> - <tr> - <td><wicket:message key="572" /></td> - <td><input type="text" wicket:id="title" /></td> - </tr> - <tr> - <td><wicket:message key="570" /></td> - <td><span class="date time picker" wicket:id="start"></span></td> - </tr> - <tr> - <td><wicket:message key="571" /></td> - <td><span class="date time picker" wicket:id="end"></span></td> - </tr> - <tr wicket:id="owner-row"> - <td><wicket:message key="1156" /></td> - <td><span wicket:id="aowner"></span></td> - </tr> - <tr> - <td><wicket:message key="803" /></td> - <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> - </tr> - <tr> - <td><wicket:message key="569" /></td> - <td><input type="text" wicket:id="location" /></td> - </tr> - <tr> - <td><wicket:message key="573" /></td> - <td> + <div class="table"> + <div> + <div class="column label"><wicket:message key="572" /></div> + <div class="column data"><input type="text" wicket:id="title" /></div> + </div> + <div> + <div class="column label"><wicket:message key="570" /></div> + <div class="column data"><span class="date time picker" wicket:id="start"></span></div> + </div> + <div> + <div class="column label"><wicket:message key="571" /></div> + <div class="column data"><span class="date time picker" wicket:id="end"></span></div> + </div> + <div wicket:id="owner-row"> + <div class="column label"><wicket:message key="1156" /></div> + <div class="column data"><span wicket:id="aowner"></span></div> + </div> + <div wicket:id="inviteeType"> + <div> + <div class="column label"><input type="radio" wicket:id="user"/><label wicket:for="user"><wicket:message key="803" /></label></div> + <div class="column data om-select2" wicket:message="title:1588"><select class="appointment attendees input" wicket:id="attendees"></select></div> + </div> + <div wicket:id="groupContainer"> + <div class="column label"><input type="radio" wicket:id="group"/><label wicket:for="group"><wicket:message key="126" /></label></div> + <div class="column data om-select2"><select wicket:id="groups" class="input invitees"></select></div> + </div> + </div> + <div> + <div class="column label"><wicket:message key="569" /></div> + <div class="column data"><input type="text" wicket:id="location" /></div> + </div> + <div> + <div class="column label"><wicket:message key="573" /></div> + <div class="column data"> <div wicket:id="toolbarContainer"></div> <div wicket:id="description"></div> - </td> - </tr> - <tr> - <td><wicket:message key="162" /></td> - <td><select wicket:id="calendar"></select></td> - </tr> - </table> + </div> + </div> + </div> </div> <div id="tab2"> - <table> - <tbody> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> - </tr> - </tbody> - <tbody wicket:id="create-room-block"> - <tr> - <td><wicket:message key="619" /></td> - <td><select wicket:id="type" ></select></td> - </tr> - <tr> - <td><label wicket:for="moderated"><wicket:message key="640" /></label></td> - <td><input type="checkbox" wicket:id="moderated" /></td> - </tr> - </tbody> - <tbody> - <tr> - <td><wicket:message key="436" /></td> - <td><select wicket:id="groom" ></select></td> - </tr> - <tr wicket:id="sip-container"> - <td><wicket:message key="1003"/></td> - <td><span wicket:id="room.confno"></span></td> - </tr> - </tbody> - </table> + <div class="table"> + <div> + <input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label> + </div> + <div wicket:id="create-room-block"> + <div> + <div class="column label"><wicket:message key="619" /></div> + <div class="column data"><select wicket:id="type" ></select></div> + </div> + <div> + <div class="column label"><label wicket:for="moderated"><wicket:message key="640" /></label></div> + <div class="column data"><input type="checkbox" wicket:id="moderated" /></div> + </div> + </div> + <div> + <div class="column label"><wicket:message key="436" /></div> + <div class="column data"><select wicket:id="groom" ></select></div> + </div> + <div wicket:id="sip-container"> + <div class="column label"><wicket:message key="1003"/></div> + <div class="column data"><span wicket:id="room.confno"></span></div> + </div> + </div> </div> <div id="tab3"> - <table> - <tr> - <td><wicket:message key="565" /></td> - <td><select wicket:id="reminder" ></select></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> - </tr> - <tr> - <td><wicket:message key="525" /></td> - <td><input type="password" wicket:id="password" /></td> - </tr> - <tr> - <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> - </tr> - </table> + <div class="table"> + <div> + <div class="column label"><wicket:message key="565" /></div> + <div class="column data"><select wicket:id="reminder" ></select></div> + </div> + <div> + <input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label> + </div> + <div> + <div class="column label"><wicket:message key="525" /></div> + <div class="column data"><input type="password" wicket:id="password" /></div> + </div> + <div><wicket:message key="1445" /></div> + <div> + <div class="column label"><wicket:message key="162" /></div> + <div class="column data"><select wicket:id="calendar"></select></div> + </div> + </div> </div> </div> </form>
