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 [8/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/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Wed Mar 1 06:11:13 2017
@@ -27,7 +27,6 @@ import static org.apache.openmeetings.we
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
@@ -41,18 +40,22 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.db.entity.calendar.MeetingMember;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.db.entity.room.Room;
+import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.common.GroupChoiceProvider;
import org.apache.openmeetings.web.common.OmDateTimePicker;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -63,6 +66,8 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.CompoundPropertyModel;
@@ -73,6 +78,7 @@ import org.apache.wicket.model.PropertyM
import org.apache.wicket.model.util.CollectionModel;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import org.wicketstuff.select2.Select2MultiChoice;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
@@ -100,8 +106,17 @@ public class AppointmentDialog extends A
private final CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
- private IModel<Collection<User>> attendeesModel = new CollectionModel<User>(new ArrayList<User>());
private final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container");
+ //FIXME TODO need to be unified with RoomInvitationForm
+ private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user));
+ private final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups"
+ , new CollectionModel<Group>(new ArrayList<>())
+ , new GroupChoiceProvider());
+ private final UserMultiChoice attendees = new UserMultiChoice("attendees", new CollectionModel<User>(new ArrayList<>()));
+ private enum InviteeType {
+ user
+ , group
+ }
@Override
public int getWidth() {
@@ -201,27 +216,27 @@ public class AppointmentDialog extends A
protected void onSubmit(AjaxRequestTarget target) {
Appointment a = form.getModelObject();
a.setRoom(form.createRoom ? form.appRoom : form.groom.getModelObject());
- final List<MeetingMember> attendees = a.getMeetingMembers() == null ? new ArrayList<MeetingMember>() : a.getMeetingMembers();
- Set<Long> currentIds = new HashSet<Long>();
- for (User u : attendeesModel.getObject()) {
+ final List<MeetingMember> mms = a.getMeetingMembers() == null ? new ArrayList<>() : a.getMeetingMembers();
+ Set<Long> currentIds = new HashSet<>();
+ for (User u : attendees.getModelObject()) {
if (u.getId() != null) {
currentIds.add(u.getId());
}
}
//remove users
- for (Iterator<MeetingMember> i = attendees.iterator(); i.hasNext();) {
+ for (Iterator<MeetingMember> i = mms.iterator(); i.hasNext();) {
MeetingMember m = i.next();
if (!currentIds.contains(m.getUser().getId())) {
i.remove();
}
}
- Set<Long> originalIds = new HashSet<Long>();
- for (MeetingMember m : attendees) {
+ Set<Long> originalIds = new HashSet<>();
+ for (MeetingMember m : mms) {
originalIds.add(m.getUser().getId());
}
//add users
- for (User u : attendeesModel.getObject()) {
+ for (User u : attendees.getModelObject()) {
if (u.getId() == null || !originalIds.contains(u.getId())) {
MeetingMember mm = new MeetingMember();
mm.setUser(u);
@@ -229,10 +244,10 @@ public class AppointmentDialog extends A
mm.setInserted(a.getInserted());
mm.setUpdated(a.getUpdated());
mm.setAppointment(a);
- attendees.add(mm);
+ mms.add(mm);
}
}
- a.setMeetingMembers(attendees);
+ a.setMeetingMembers(mms);
a.setStart(getDate(form.start.getModelObject()));
a.setEnd(getDate(form.end.getModelObject()));
a.setCalendar(form.cals.getModelObject());
@@ -248,12 +263,6 @@ public class AppointmentDialog extends A
return object.getOwner() != null && getUserId().equals(object.getOwner().getId());
}
- @Override
- protected void onDetach() {
- attendeesModel.detach();
- super.onDetach();
- }
-
private class AppointmentForm extends Form<Appointment> {
private static final long serialVersionUID = 1L;
private boolean createRoom = true;
@@ -263,9 +272,9 @@ public class AppointmentDialog extends A
private final PasswordTextField pwd = new PasswordTextField("password");
private final Label owner = new Label("aowner", Model.of(""));
private final WebMarkupContainer ownerPanel = new WebMarkupContainer("owner-row");
- private final WebMarkupContainer createRoomBlock = new WebMarkupContainer("create-room-block", new CompoundPropertyModel<Room>(appRoom));
+ private final WebMarkupContainer createRoomBlock = new WebMarkupContainer("create-room-block", new CompoundPropertyModel<>(appRoom));
private final DropDownChoice<Room.Type> roomType = new RoomTypeDropDown("type");
- private final DropDownChoice<Room> groom = new DropDownChoice<Room>(
+ private final DropDownChoice<Room> groom = new DropDownChoice<>(
"groom"
, Model.of(new Room())
, getRoomList()
@@ -282,6 +291,7 @@ public class AppointmentDialog extends A
},
new ChoiceRenderer<OmCalendar>("title", "id")
);
+ private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer");
private Room createAppRoom() {
Room r = new Room();
@@ -328,10 +338,10 @@ public class AppointmentDialog extends A
cals.setEnabled(false);
}
- attendeesModel.setObject(new ArrayList<User>());
+ attendees.setModelObject(new ArrayList<>());
if (a.getMeetingMembers() != null) {
for (MeetingMember mm : a.getMeetingMembers()) {
- attendeesModel.getObject().add(mm.getUser());
+ attendees.getModelObject().add(mm.getUser());
}
}
pwd.setEnabled(a.isPasswordProtected());
@@ -348,7 +358,42 @@ public class AppointmentDialog extends A
add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572))));
add(start.setRequired(true), end.setRequired(true));
add(ownerPanel.add(owner));
- add(new UserMultiChoice("attendees", attendeesModel));
+ boolean showGroups = false;//AuthLevelUtil.hasAdminLevel(getRights());
+ add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ boolean groupsEnabled = InviteeType.group == rdi.getModelObject();
+ target.add(groups.setEnabled(groupsEnabled), attendees.setEnabled(!groupsEnabled));
+ }
+ }));
+ groupContainer.add(
+ groups.setLabel(Model.of(Application.getString(126))).setOutputMarkupId(true)
+ , new Radio<>("group", Model.of(InviteeType.group))
+ );
+ if (showGroups) {
+ groups.add(new AjaxFormComponentUpdatingBehavior("change") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ // added to update model
+ }
+ }).setEnabled(false);
+ }
+ rdi.add(attendees.add(new AjaxFormComponentUpdatingBehavior("change") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ // added to update model
+ }
+ })
+ , groupContainer.setVisible(showGroups)
+ );
+ rdi.add(new Radio<>("user", Model.of(InviteeType.user)));
+
add(new TextField<String>("location"));
DefaultWysiwygToolbar toolbar = new DefaultWysiwygToolbar("toolbarContainer");
add(toolbar);
@@ -370,7 +415,7 @@ public class AppointmentDialog extends A
sipContainer.add(new Label("room.confno", "")).setVisible(false);
//Advanced
- add(new DropDownChoice<Reminder>(
+ add(new DropDownChoice<>(
"reminder"
, Arrays.asList(Reminder.values())
, new IChoiceRenderer<Reminder>() {
@@ -414,7 +459,7 @@ public class AppointmentDialog extends A
private List<Room> getRoomList() {
//FIXME need to be reviewed
- List<Room> result = new ArrayList<Room>();
+ List<Room> result = new ArrayList<>();
RoomDao dao = getBean(RoomDao.class);
result.addAll(dao.getPublicRooms());
for (GroupUser ou : getBean(UserDao.class).get(getUserId()).getGroupUsers()) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java Wed Mar 1 06:11:13 2017
@@ -42,7 +42,7 @@ public class AppointmentModel extends Ca
@Override
protected List<? extends CalendarEvent> load() {
- List<CalendarEvent> list = new ArrayList<CalendarEvent>();
+ List<CalendarEvent> list = new ArrayList<>();
for (Appointment a : getBean(AppointmentDao.class).getInRange(getUserId(), getDate(getStart()), getDate(getEnd()))) {
list.add(new OmCalendarEvent(a));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java Wed Mar 1 06:11:13 2017
@@ -141,11 +141,11 @@ public class CalendarPanel extends UserP
public CalendarPanel(String id) {
super(id);
- final Form<Date> form = new Form<Date>("form");
+ final Form<Date> form = new Form<>("form");
add(form);
dialog = new AppointmentDialog("appointment", Application.getString(815)
- , this, new CompoundPropertyModel<Appointment>(getDefault()));
+ , this, new CompoundPropertyModel<>(getDefault()));
add(dialog);
boolean isRtl = isRtl();
@@ -299,7 +299,7 @@ public class CalendarPanel extends UserP
add(syncTimer);
calendarDialog = new CalendarDialog("calendarDialog", Application.getString("calendar.dialogTitle"),
- this, new CompoundPropertyModel<OmCalendar>(getDefaultCalendar()));
+ this, new CompoundPropertyModel<>(getDefaultCalendar()));
add(calendarDialog);
@@ -312,7 +312,7 @@ public class CalendarPanel extends UserP
protected List<OmCalendar> load() {
// TODO: better way to do this?
AppointmentManager manager = getAppointmentManager();
- List<OmCalendar> cals = new ArrayList<OmCalendar>(manager.getCalendars(getUserId()));
+ List<OmCalendar> cals = new ArrayList<>(manager.getCalendars(getUserId()));
cals.addAll(manager.getGoogleCalendars(getUserId()));
return cals;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java Wed Mar 1 06:11:13 2017
@@ -160,7 +160,7 @@ public class Chat extends Panel {
ChatDao dao = getBean(ChatDao.class);
//FIXME limited count should be loaded with "earlier" link
- List<ChatMessage> list = new ArrayList<ChatMessage>(dao.getGlobal(0, 30));
+ List<ChatMessage> list = new ArrayList<>(dao.getGlobal(0, 30));
for(Long roomId : getUserRooms(getUserId())) {
Room r = getBean(RoomDao.class).get(roomId);
list.addAll(dao.getRoom(roomId, 0, 30, !r.isChatModerated() || isModerator(getUserId(), roomId)));
@@ -177,7 +177,7 @@ public class Chat extends Panel {
private static final long serialVersionUID = 1L;
private final ChatToolbar toolbar = new ChatToolbar("toolbarContainer");
private final WysiwygEditor chatMessage = new WysiwygEditor("chatMessage", Model.of(""), toolbar);
- private final HiddenField<String> activeTab = new HiddenField<String>("activeTab", Model.of(""));
+ private final HiddenField<String> activeTab = new HiddenField<>("activeTab", Model.of(""));
ChatForm(String id) {
super(id);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java Wed Mar 1 06:11:13 2017
@@ -22,7 +22,6 @@ import org.apache.openmeetings.db.util.F
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserPanel;
import org.apache.wicket.model.Model;
-import org.wicketstuff.dashboard.Dashboard;
import org.wicketstuff.dashboard.web.DashboardPanel;
public class OmDashboardPanel extends UserPanel {
@@ -32,6 +31,6 @@ public class OmDashboardPanel extends Us
super(id);
boolean isRtl = FormatHelper.isRtlLanguage(WebSession.get().getLocale().toLanguageTag());
- add(new DashboardPanel("dashboard", new Model<Dashboard>(WebSession.getDashboard())).setRtlModel(Model.of(isRtl)));
+ add(new DashboardPanel("dashboard", Model.of(WebSession.getDashboard())).setRtlModel(Model.of(isRtl)));
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java Wed Mar 1 06:11:13 2017
@@ -28,12 +28,12 @@ public class CleanupUnitPanel extends Pa
private final String lbl;
public CleanupUnitPanel(String id, final String lbl, CleanupUnit u) {
- super(id, new CompoundPropertyModel<CleanupUnit>(u));
+ super(id, new CompoundPropertyModel<>(u));
this.lbl = lbl;
add(new Label("humanTotal"));
setRenderBodyOnly(true);
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java Wed Mar 1 06:11:13 2017
@@ -97,7 +97,7 @@ public class MessagesContactsPanel exten
private final Label pendingContacts = new Label("pendingContacts", Model.of(0L));
private final Label allContacts = new Label("allContacts", Model.of(0L));
private final IModel<Long> selectedFolderModel = Model.of(INBOX_FOLDER_ID);
- private final IModel<List<PrivateMessageFolder>> foldersModel = new ListModel<PrivateMessageFolder>(null);
+ private final IModel<List<PrivateMessageFolder>> foldersModel = new ListModel<>(null);
private final WebMarkupContainer inbox = new WebMarkupContainer("inbox");
private final WebMarkupContainer sent = new WebMarkupContainer("sent");
private final WebMarkupContainer trash = new WebMarkupContainer("trash");
@@ -106,16 +106,16 @@ public class MessagesContactsPanel exten
private final WebMarkupContainer buttons = new WebMarkupContainer("buttons");
private final WebMarkupContainer contacts = new WebMarkupContainer("contacts");
private final DataViewContainer<PrivateMessage> dataContainer;
- private final Set<Long> selectedMessages = new HashSet<Long>();
- private final Set<Long> allMessages = new HashSet<Long>();
- private final Set<Long> readMessages = new HashSet<Long>();
- private final Set<Long> unreadMessages = new HashSet<Long>();
+ private final Set<Long> selectedMessages = new HashSet<>();
+ private final Set<Long> allMessages = new HashSet<>();
+ private final Set<Long> readMessages = new HashSet<>();
+ private final Set<Long> unreadMessages = new HashSet<>();
private final Button toInboxBtn = new Button("toInboxBtn");
private final Button deleteBtn = new Button("deleteBtn");
private final Button readBtn = new Button("readBtn");
private final Button unreadBtn = new Button("unreadBtn");
private final FixedHeaderTableBehavior fixedTable = new FixedHeaderTableBehavior("#messagesTable", new Options("height", 100));
- private final DropDownChoice<Integer> selectDropDown = new DropDownChoice<Integer>(
+ private final DropDownChoice<Integer> selectDropDown = new DropDownChoice<>(
"msgSelect", Model.of(SELECT_CHOOSE)
, Arrays.asList(SELECT_CHOOSE, SELECT_ALL, SELECT_NONE, SELECT_UNREAD, SELECT_READ)
, new ChoiceRenderer<Integer>() {
@@ -132,7 +132,7 @@ public class MessagesContactsPanel exten
}
});
private PrivateMessageFolder NOT_MOVE_FOLDER = new PrivateMessageFolder();
- private final DropDownChoice<PrivateMessageFolder> moveDropDown = new DropDownChoice<PrivateMessageFolder>("msgMove", Model.of(NOT_MOVE_FOLDER)
+ private final DropDownChoice<PrivateMessageFolder> moveDropDown = new DropDownChoice<>("msgMove", Model.of(NOT_MOVE_FOLDER)
, Arrays.asList(NOT_MOVE_FOLDER)
, new ChoiceRenderer<PrivateMessageFolder>() {
private static final long serialVersionUID = 1L;
@@ -245,7 +245,7 @@ public class MessagesContactsPanel exten
}
private void updateMoveModel() {
- List<PrivateMessageFolder> list = new ArrayList<PrivateMessageFolder>();
+ List<PrivateMessageFolder> list = new ArrayList<>();
list.add(NOT_MOVE_FOLDER);
list.addAll(foldersModel.getObject());
moveDropDown.setChoices(list);
@@ -423,11 +423,11 @@ public class MessagesContactsPanel exten
target.add(container);
}
};
- dataContainer = new DataViewContainer<PrivateMessage>(container, dv, navigator);
- dataContainer.addLink(new OmOrderByBorder<PrivateMessage>("orderById", "id", dataContainer))
- .addLink(new OmOrderByBorder<PrivateMessage>("orderByFrom", "from.lastname", dataContainer))
- .addLink(new OmOrderByBorder<PrivateMessage>("orderBySubject", "subject", dataContainer))
- .addLink(new OmOrderByBorder<PrivateMessage>("orderBySend", "inserted", dataContainer));
+ dataContainer = new DataViewContainer<>(container, dv, navigator);
+ dataContainer.addLink(new OmOrderByBorder<>("orderById", "id", dataContainer))
+ .addLink(new OmOrderByBorder<>("orderByFrom", "from.lastname", dataContainer))
+ .addLink(new OmOrderByBorder<>("orderBySubject", "subject", dataContainer))
+ .addLink(new OmOrderByBorder<>("orderBySend", "inserted", dataContainer));
add(dataContainer.getLinks());
add(navigator);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Wed Mar 1 06:11:13 2017
@@ -43,7 +43,7 @@ public class ProfileForm extends Form<Us
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public ProfileForm(String id) {
- super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
+ super(id, new CompoundPropertyModel<>(getBean(UserDao.class).get(getUserId())));
add(feedback.setOutputMarkupId(true));
add(new FormSaveRefreshPanel<User>("buttons", this) {
@@ -89,7 +89,7 @@ public class ProfileForm extends Form<Us
add(userForm = new UserForm("general", getModel()));
add(new UploadableProfileImagePanel("img", getUserId()));
add(new ComunityUserForm("comunity", getModel()));
-
+
// 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));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java Wed Mar 1 06:11:13 2017
@@ -47,8 +47,8 @@ public class SettingsPanel extends UserP
public SettingsPanel(String id, int active) {
super(id);
-
- List<ITab> tabs = new ArrayList<ITab>();
+
+ List<ITab> tabs = new ArrayList<>();
tabs.add(new AjaxTab(Model.of(Application.getString(1170))) {
private static final long serialVersionUID = 1L;
UserProfilePanel profilePanel = null;
@@ -61,7 +61,7 @@ public class SettingsPanel extends UserP
}
return profilePanel;
}
-
+
@Override
public boolean load(AjaxRequestTarget target) {
if (profilePanel != null) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java Wed Mar 1 06:11:13 2017
@@ -39,9 +39,9 @@ public class UserProfilePanel extends Us
private final Label addressDenied = new Label("addressDenied", "");
public UserProfilePanel(String id, long userId) {
- this(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(userId)));
+ this(id, new CompoundPropertyModel<>(getBean(UserDao.class).get(userId)));
}
-
+
public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
super(id, model);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java Wed Mar 1 06:11:13 2017
@@ -74,9 +74,9 @@ public class UserSearchPanel extends Use
add(new Form<Void>("form") {
private static final long serialVersionUID = 1L;
{
- add(new TextField<String>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
- add(new TextField<String>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
- add(new TextField<String>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
+ add(new TextField<>("text", new PropertyModel<String>(UserSearchPanel.this, "text")));
+ add(new TextField<>("offer", new PropertyModel<String>(UserSearchPanel.this, "offer")));
+ add(new TextField<>("search", new PropertyModel<String>(UserSearchPanel.this, "search")));
add(new AjaxButton("submit") {
private static final long serialVersionUID = 1L;
@@ -108,7 +108,7 @@ public class UserSearchPanel extends Use
@Override
public IModel<User> model(User object) {
- return new CompoundPropertyModel<User>(object);
+ return new CompoundPropertyModel<>(object);
}
};
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Wed Mar 1 06:11:13 2017
@@ -55,7 +55,7 @@ import com.googlecode.wicket.jquery.ui.w
public class VideoInfo extends Panel {
private static final long serialVersionUID = 1L;
- private final Form<Void> form = new Form<Void>("form");
+ private final Form<Void> form = new Form<>("form");
private final AjaxSplitButton downloadBtn = new AjaxSplitButton("downloadBtn", new ArrayList<IMenuItem>());
private final AjaxButton reConvert = new AjaxButton("re-convert") {
private static final long serialVersionUID = 1L;
@@ -77,7 +77,7 @@ public class VideoInfo extends Panel {
}
};
private final AjaxDownload download = new AjaxDownload();
- private final IModel<Recording> rm = new CompoundPropertyModel<Recording>(new Recording());
+ private final IModel<Recording> rm = new CompoundPropertyModel<>(new Recording());
private final IModel<String> roomName = Model.of((String)null);
private boolean isInterview = false;
private final InvitationDialog invite;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java Wed Mar 1 06:11:13 2017
@@ -52,14 +52,14 @@ public class RoomListPanel extends UserP
WebMarkupContainer roomContainer;
item.add((roomContainer = new WebMarkupContainer("roomContainer")).add(new AjaxEventBehavior("click"){
private static final long serialVersionUID = 1L;
-
+
@Override
protected void onEvent(AjaxRequestTarget target) {
onContainerClick(target, r);
}
}));
roomContainer.add(new Label("roomName", r.getName()));
- final Label curUsers = new Label("curUsers", new Model<Integer>(Application.getRoomClients(r.getId()).size()));
+ final Label curUsers = new Label("curUsers", new Model<>(Application.getRoomClients(r.getId()).size()));
roomContainer.add(curUsers.setOutputMarkupId(true));
roomContainer.add(new Label("totalUsers", r.getNumberOfPartizipants()));
item.add(new Button("btn").add(new Label("label", label)).add(new RoomEnterBehavior(r.getId()) {
@@ -82,7 +82,7 @@ public class RoomListPanel extends UserP
}
});
}
-
+
public void update(IPartialPageRequestHandler handler, List<Room> rooms) {
list.setList(rooms);
handler.add(this);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Wed Mar 1 06:11:13 2017
@@ -41,7 +41,7 @@ import org.wicketstuff.select2.Response;
public class UserChoiceProvider extends ChoiceProvider<User> {
private static final long serialVersionUID = 1L;
private final static int PAGE_SIZE = 10;
- private Map<String, User> newContacts = new Hashtable<String, User>();
+ private Map<String, User> newContacts = new Hashtable<>();
public static User getUser(String value) {
User u = null;
@@ -70,7 +70,7 @@ public class UserChoiceProvider extends
} else {
email = value;
}
- Validatable<String> valEmail = new Validatable<String>(email);
+ Validatable<String> valEmail = new Validatable<>(email);
RfcCompliantEmailAddressValidator.getInstance().validate(valEmail);
if (valEmail.isValid()) {
u = getBean(UserDao.class).getContact(email, fName, lName, getUserId());
Modified: openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java Wed Mar 1 06:11:13 2017
@@ -23,12 +23,13 @@ import static org.apache.openmeetings.ut
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.net.URI;
+import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.Vector;
import javax.activation.DataHandler;
import javax.mail.BodyPart;
@@ -78,7 +79,7 @@ public class TestSendIcalMessage extends
String recipients = "seba.wagner@gmail.com";
String htmlBody = "test";
-
+
public void simpleInvitionIcalLink() {
// Create a TimeZone
TimeZoneRegistry registry = TimeZoneRegistryFactory.getInstance().createRegistry();
@@ -138,28 +139,27 @@ public class TestSendIcalMessage extends
// Add the event and print
icsCalendar.getComponents().add(meeting);
-
+
Organizer orger = new Organizer(URI.create("seba.wagner@gmail.com"));
orger.getParameters().add(new Cn("Sebastian Wagner"));
meeting.getProperties().add(orger);
-
+
icsCalendar.getProperties().add(Method.REQUEST);
-
+
log.debug(icsCalendar.toString());
-
+
ByteArrayOutputStream bout = new ByteArrayOutputStream();
CalendarOutputter outputter = new CalendarOutputter();
try {
outputter.output(icsCalendar, bout);
iCalMimeBody = bout.toByteArray();
-
+
sendIcalMessage();
} catch (Exception e) {
log.error("Error", e);
}
}
-
@Test
public void sendInvitionIcalLink() {
try {
@@ -176,7 +176,7 @@ public class TestSendIcalMessage extends
Map<String, String> attendeeList = handler.getAttendeeData(email, username, invitor);
Map<String, String> organizerAttendee = handler.getAttendeeData(recipients, "seba-test", true);
- Vector<Map<String, String>> atts = new Vector<Map<String, String>>();
+ List<Map<String, String>> atts = new ArrayList<>();
atts.add(attendeeList);
// Create ICal Message
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java Wed Mar 1 06:11:13 2017
@@ -60,12 +60,12 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
/**
- *
+ *
* The Service contains methods to login and create hash to directly enter
* conference rooms, recordings or the application in general
- *
+ *
* @author sebawagner
- *
+ *
*/
@WebService(serviceName="org.apache.openmeetings.webservice.GroupWebService", targetNamespace = TNS)
@Features(features = "org.apache.cxf.feature.LoggingFeature")
@@ -87,7 +87,7 @@ public class GroupWebService {
/**
* add a new group
- *
+ *
* @param sid
* The SID from getSession
* @param name
@@ -109,10 +109,10 @@ public class GroupWebService {
return new ServiceResult(-26L, "Insufficient permissions", Type.ERROR);
}
}
-
+
/**
* Get the list of all groups
- *
+ *
* @param sid
* The SID from getSession
* @return list of all groups
@@ -129,11 +129,11 @@ public class GroupWebService {
throw new ServiceException("Insufficient permissions"); //TODO code -26
}
}
-
+
/**
- *
+ *
* Add user to a certain group
- *
+ *
* @param sid
* The SID from getSession
* @param userid
@@ -170,9 +170,9 @@ public class GroupWebService {
}
/**
- *
+ *
* Remove user from a certain group
- *
+ *
* @param sid
* The SID from getSession
* @param userid
@@ -215,11 +215,11 @@ public class GroupWebService {
/**
* Adds a room to an group
- *
+ *
* @param sid - The SID of the User. This SID must be marked as Loggedin
* @param id - Id of group that the room is being paired with
* @param roomid - Id of room to be added
- *
+ *
* @return Id of the relation created, null or -1 in case of the error
*/
@POST
@@ -263,7 +263,7 @@ public class GroupWebService {
/**
* Search users and return them
- *
+ *
* @param sid
* The SID from getSession
* @param id
@@ -291,7 +291,7 @@ public class GroupWebService {
{
try {
Sessiondata sd = sessionDao.check(sid);
- SearchResult<User> result = new SearchResult<User>();
+ SearchResult<User> result = new SearchResult<>();
result.setObjectName(User.class.getName());
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) {
result.setRecords(groupUserDao.count(id));
@@ -312,12 +312,12 @@ public class GroupWebService {
/**
* Deletes a group
- *
+ *
* @param sid
* The SID of the User. This SID must be marked as Loggedin
* @param id
* the id of the group
- *
+ *
* @throws {@link ServiceException} in case of any error
*/
@WebMethod
Modified: openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original)
+++ openmeetings/application/trunk/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java Wed Mar 1 06:11:13 2017
@@ -421,7 +421,7 @@ public class RoomWebService {
@GET
@Path("/counters")
public List<RoomCountBean> counters(@WebParam(name="sid") @QueryParam("sid") String sid, @WebParam(name="id") @QueryParam("id") List<Long> ids) throws ServiceException {
- List<RoomCountBean> roomBeans = new ArrayList<RoomCountBean>();
+ List<RoomCountBean> roomBeans = new ArrayList<>();
try {
Sessiondata sd = sessionDao.check(sid);
if (AuthLevelUtil.hasWebServiceLevel(userDao.getRights(sd.getUserId()))) {