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 [6/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-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java Wed Mar 1 06:11:13 2017
@@ -63,7 +63,7 @@ import org.slf4j.Logger;
public class ScreenSharerFrame extends JFrame {
private static final long serialVersionUID = 1L;
private static final Logger logger = getLogger(ScreenSharerFrame.class);
-
+
private JPanel contentPane;
private JPanel panelScreen = new DisabledPanel();
private JPanel panelRecording = new DisabledPanel();
@@ -113,7 +113,7 @@ public class ScreenSharerFrame extends J
private String recordingTipLabel;
private String publishingTipLabel;
private JCheckBox audioNotify;
-
+
private class PublishTextField extends JTextField {
private static final long serialVersionUID = 1L;
@@ -139,23 +139,23 @@ public class ScreenSharerFrame extends J
setColumns(10);
}
}
-
+
private static class KeyValue<T> {
private String key;
private T value;
-
+
public KeyValue(String key, T value) {
this.key = key;
this.value = value;
}
-
+
@SuppressWarnings("unused")
public String getKey() { return key; }
public T getValue() { return value; }
-
+
@Override
public String toString() { return key; }
-
+
@Override
public boolean equals(Object obj) {
if (obj instanceof KeyValue) {
@@ -165,7 +165,7 @@ public class ScreenSharerFrame extends J
}
return false;
}
-
+
@Override
public int hashCode() {
int hash = 7;
@@ -173,7 +173,7 @@ public class ScreenSharerFrame extends J
return hash;
}
}
-
+
//this implementation will not allow to Enable Panel in runtime
private static class DisabledPanel extends JPanel {
private static final long serialVersionUID = 1L;
@@ -186,7 +186,7 @@ public class ScreenSharerFrame extends J
super.setEnabled(enabled);
}
}
-
+
private static class VerticalSlider extends MouseListenerable {
private static final long serialVersionUID = 1L;
@@ -202,7 +202,7 @@ public class ScreenSharerFrame extends J
add(jDown);
}
}
-
+
private static class HorizontalSlider extends MouseListenerable {
private static final long serialVersionUID = 1L;
@@ -218,15 +218,15 @@ public class ScreenSharerFrame extends J
add(jRight);
}
}
-
+
private static String getTextLabel(String[] textLabels, int idx) {
return textLabels != null && idx < textLabels.length ? textLabels[idx] : "#STAB#";
}
-
+
/**
* Create the frame.
- * @throws AWTException
- * @throws IOException
+ * @throws AWTException
+ * @throws IOException
*/
public ScreenSharerFrame(final Core core, String[] textLabels) throws AWTException {
setTitle(getTextLabel(textLabels, 0)); //#id 730
@@ -246,9 +246,9 @@ public class ScreenSharerFrame extends J
contentPane.setBackground(Color.WHITE);
contentPane.setBorder(new EmptyBorder(5, 0, 5, 5));
setContentPane(contentPane);
-
+
JLabel lblStartSharing = new JLabel(getTextLabel(textLabels, 1)); //#id 731
-
+
startSharingLabel = getTextLabel(textLabels, 2); //#id 732
stopSharingLabel = getTextLabel(textLabels, 3); //#id 733
startRecordingLabel = getTextLabel(textLabels, 15); //#id 871
@@ -287,7 +287,7 @@ public class ScreenSharerFrame extends J
}
}
});
-
+
JLabel lblSelectArea = new JLabel(getTextLabel(textLabels, 4)); //#id 734
JPanel panelStatus = new JPanel();
audioNotify = new JCheckBox(getTextLabel(textLabels, 36)); //#id 1589
@@ -299,7 +299,7 @@ public class ScreenSharerFrame extends J
core.setAudioNotify(audioNotify.isSelected());
}
});
-
+
GroupLayout gl_contentPane = new GroupLayout(contentPane);
gl_contentPane.setHorizontalGroup(
gl_contentPane.createParallelGroup(Alignment.LEADING)
@@ -349,10 +349,10 @@ public class ScreenSharerFrame extends J
);
panelScreen.setLayout(null);
panelScreen.setBackground(Color.WHITE);
-
+
int width = ScreenDimensions.width;
int height = ScreenDimensions.height;
-
+
//Sliders
upSlider.addListener(new ScreenYMouseListener(this));
upSlider.setToolTipText(getTextLabel(textLabels, 6)); //#id 737
@@ -360,14 +360,14 @@ public class ScreenSharerFrame extends J
downSlider.addListener(new ScreenHeightMouseListener(this));
downSlider.setToolTipText(getTextLabel(textLabels, 6)); //#id 737
panelScreen.add(downSlider);
-
+
leftSlider.addListener(new ScreenXMouseListener(this));
leftSlider.setToolTipText(getTextLabel(textLabels, 5)); //#id 735
panelScreen.add(leftSlider);
rightSlider.addListener(new ScreenWidthMouseListener(this));
rightSlider.setToolTipText(getTextLabel(textLabels, 5)); //#id 735
panelScreen.add(rightSlider);
-
+
//Virtual Screen
virtualScreen.addListener(new ScreenMouseListener(this));
virtualScreen.setBounds(vScreenX, vScreenY, width, height);
@@ -379,7 +379,7 @@ public class ScreenSharerFrame extends J
JLabel bgScreen = new JLabel(imgBgScreen);
bgScreen.setBounds(vScreenX, vScreenY, width, height);
panelScreen.add(bgScreen);
-
+
//Spinner Width
JLabel vscreenWidthLabel = new JLabel();
vscreenWidthLabel.setText(getTextLabel(textLabels, 9)); //#id 740
@@ -443,43 +443,43 @@ public class ScreenSharerFrame extends J
}
});
panelScreen.add(spinnerY);
-
+
//Quality
JLabel labelQuality = new JLabel();
labelQuality.setText(getTextLabel(textLabels, 18)); //#id 1089
labelQuality.setBounds(250, 140, 200, 24);
panelScreen.add(labelQuality);
-
- comboQuality = new JComboBox<KeyValue<ScreenQuality>>();
- comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 19), ScreenQuality.VeryHigh)); //#id 1090
- comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 20), ScreenQuality.High)); //#id 1091
- comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092
- comboQuality.addItem(new KeyValue<ScreenQuality>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093
+
+ comboQuality = new JComboBox<>();
+ comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 19), ScreenQuality.VeryHigh)); //#id 1090
+ comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 20), ScreenQuality.High)); //#id 1091
+ comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 21), ScreenQuality.Medium)); //#id 1092
+ comboQuality.addItem(new KeyValue<>(getTextLabel(textLabels, 22), ScreenQuality.Low)); //#id 1093
comboQuality.setBounds(250, 170, 130, 24);
comboQuality.addActionListener(new ActionListener() {
@Override
@SuppressWarnings("unchecked")
public void actionPerformed(ActionEvent e) {
- ScreenDimensions.quality = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue();
- calcRescaleFactors();
+ ScreenDimensions.quality = ((KeyValue<ScreenQuality>)comboQuality.getSelectedItem()).getValue();
+ calcRescaleFactors();
}
- });
+ });
comboQuality.setSelectedIndex(core.defaultQuality);
panelScreen.add(comboQuality);
- comboFPS = new JComboBox<KeyValue<Integer>>();
- comboFPS.addItem(new KeyValue<Integer>("2 FPS", 2));
- comboFPS.addItem(new KeyValue<Integer>("5 FPS", 5));
- comboFPS.addItem(new KeyValue<Integer>("10 FPS", 10));
- comboFPS.addItem(new KeyValue<Integer>("15 FPS", 15));
- comboFPS.addItem(new KeyValue<Integer>("20 FPS", 20));
- comboFPS.addItem(new KeyValue<Integer>("25 FPS", 25));
- comboFPS.addItem(new KeyValue<Integer>("30 FPS", 30));
+ comboFPS = new JComboBox<>();
+ comboFPS.addItem(new KeyValue<>("2 FPS", 2));
+ comboFPS.addItem(new KeyValue<>("5 FPS", 5));
+ comboFPS.addItem(new KeyValue<>("10 FPS", 10));
+ comboFPS.addItem(new KeyValue<>("15 FPS", 15));
+ comboFPS.addItem(new KeyValue<>("20 FPS", 20));
+ comboFPS.addItem(new KeyValue<>("25 FPS", 25));
+ comboFPS.addItem(new KeyValue<>("30 FPS", 30));
comboFPS.addActionListener(new ActionListener() {
@Override
@SuppressWarnings("unchecked")
public void actionPerformed(ActionEvent e) {
- ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue();
- calcRescaleFactors();
+ ScreenDimensions.FPS = ((KeyValue<Integer>)comboFPS.getSelectedItem()).getValue();
+ calcRescaleFactors();
}
});
boolean fpsSelected = false;
@@ -492,24 +492,24 @@ public class ScreenSharerFrame extends J
}
}
if (!fpsSelected) {
- comboFPS.addItem(new KeyValue<Integer>(core.defaultFPS + " FPS", core.defaultFPS));
+ comboFPS.addItem(new KeyValue<>(core.defaultFPS + " FPS", core.defaultFPS));
comboFPS.setSelectedIndex(comboFPS.getItemCount() - 1);
}
comboFPS.setBounds(390, 170, 70, 24);
comboFPS.setVisible(core.showFPS);
panelScreen.add(comboFPS);
-
+
panelRecording.setBackground(Color.WHITE);
tabbedPane.addTab(getTextLabel(textLabels, 13), null, panelRecording, null); //#id 869
tabbedPane.setEnabledAt(0, true);
panelRecording.setLayout(null);
panelRecording.setEnabled(false);
-
+
JLabel lblRecordingDesc = new JLabel("<html>" + getTextLabel(textLabels, 14) + "</html>"); //#id 870
lblRecordingDesc.setVerticalAlignment(SwingConstants.TOP);
lblRecordingDesc.setBounds(10, 10, 447, 60);
panelRecording.add(lblRecordingDesc);
-
+
btnStartStopRecording = new JButton(getTextLabel(textLabels, 15)); //#id 871
btnStartStopRecording.setToolTipText(getTextLabel(textLabels, 15)); //#id 871
btnStartStopRecording.setIcon(startIcon);
@@ -535,49 +535,49 @@ public class ScreenSharerFrame extends J
}
});
panelRecording.add(btnStartStopRecording);
-
+
panelPublish.setBackground(Color.WHITE);
tabbedPane.addTab(getTextLabel(textLabels, 23), null, panelPublish, null); //#id 1465
tabbedPane.setEnabledAt(1, true);
panelPublish.setEnabled(false);
panelPublish.setLayout(null);
-
+
JLabel lblPublishDesc = new JLabel(getTextLabel(textLabels, 33)); //#id 1475
lblPublishDesc.setVerticalAlignment(SwingConstants.TOP);
lblPublishDesc.setBounds(10, 5, 450, 20);
panelPublish.add(lblPublishDesc);
-
+
JLabel lblPublishHost = new JLabel(getTextLabel(textLabels, 26)); //#id 1468
lblPublishHost.setVerticalAlignment(SwingConstants.TOP);
lblPublishHost.setBounds(10, 27, 140, 20);
panelPublish.add(lblPublishHost);
-
+
JLabel lblPublishApp = new JLabel(getTextLabel(textLabels, 27)); //#id 1469
lblPublishApp.setVerticalAlignment(SwingConstants.TOP);
lblPublishApp.setBounds(160, 27, 140, 20);
panelPublish.add(lblPublishApp);
-
+
JLabel lblPublishId = new JLabel(getTextLabel(textLabels, 28)); //#id 1470
lblPublishId.setVerticalAlignment(SwingConstants.TOP);
lblPublishId.setBounds(310, 27, 140, 20);
panelPublish.add(lblPublishId);
-
+
textPublishHost = new PublishTextField();
textPublishHost.setBounds(10, 45, 140, 20);
panelPublish.add(textPublishHost);
-
+
textPublishApp = new PublishTextField();
textPublishApp.setBounds(160, 45, 140, 20);
panelPublish.add(textPublishApp);
-
+
textPublishId = new PublishTextField();
textPublishId.setBounds(310, 45, 140, 20);
panelPublish.add(textPublishId);
-
+
lblPublishURL = new JLabel("");
lblPublishURL.setBounds(10, 69, 447, 14);
panelPublish.add(lblPublishURL);
-
+
btnStartStopPublish = new JButton(getTextLabel(textLabels, 24)); //#id 1466
btnStartStopPublish.setToolTipText(getTextLabel(textLabels, 24)); //#id 1466
btnStartStopPublish.setIcon(startIcon);
@@ -603,12 +603,12 @@ public class ScreenSharerFrame extends J
}
});
panelPublish.add(btnStartStopPublish);
-
+
JPanel panelSecurity = new JPanel();
panelSecurity.setLayout(null);
panelSecurity.setBackground(Color.WHITE);
tabbedPane.addTab(getTextLabel(textLabels, 37), null, panelSecurity, null); //#id 1598
-
+
final JCheckBox remoteEnabled = new JCheckBox(getTextLabel(textLabels, 38)); //#id 1078
remoteEnabled.setBackground(Color.WHITE);
remoteEnabled.setSelected(core.isRemoteEnabled());
@@ -621,7 +621,7 @@ public class ScreenSharerFrame extends J
}
});
panelSecurity.add(remoteEnabled);
-
+
panelStatus.setBackground(SystemColor.control);
panelStatus.setLayout(null);
lblStatus.setHorizontalAlignment(SwingConstants.LEFT);
@@ -630,9 +630,9 @@ public class ScreenSharerFrame extends J
BorderFactory.createLineBorder(Color.LIGHT_GRAY),
BorderFactory.createEmptyBorder(0, 5, 0, 0)));
panelStatus.add(lblStatus);
-
+
contentPane.setLayout(gl_contentPane);
-
+
// Background Image
//We have no logo, that is why we need no background, sebawagner 29.04.2012
}
@@ -648,7 +648,7 @@ public class ScreenSharerFrame extends J
btnStartStopSharing.setText(status ? stopSharingLabel : startSharingLabel);
btnStartStopSharing.setToolTipText(status ? stopSharingLabel : startSharingLabel);
}
-
+
public void setRecordingStatus(boolean status, boolean unlockScreen) {
panelScreen.setEnabled(unlockScreen);
if (status != recordingStarted) {
@@ -660,7 +660,7 @@ public class ScreenSharerFrame extends J
btnStartStopRecording.setText(status ? stopRecordingLabel : startRecordingLabel);
btnStartStopRecording.setToolTipText(status ? stopRecordingLabel : startRecordingLabel);
}
-
+
public void setPublishingStatus(boolean status, boolean unlockScreen) {
panelScreen.setEnabled(unlockScreen);
if (status != publishStarted) {
@@ -671,44 +671,44 @@ public class ScreenSharerFrame extends J
btnStartStopPublish.setText(status ? stopPublishLabel : startPublishLabel);
btnStartStopPublish.setToolTipText(status ? stopPublishLabel : startPublishLabel);
}
-
+
public void setRecordingTabEnabled(boolean enabled) {
panelRecording.setEnabled(enabled);
tabbedPane.setEnabledAt(0, enabled);
tabbedPane.setToolTipTextAt(0, enabled ? null : recordingTipLabel);
}
-
+
public void setPublishingTabEnabled(boolean enabled) {
panelPublish.setEnabled(enabled);
tabbedPane.setEnabledAt(1, enabled);
tabbedPane.setToolTipTextAt(1, enabled ? null : publishingTipLabel);
}
-
+
public String getPublishHost() {
return textPublishHost.getText();
}
-
+
public String getPublishApp() {
return textPublishApp.getText();
}
-
+
public String getPublishId() {
return textPublishId.getText();
}
-
+
private void updatePublishURL() {
lblPublishURL.setText("rtmp://" + textPublishHost.getText() + ":1935/"
+ textPublishApp.getText() + "/" + textPublishId.getText());
}
-
+
public void setShowWarning(boolean showWarning) {
this.showWarning = showWarning;
}
-
+
public void setDoUpdateBounds(boolean doUpdateBounds) {
this.doUpdateBounds = doUpdateBounds;
}
-
+
public void setStatus(String status) {
lblStatus.setText(status);
}
@@ -846,11 +846,11 @@ public class ScreenSharerFrame extends J
rightSlider.setBounds(x + vScreenX + width - 16, y + vScreenY - 8 + (height / 2), 32, 16);
upSlider.setBounds(x + vScreenX + (width / 2) - 8, y + vScreenY - 16, 16, 32);
downSlider.setBounds(x + vScreenX + (width / 2) - 8, y + vScreenY - 16 + height, 16, 32);
-
+
virtualScreen.setText(ScreenDimensions.spinnerWidth + ":" + ScreenDimensions.spinnerHeight);
virtualScreen.setBounds(x + vScreenX, y + vScreenY, width, height);
}
-
+
/**
* update the bounds of the vScreen
* by using the vars from the Spinners
Modified: openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/job/RemoteJob.java Wed Mar 1 06:11:13 2017
@@ -57,7 +57,7 @@ public class RemoteJob implements Job {
private static final Logger log = getLogger(RemoteJob.class);
public static final String CORE_KEY = "core";
private Robot robot = null;
-
+
public RemoteJob() {
try {
robot = new Robot();
@@ -73,7 +73,7 @@ public class RemoteJob implements Job {
Core core = (Core)data.get(CORE_KEY);
try {
Map<String, Object> obj = null;
- while ((obj = core.getRemoteEvents().poll(1, TimeUnit.MILLISECONDS)) != null) {
+ while ((obj = core.getRemoteEvents().poll(1, TimeUnit.MILLISECONDS)) != null) {
String action = "" + obj.get("action");
log.trace("Action polled:: {}, count: {}", action, core.getRemoteEvents().size());
@@ -96,7 +96,7 @@ public class RemoteJob implements Job {
} else if (action.equals("copy")) {
String paste = getHighlightedText();
- Map<Integer, String> map = new HashMap<Integer, String>();
+ Map<Integer, String> map = new HashMap<>();
map.put(0, "copiedText");
map.put(1, paste);
@@ -106,7 +106,7 @@ public class RemoteJob implements Job {
} else if (action.equals("show")) {
String paste = getClipboardText();
- Map<Integer, String> map = new HashMap<Integer, String>();
+ Map<Integer, String> map = new HashMap<>();
map.put(0, "copiedText");
map.put(1, paste);
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/caldav/handler/EtagsHandler.java Wed Mar 1 06:11:13 2017
@@ -18,9 +18,17 @@
*/
package org.apache.openmeetings.service.calendar.caldav.handler;
-import net.fortuna.ical4j.data.CalendarOutputter;
-import net.fortuna.ical4j.model.Calendar;
-import net.fortuna.ical4j.model.Component;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT;
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpClient;
@@ -46,17 +54,9 @@ import org.osaf.caldav4j.util.UrlUtils;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_OK;
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_CREATED;
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_NO_CONTENT;
-import static org.apache.jackrabbit.webdav.DavServletResponse.SC_NOT_FOUND;
+import net.fortuna.ical4j.data.CalendarOutputter;
+import net.fortuna.ical4j.model.Calendar;
+import net.fortuna.ical4j.model.Component;
/**
* Class which handles the Syncing through the use of Etags.
@@ -86,7 +86,7 @@ public class EtagsHandler extends Abstra
CompFilter vcalendar = new CompFilter(Calendar.VCALENDAR);
vcalendar.addCompFilter(new CompFilter(Component.VEVENT));
-
+
CalDAVReportMethod reportMethod = null;
try {
CalendarQuery query = new CalendarQuery(properties, vcalendar, map.isEmpty() ? new CalendarData() : null, false, false);
@@ -96,7 +96,7 @@ public class EtagsHandler extends Abstra
MultiStatusResponse[] multiStatusResponses = reportMethod.getResponseBodyAsMultiStatus().getResponses();
if (map.isEmpty()) {
//Initializing the Calendar for the first time.
-
+
//Parse the responses into Appointments
for (MultiStatusResponse response : multiStatusResponses) {
if (response.getStatus()[0].getStatusCode() == SC_OK) {
@@ -104,13 +104,13 @@ public class EtagsHandler extends Abstra
Calendar ical = CalendarDataProperty.getCalendarfromResponse(response);
Appointment appointments = utils.parseCalendartoAppointment(
ical, response.getHref(), etag, calendar);
-
+
appointmentDao.update(appointments, ownerId);
}
}
} else {
//Calendar has been inited before
- List<String> currenthrefs = new ArrayList<String>();
+ List<String> currenthrefs = new ArrayList<>();
for (MultiStatusResponse response : multiStatusResponses) {
if (response.getStatus()[0].getStatusCode() == SC_OK) {
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java Wed Mar 1 06:11:13 2017
@@ -21,11 +21,12 @@ package org.apache.openmeetings.service.
import static org.apache.openmeetings.db.util.ApplicationHelper.ensureApplication;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
-import java.util.Vector;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.mail.MailHandler;
@@ -56,9 +57,9 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
/**
- *
+ *
* @author swagner
- *
+ *
*/
public class InvitationManager implements IInvitationManager {
private static final Logger log = Red5LoggerFactory.getLogger(InvitationManager.class, webAppRootKey);
@@ -74,12 +75,12 @@ public class InvitationManager implement
/**
* @author vasya
- *
+ *
* @param mm
* @param a
* @param message
* @param subject
- * @throws Exception
+ * @throws Exception
*/
private void sendInvitionLink(Appointment a, MeetingMember mm, MessageType type, boolean ical) throws Exception {
User owner = a.getOwner();
@@ -97,11 +98,10 @@ public class InvitationManager implement
default:
t = UpdatedAppointmentTemplate.get(mm.getUser(), a, tz, invitorName);
break;
-
}
sendInvitationLink(mm.getInvitation(), type, t.getSubject(), t.getEmail(), ical);
}
-
+
@Override
public void sendInvitationLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception {
String invitation_link = null;
@@ -110,12 +110,12 @@ public class InvitationManager implement
invitation_link = app.getOmInvitationLink(i);
}
User owner = i.getInvitedBy();
-
+
String invitorName = owner.getFirstname() + " " + owner.getLastname();
String template = InvitationTemplate.getEmail(i.getInvitee(), invitorName, message, invitation_link);
String email = i.getInvitee().getAddress().getEmail();
String replyToEmail = owner.getAddress().getEmail();
-
+
if (ical) {
String username = i.getInvitee().getLogin();
boolean isOwner = owner.getId().equals(i.getInvitee().getId());
@@ -123,7 +123,7 @@ public class InvitationManager implement
Map<String, String> attendeeList = handler.getAttendeeData(email, username, isOwner);
- Vector<Map<String, String>> atts = new Vector<Map<String, String>>();
+ List<Map<String, String>> atts = new ArrayList<>();
atts.add(attendeeList);
// Defining Organizer
@@ -152,7 +152,7 @@ public class InvitationManager implement
/**
* This method sends invitation reminder SMS
* @param phone user's phone
- * @param subject
+ * @param subject
* @return
*/
@Override
@@ -169,7 +169,7 @@ public class InvitationManager implement
}
/**
- *
+ *
* @param hashCode
* @param hidePass
* @return
@@ -209,7 +209,7 @@ public class InvitationManager implement
}
/**
- *
+ *
* @param hashCode
* @param pass
* @return
@@ -235,10 +235,10 @@ public class InvitationManager implement
}
return new Long(-1);
}
-
+
/**
* @author vasya
- *
+ *
* @param member
* @param a
*/
@@ -278,7 +278,7 @@ public class InvitationManager implement
, boolean isPasswordProtected, String invitationpass, Valid valid,
User createdBy, Long languageId, Date gmtTimeStart, Date gmtTimeEnd
, Appointment appointment) {
-
+
Invitation invitation = _invitation;
if (null == _invitation) {
invitation = new Invitation();
@@ -292,7 +292,7 @@ public class InvitationManager implement
invitation.setUsed(false);
invitation.setValid(valid);
-
+
// valid period of Invitation
switch (valid) {
case Period:
Modified: openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java (original)
+++ openmeetings/application/trunk/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java Wed Mar 1 06:11:13 2017
@@ -103,7 +103,7 @@ public class UserManager implements IUse
public SearchResult<User> getAllUserByRange(String search, int start, int max,
String orderby, boolean asc) {
try {
- SearchResult<User> sresult = new SearchResult<User>();
+ SearchResult<User> sresult = new SearchResult<>();
sresult.setObjectName(User.class.getName());
sresult.setRecords(userDao.count(search));
@@ -431,7 +431,7 @@ public class UserManager implements IUse
IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName);
scopeApplicationAdapter.roomLeaveByScope(rcl, currentScope, true);
- HashMap<Integer, String> messageObj = new HashMap<Integer, String>();
+ Map<Integer, String> messageObj = new HashMap<>();
messageObj.put(0, "kick");
scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope);
}
@@ -461,7 +461,7 @@ public class UserManager implements IUse
}
IScope currentScope = scopeApplicationAdapter.getRoomScope(scopeName);
- HashMap<Integer, String> messageObj = new HashMap<Integer, String>();
+ Map<Integer, String> messageObj = new HashMap<>();
messageObj.put(0, "kick");
scopeApplicationAdapter.sendMessageById(messageObj, rcl.getStreamid(), currentScope);
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/ImportHelper.java Wed Mar 1 06:11:13 2017
@@ -22,21 +22,21 @@ import java.util.LinkedHashMap;
import java.util.Map;
/**
- *
+ *
* Get some of the default values for the upload
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class ImportHelper {
/**
* returns a list of all timezones as a {@link Map}
- *
+ *
* @param tzList
* @return
*/
public static Map<String, String> getAllTimeZones(String ... tzList) {
- Map<String, String> result = new LinkedHashMap<String, String>();
+ Map<String, String> result = new LinkedHashMap<>();
for (String omTimeZone : tzList) {
result.put(omTimeZone, omTimeZone);
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/mail/IcalHandler.java Wed Mar 1 06:11:13 2017
@@ -25,9 +25,9 @@ import java.io.FileOutputStream;
import java.net.URI;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.UUID;
-import java.util.Vector;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -54,9 +54,9 @@ import net.fortuna.ical4j.model.property
import net.fortuna.ical4j.model.property.Version;
/**
- *
+ *
* @author o.becherer, seba.wagner
- *
+ *
*/
public class IcalHandler {
private static final Logger log = Red5LoggerFactory.getLogger(IcalHandler.class, webAppRootKey);
@@ -74,14 +74,14 @@ public class IcalHandler {
/**
* Constructor
- *
+ *
* @param method
* (@see IcalHandler Constants)
* @throws Exception
*/
public IcalHandler(Method method) {
log.debug("Icalhandler method type : " + method);
-
+
icsCalendar = new Calendar();
icsCalendar.getProperties().add(new ProdId("-//Events Calendar//iCal4j 1.0//EN"));
icsCalendar.getProperties().add(Version.VERSION_2_0);
@@ -90,7 +90,7 @@ public class IcalHandler {
}
/**
- *
+ *
* @param startDate
* use standard TimeZone!!
* @param endDate
@@ -110,12 +110,12 @@ public class IcalHandler {
*/
// ---------------------------------------------------------------------------------------
public String addNewMeeting(Date startDate, Date endDate, String name,
- Vector<Map<String, String>> attendees, String description,
+ List<Map<String, String>> attendees, String description,
Map<String, String> organizer, String uid, String javaTzId) throws Exception
{
TimeZoneRegistry registry = TimeZoneRegistryFactory.getInstance().createRegistry();
-
+
TimeZone timeZone = registry.getTimeZone(javaTzId);
if (timeZone == null) {
throw new Exception("Unable to get time zone by id provided: " + javaTzId);
@@ -125,7 +125,7 @@ public class IcalHandler {
start.setTimeZone(timeZone);
DateTime end = new DateTime(endDate);
end.setTimeZone(timeZone);
-
+
VEvent meeting = new VEvent(start, end, name);
meeting.getProperties().add(new Description(description));
@@ -169,7 +169,7 @@ public class IcalHandler {
* addMeetings Generate a Attendee
*/
public Map<String, String> getAttendeeData(String emailAdress, String displayName, boolean chair) {
- Map<String, String> oneRecord = new HashMap<String, String>();
+ Map<String, String> oneRecord = new HashMap<>();
oneRecord.put("uri", "mailto:" + emailAdress);
oneRecord.put("cn", displayName);
oneRecord.put("chair", chair ? "1" : "0");
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/message/RoomMessage.java Wed Mar 1 06:11:13 2017
@@ -18,13 +18,12 @@
*/
package org.apache.openmeetings.util.message;
-import java.io.Serializable;
import java.util.Date;
import java.util.UUID;
import org.apache.wicket.protocol.ws.api.message.IWebSocketPushMessage;
-public class RoomMessage implements IWebSocketPushMessage, Serializable {
+public class RoomMessage implements IWebSocketPushMessage {
private static final long serialVersionUID = 1L;
public enum Type {
roomEnter
Modified: openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java (original)
+++ openmeetings/application/trunk/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java Wed Mar 1 06:11:13 2017
@@ -39,11 +39,11 @@ public class ProcessHelper {
private static class Worker extends Thread {
private final Process process;
private Integer exitCode;
-
+
private Worker(Process process) {
this.process = process;
}
-
+
@Override
public void run() {
try {
@@ -58,13 +58,13 @@ public class ProcessHelper {
public StringBuilder output;
private final InputStream is;
private final BufferedReader br;
-
+
private StreamWatcher(Process process, boolean isError) throws UnsupportedEncodingException {
output = new StringBuilder();
is = isError ? process.getErrorStream() : process.getInputStream();
br = new BufferedReader(new InputStreamReader(is, UTF_8));
}
-
+
@Override
public void run() {
try {
@@ -85,14 +85,14 @@ public class ProcessHelper {
cmd[0] = "cmd.exe";
cmd[1] = "/C";
System.arraycopy(argv, 0, cmd, 2, argv.length);
- Map<String, String> env = new HashMap<String, String>();
+ Map<String, String> env = new HashMap<>();
return executeScript(process, cmd, env);
} catch (Exception t) {
log.error("executeScriptWindows", t);
return new ConverterProcessResult(process, t.getMessage(), t);
}
}
-
+
private static String getCommand(String[] argv) {
StringBuffer tString = new StringBuffer();
for (int i = 0; i < argv.length; i++) {
@@ -100,54 +100,54 @@ public class ProcessHelper {
}
return tString.toString();
}
-
+
private static void debugCommandStart(String desc, String[] argv) {
if (log.isDebugEnabled()) {
log.debug("START " + desc + " ################# ");
log.debug(getCommand(argv));
}
}
-
+
private static void debugCommandEnd(String desc) {
if (log.isDebugEnabled()) {
log.debug("END " + desc + " ################# ");
}
}
-
+
public static ConverterProcessResult executeScript(String process, String[] argv) {
- Map<String, String> env = new HashMap<String, String>();
+ Map<String, String> env = new HashMap<>();
return executeScript(process, argv, env);
}
-
+
public static ConverterProcessResult executeScript(String process, String[] argv, Map<? extends String, ? extends String> env) {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess(process);
debugCommandStart(process, argv);
-
+
try {
returnMap.setCommand(getCommand(argv));
returnMap.setOut("");
-
+
// By using the process Builder we have access to modify the
// environment variables
// that is handy to set variables to run it inside eclipse
ProcessBuilder pb = new ProcessBuilder(argv);
pb.environment().putAll(env);
-
+
Process proc = pb.start();
-
+
// 20-minute timeout for command execution
// FFMPEG conversion of Recordings may take a real long time until
// its finished
long timeout = 60000 * 20;
-
+
StreamWatcher errorWatcher = new StreamWatcher(proc, true);
Worker worker = new Worker(proc);
StreamWatcher inputWatcher = new StreamWatcher(proc, false);
errorWatcher.start();
inputWatcher.start();
worker.start();
-
+
try {
worker.join(timeout);
if (worker.exitCode != null) {
@@ -158,7 +158,7 @@ public class ProcessHelper {
returnMap.setException("timeOut");
returnMap.setError(errorWatcher.output.toString());
returnMap.setExitCode(-1);
-
+
throw new TimeoutException();
}
} catch (InterruptedException ex) {
@@ -166,22 +166,22 @@ public class ProcessHelper {
errorWatcher.interrupt();
inputWatcher.interrupt();
Thread.currentThread().interrupt();
-
+
returnMap.setError(ex.getMessage());
returnMap.setExitCode(-1);
-
+
throw ex;
} finally {
proc.destroy();
}
-
+
} catch (Throwable t) {
log.error("executeScript", t);
returnMap.setError(t.getMessage());
returnMap.setException(t.toString());
returnMap.setExitCode(-1);
}
-
+
debugCommandEnd(process);
return returnMap;
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminUserChoiceProvider.java Wed Mar 1 06:11:13 2017
@@ -26,8 +26,8 @@ import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.ChoiceProvider;
+import org.wicketstuff.select2.Response;
public abstract class AdminUserChoiceProvider extends ChoiceProvider<User> {
private static final long serialVersionUID = 1L;
@@ -47,10 +47,10 @@ public abstract class AdminUserChoicePro
@Override
public Collection<User> toChoices(Collection<String> _ids) {
- List<Long> ids = new ArrayList<Long>();
+ List<Long> ids = new ArrayList<>();
for (String id : _ids) {
ids.add(Long.valueOf(id));
}
- return new ArrayList<User>(getBean(UserDao.class).get(ids));
+ return new ArrayList<>(getBean(UserDao.class).get(ids));
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java Wed Mar 1 06:11:13 2017
@@ -158,7 +158,7 @@ public class BackupPanel extends AdminPa
}
}
});
- add((progressBar = new ProgressBar("dprogress", new Model<Integer>(0)) {
+ add((progressBar = new ProgressBar("dprogress", new Model<>(0)) {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Wed Mar 1 06:11:13 2017
@@ -44,9 +44,9 @@ import org.apache.wicket.validation.Vali
/**
* Handle {@link Configuration} items as list and form
- *
+ *
* @author swagner
- *
+ *
*/
public class ConfigForm extends AdminBaseForm<Configuration> {
private static final long serialVersionUID = 1L;
@@ -56,9 +56,9 @@ public class ConfigForm extends AdminBas
target.add(this);
target.appendJavaScript("omConfigPanelInit();");
}
-
+
public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) {
- super(id, new CompoundPropertyModel<Configuration>(configuration));
+ super(id, new CompoundPropertyModel<>(configuration));
setOutputMarkupId(true);
this.listContainer = listContainer;
add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString(267))).add(new IValidator<String>(){
@@ -76,12 +76,12 @@ public class ConfigForm extends AdminBas
add(forDatePattern("updated", WEB_DATE_PATTERN));
add(new Label("user.login"));
add(new TextArea<String>("comment"));
-
+
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
@@ -100,7 +100,7 @@ public class ConfigForm extends AdminBas
this.setModelObject(new Configuration());
refresh(target);
}
-
+
@Override
protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
Configuration conf = getModelObject();
@@ -112,7 +112,7 @@ public class ConfigForm extends AdminBas
setModelObject(conf);
refresh(target);
}
-
+
@Override
protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) {
getBean(ConfigurationDao.class).delete(getModelObject(), WebSession.getUserId());
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Wed Mar 1 06:11:13 2017
@@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater
/**
* add/update/delete {@link Configuration}
- *
+ *
* @author swagner
- *
+ *
*/
public class ConfigsPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
private ConfigForm form;
private final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -55,9 +55,9 @@ public class ConfigsPanel extends AdminP
public ConfigsPanel(String id) {
super(id);
-
+
SearchableDataView<Configuration> dataView = new SearchableDataView<Configuration>("configList"
- , new SearchableDataProvider<Configuration>(ConfigurationDao.class)) {
+ , new SearchableDataProvider<>(ConfigurationDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -89,16 +89,16 @@ public class ConfigsPanel extends AdminP
target.add(listContainer);
}
};
- DataViewContainer<Configuration> container = new DataViewContainer<Configuration>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Configuration>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Configuration>("orderByKey", "key", container))
- .addLink(new OmOrderByBorder<Configuration>("orderByValue", "value", container));
+ DataViewContainer<Configuration> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByKey", "key", container))
+ .addLink(new OmOrderByBorder<>("orderByValue", "value", container));
add(container.getLinks());
add(navigator);
-
+
form = new ConfigForm("form", listContainer, new Configuration());
form.showNewRecord();
add(form);
-
+
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Wed Mar 1 06:11:13 2017
@@ -59,7 +59,7 @@ public class ConnectionsPanel extends Ad
@Override
public Iterator<? extends Client> iterator(long first, long count) {
//FIXME add grouping by public SID
- List<Client> l = new ArrayList<Client>(getBean(ISessionManager.class).getClientsWithServer());
+ List<Client> l = new ArrayList<>(getBean(ISessionManager.class).getClientsWithServer());
return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator();
}
@@ -131,7 +131,7 @@ public class ConnectionsPanel extends Ad
@Override
public Iterator<? extends org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long count) {
- List<org.apache.openmeetings.db.entity.basic.Client> l = new ArrayList<org.apache.openmeetings.db.entity.basic.Client>(Application.getClients());
+ List<org.apache.openmeetings.db.entity.basic.Client> l = new ArrayList<>(Application.getClients());
return l.subList((int)Math.max(0, first), (int)Math.min(first + count, l.size())).iterator();
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/email/EmailPanel.java Wed Mar 1 06:11:13 2017
@@ -41,7 +41,7 @@ public class EmailPanel extends AdminPan
public EmailPanel(String id) {
super(id);
SearchableDataView<MailMessage> dataView = new SearchableDataView<MailMessage>("email",
- new SearchableDataProvider<MailMessage>(MailMessageDao.class))
+ new SearchableDataProvider<>(MailMessageDao.class))
{
private static final long serialVersionUID = 1L;
@@ -73,17 +73,17 @@ public class EmailPanel extends AdminPan
target.add(list);
}
};
- DataViewContainer<MailMessage> container = new DataViewContainer<MailMessage>(list, dataView, navigator);
- container.addLink(new OmOrderByBorder<MailMessage>("orderById", "id", container))
- .addLink(new OmOrderByBorder<MailMessage>("orderBySubject", "subject", container))
- .addLink(new OmOrderByBorder<MailMessage>("orderByStatus", "status", container));
+ DataViewContainer<MailMessage> container = new DataViewContainer<>(list, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderBySubject", "subject", container))
+ .addLink(new OmOrderByBorder<>("orderByStatus", "status", container));
add(container.getLinks());
add(navigator);
-
+
form = new EmailForm("form", list, new MailMessage());
add(form);
}
-
+
private StringBuilder getRowClass(final MailMessage m) {
StringBuilder sb = getRowClass(m.getId(), form.getModelObject().getId());
if (MailMessage.Status.ERROR == m.getStatus()) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java Wed Mar 1 06:11:13 2017
@@ -85,14 +85,14 @@ public class GroupForm extends AdminBase
}
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
- super(id, new CompoundPropertyModel<Group>(group));
+ super(id, new CompoundPropertyModel<>(group));
this.groupList = groupList;
setOutputMarkupId(true);
usersPanel = new GroupUsersPanel("users", getGroupId());
add(usersPanel);
- add(userToadd = new Select2Choice<User>("user2add", Model.of((User)null), new AdminUserChoiceProvider() {
+ add(userToadd = new Select2Choice<>("user2add", Model.of((User)null), new AdminUserChoiceProvider() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Wed Mar 1 06:11:13 2017
@@ -43,7 +43,7 @@ import org.apache.wicket.markup.repeater
public class GroupUsersPanel extends Panel {
private static final long serialVersionUID = 1L;
private long groupId;
- private List<GroupUser> users2add = new ArrayList<GroupUser>();
+ private List<GroupUser> users2add = new ArrayList<>();
public GroupUsersPanel(String id, long groupId) {
super(id);
@@ -147,7 +147,7 @@ public class GroupUsersPanel extends Pan
@Override
public java.util.Iterator<? extends GroupUser> iterator(long first, long count) {
- List<GroupUser> list = new ArrayList<GroupUser>();
+ List<GroupUser> list = new ArrayList<>();
list.addAll(users2add);
list.addAll(search == null && getSort() == null
? getDao().get(groupId, (int)first, (int)count)
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Wed Mar 1 06:11:13 2017
@@ -40,9 +40,9 @@ import org.apache.wicket.markup.repeater
/**
* Modify/ CRUD operations for {@link Group} and
* {@link GroupUser}
- *
+ *
* @author swagner
- *
+ *
*/
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
public class GroupsPanel extends AdminPanel {
@@ -65,7 +65,7 @@ public class GroupsPanel extends AdminPa
add(form);
//List view
- SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableGroupAdminDataProvider<Group>(GroupDao.class)) {
+ SearchableDataView<Group> dataView = new SearchableDataView<Group>("groupList", new SearchableGroupAdminDataProvider<>(GroupDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -99,9 +99,9 @@ public class GroupsPanel extends AdminPa
target.add(listContainer);
}
};
- DataViewContainer<Group> container = new DataViewContainer<Group>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Group>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Group>("orderByName", "name", container));
+ DataViewContainer<Group> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container));
add(container.getLinks());
add(navigator);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java Wed Mar 1 06:11:13 2017
@@ -45,7 +45,7 @@ public class AddLanguageDialog extends A
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final DialogButton add = new DialogButton("add", Application.getString(366L));
private final Form<Void> form = new Form<>("addLangForm");
- private final RequiredTextField<String> iso = new RequiredTextField<String>("iso", Model.of(""));
+ private final RequiredTextField<String> iso = new RequiredTextField<>("iso", Model.of(""));
private final LangPanel langPanel;
public AddLanguageDialog(String id, final LangPanel langPanel) {
@@ -73,7 +73,7 @@ public class AddLanguageDialog extends A
}
});
}
-
+
@Override
public Form<?> getForm() {
return form;
@@ -83,7 +83,7 @@ public class AddLanguageDialog extends A
protected List<DialogButton> getButtons() {
return Arrays.asList(add);
}
-
+
@Override
public DialogButton getSubmitButton() {
return add;
@@ -95,7 +95,7 @@ public class AddLanguageDialog extends A
handler.add(iso);
super.onOpen(handler);
}
-
+
@Override
protected void onError(AjaxRequestTarget target) {
target.add(feedback);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java Wed Mar 1 06:11:13 2017
@@ -32,9 +32,9 @@ import org.apache.wicket.model.CompoundP
/**
* Add/edit/delete {@link StringLabel}
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class LabelsForm extends AdminBaseForm<StringLabel> {
private static final long serialVersionUID = 1L;
@@ -42,11 +42,11 @@ public class LabelsForm extends AdminBas
private String key, value;
public LabelsForm(String id, LangPanel panel, StringLabel label) {
- super(id, new CompoundPropertyModel<StringLabel>(label));
+ super(id, new CompoundPropertyModel<>(label));
this.panel = panel;
key = label.getKey();
value = label.getValue();
-
+
add(new RequiredTextField<String>("key"));
add(new TextArea<String>("value"));
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangForm.java Wed Mar 1 06:11:13 2017
@@ -37,22 +37,22 @@ import org.apache.wicket.util.time.Durat
/**
* Modify the language selection, add/delete language
- *
+ *
* @author solomax, swagner
- *
+ *
*/
public class LangForm extends Form<Void> {
private static final long serialVersionUID = 1L;
private DropDownChoice<Map.Entry<Long, Locale>> languages;
static List<Map.Entry<Long, Locale>> getLanguages() {
- List<Map.Entry<Long, Locale>> list = new ArrayList<Map.Entry<Long, Locale>>();
+ List<Map.Entry<Long, Locale>> list = new ArrayList<>();
for (Map.Entry<Long, Locale> e : LabelDao.languages.entrySet()) {
- list.add(new AbstractMap.SimpleEntry<Long,Locale>(e.getKey(), e.getValue()));
+ list.add(new AbstractMap.SimpleEntry<>(e.getKey(), e.getValue()));
}
return list;
}
-
+
public void updateLanguages(AjaxRequestTarget target) {
languages.setChoices(getLanguages());
target.add(languages);
@@ -60,7 +60,7 @@ public class LangForm extends Form<Void>
/**
* Render Main
- *
+ *
* @param id
* @param listContainer
* @param language
@@ -70,7 +70,7 @@ public class LangForm extends Form<Void>
super(id);
setOutputMarkupId(true);
- languages = new DropDownChoice<Map.Entry<Long, Locale>>("language"
+ languages = new DropDownChoice<>("language"
, new PropertyModel<Map.Entry<Long, Locale>>(langPanel, "language")
, getLanguages()
, new ChoiceRenderer<Map.Entry<Long, Locale>>() {
@@ -86,7 +86,7 @@ public class LangForm extends Form<Void>
return "" + object.getKey();
}
});
-
+
languages.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Wed Mar 1 06:11:13 2017
@@ -90,7 +90,7 @@ public class LangPanel extends AdminPane
// Create feedback panels
add(feedback.setOutputMarkupId(true));
- language = new AbstractMap.SimpleEntry<Long, Locale>(1L, Locale.ENGLISH);
+ language = new AbstractMap.SimpleEntry<>(1L, Locale.ENGLISH);
final LabelsForm form = new LabelsForm("form", this, new StringLabel(null, null));
form.showNewRecord();
@@ -148,10 +148,10 @@ public class LangPanel extends AdminPane
target.add(listContainer);
}
};
- DataViewContainer<StringLabel> container = new DataViewContainer<StringLabel>(listContainer, dataView, navigator);
+ DataViewContainer<StringLabel> container = new DataViewContainer<>(listContainer, dataView, navigator);
container
- .addLink(new OmOrderByBorder<StringLabel>("orderByName", "key", container))
- .addLink(new OmOrderByBorder<StringLabel>("orderByValue", "value", container));
+ .addLink(new OmOrderByBorder<>("orderByName", "key", container))
+ .addLink(new OmOrderByBorder<>("orderByValue", "value", container));
add(container.getLinks());
add(navigator);
langForm = new LangForm("langForm", listContainer, this);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Wed Mar 1 06:11:13 2017
@@ -19,8 +19,8 @@
package org.apache.openmeetings.web.admin.ldaps;
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
-import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.wicket.datetime.markup.html.basic.DateLabel.forDatePattern;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
@@ -42,19 +42,19 @@ import org.apache.wicket.util.time.Durat
/**
* Form components to insert/update/delete {@link LdapConfig}
- *
+ *
* @author swagner
- *
+ *
*/
public class LdapForm extends AdminBaseForm<LdapConfig> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer listContainer;
public LdapForm(String id, WebMarkupContainer listContainer, final LdapConfig ldapConfig) {
- super(id, new CompoundPropertyModel<LdapConfig>(ldapConfig));
+ super(id, new CompoundPropertyModel<>(ldapConfig));
setOutputMarkupId(true);
this.listContainer = listContainer;
-
+
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1108))));
add(new CheckBox("active"));
add(forDatePattern("inserted", WEB_DATE_PATTERN));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Wed Mar 1 06:11:13 2017
@@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater
/**
* {@link AdminPanel} to list and modify {@link LdapConfig}
- *
+ *
* @author swagner
- *
+ *
*/
public class LdapsPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -56,7 +56,7 @@ public class LdapsPanel extends AdminPan
public LdapsPanel(String id) {
super(id);
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
- , new SearchableDataProvider<LdapConfig>(LdapConfigDao.class)) {
+ , new SearchableDataProvider<>(LdapConfigDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -88,13 +88,13 @@ public class LdapsPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<LdapConfig> container = new DataViewContainer<LdapConfig>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<LdapConfig>("orderById", "id", container))
- .addLink(new OmOrderByBorder<LdapConfig>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<LdapConfig>("orderByFile", "configFileName", container));
+ DataViewContainer<LdapConfig> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByFile", "configFileName", container));
add(container.getLinks());
add(navigator);
-
+
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java Wed Mar 1 06:11:13 2017
@@ -46,31 +46,31 @@ public class OAuthForm extends AdminBase
private TextField<String> redirectUriText;
public OAuthForm(String id, WebMarkupContainer listContainer, OAuthServer server) {
- super(id, new CompoundPropertyModel<OAuthServer>(server));
+ super(id, new CompoundPropertyModel<>(server));
this.listContainer = listContainer;
setOutputMarkupId(true);
-
+
add(new CheckBox("isEnabled"));
add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1573))));
add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString(1575))));
add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString(1576))));
add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString(1577))));
- add(redirectUriText = (TextField<String>) new TextField<String>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587))));
+ add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString(1587))));
add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString(1578))));
add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString(1579))));
add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString(1586))));
add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString(1580))));
- add(new DropDownChoice<RequestMethod>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
+ add(new DropDownChoice<>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString(1582))));
add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString(1583))));
add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString(1584))));
add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString(1585))));
-
+
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
add(new AjaxFormValidatingBehavior("keydown", Duration.ONE_SECOND));
}
-
+
@Override
protected void onModelChanged() {
super.onModelChanged();
@@ -121,24 +121,24 @@ public class OAuthForm extends AdminBase
@Override
protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
-
+
@Override
protected void onDeleteError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
@Override
protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
- }
-
+
+ }
+
@Override
protected void onNewError(AjaxRequestTarget target, Form<?> form) {
// TODO Auto-generated method stub
-
+
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Wed Mar 1 06:11:13 2017
@@ -41,7 +41,7 @@ public class OAuthPanel extends AdminPan
public OAuthPanel(String id) {
super(id);
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
- new SearchableDataProvider<OAuthServer>(OAuth2Dao.class))
+ new SearchableDataProvider<>(OAuth2Dao.class))
{
private static final long serialVersionUID = 1L;
@@ -63,9 +63,9 @@ public class OAuthPanel extends AdminPan
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
}
-
+
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@@ -75,12 +75,12 @@ public class OAuthPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<OAuthServer> container = new DataViewContainer<OAuthServer>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<OAuthServer>("orderById", "id", container))
- .addLink(new OmOrderByBorder<OAuthServer>("orderByName", "name", container));
+ DataViewContainer<OAuthServer> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container));
add(container.getLinks());
add(navigator);
-
+
form = new OAuthForm("form", listContainer, new OAuthServer());
form.showNewRecord();
add(form);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Wed Mar 1 06:11:13 2017
@@ -107,7 +107,7 @@ public class RoomForm extends AdminBaseF
private IModel<User> moderator2add = Model.of((User)null);
public RoomForm(String id, WebMarkupContainer roomList, final Room room) {
- super(id, new CompoundPropertyModel<Room>(room));
+ super(id, new CompoundPropertyModel<>(room));
this.roomList = roomList;
setOutputMarkupId(true);
}
@@ -115,11 +115,11 @@ public class RoomForm extends AdminBaseF
@Override
protected void onInitialize() {
super.onInitialize();
- RequiredTextField<String> name = new RequiredTextField<String>("name");
- name.setLabel(new Model<String>(Application.getString(193)));
+ RequiredTextField<String> name = new RequiredTextField<>("name");
+ name.setLabel(new Model<>(Application.getString(193)));
add(name);
- add(new DropDownChoice<Long>("numberOfPartizipants", //
+ add(new DropDownChoice<>("numberOfPartizipants", //
DROPDOWN_NUMBER_OF_PARTICIPANTS, //
new ChoiceRenderer<Long>() {
private static final long serialVersionUID = 1L;
@@ -144,11 +144,11 @@ public class RoomForm extends AdminBaseF
List<Group> orgList = isGroupAdmin
? getBean(GroupDao.class).get(null, getUserId(), 0, Integer.MAX_VALUE, null)
: getBean(GroupDao.class).get(0, Integer.MAX_VALUE);
- final List<RoomGroup> orgRooms = new ArrayList<RoomGroup>(orgList.size());
+ final List<RoomGroup> orgRooms = new ArrayList<>(orgList.size());
for (Group org : orgList) {
orgRooms.add(new RoomGroup(org, getModelObject()));
}
- add(new Select2MultiChoice<RoomGroup>("roomGroups", null, new ChoiceProvider<RoomGroup>() {
+ add(new Select2MultiChoice<>("roomGroups", null, new ChoiceProvider<RoomGroup>() {
private static final long serialVersionUID = 1L;
@Override
@@ -174,11 +174,11 @@ public class RoomForm extends AdminBaseF
@Override
public Collection<RoomGroup> toChoices(Collection<String> _ids) {
- List<Long> ids = new ArrayList<Long>();
+ List<Long> ids = new ArrayList<>();
for (String id : _ids) {
ids.add(Long.valueOf(id));
}
- List<RoomGroup> list = new ArrayList<RoomGroup>();
+ List<RoomGroup> list = new ArrayList<>();
for (Group o : getBean(GroupDao.class).get(ids)) {
list.add(new RoomGroup(o, RoomForm.this.getModelObject()));
}
@@ -187,8 +187,8 @@ public class RoomForm extends AdminBaseF
}).setLabel(Model.of(getString("828"))).setRequired(isGroupAdmin));
add(new CheckBox("isDemoRoom"));
- TextField<Integer> demoTime = new TextField<Integer>("demoTime");
- demoTime.setLabel(new Model<String>(Application.getString(637)));
+ TextField<Integer> demoTime = new TextField<>("demoTime");
+ demoTime.setLabel(new Model<>(Application.getString(637)));
add(demoTime);
add(new CheckBox("allowUserQuestions"));
add(new CheckBox("audioOnly"));
@@ -198,7 +198,7 @@ public class RoomForm extends AdminBaseF
add(new CheckBox("allowRecording"));
add(new CheckBox("chatModerated"));
- add(new Select2MultiChoice<RoomElement>("hiddenElements", null, new ChoiceProvider<RoomElement>() {
+ add(new Select2MultiChoice<>("hiddenElements", null, new ChoiceProvider<RoomElement>() {
private static final long serialVersionUID = 1L;
@Override
@@ -237,7 +237,7 @@ public class RoomForm extends AdminBaseF
add(clientsContainer.add(clients.setOutputMarkupId(true)).setOutputMarkupId(true));
// Moderators
- final Select2Choice<User> moderatorChoice = new Select2Choice<User>("moderator2add", moderator2add, new AdminUserChoiceProvider() {
+ final Select2Choice<User> moderatorChoice = new Select2Choice<>("moderator2add", moderator2add, new AdminUserChoiceProvider() {
private static final long serialVersionUID = 1L;
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Wed Mar 1 06:11:13 2017
@@ -47,7 +47,7 @@ public class RoomsPanel extends AdminPan
private final static JavaScriptResourceReference ROOM_FUNCTIONS = new JavaScriptResourceReference(RoomsPanel.class, "room.js");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -57,7 +57,7 @@ public class RoomsPanel extends AdminPan
public RoomsPanel(String id) {
super(id);
- SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableGroupAdminDataProvider<Room>(RoomDao.class)) {
+ SearchableDataView<Room> dataView = new SearchableDataView<Room>("roomList", new SearchableGroupAdminDataProvider<>(RoomDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -82,7 +82,7 @@ public class RoomsPanel extends AdminPan
item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
}
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
@@ -92,16 +92,16 @@ public class RoomsPanel extends AdminPan
target.add(listContainer);
}
};
- DataViewContainer<Room> container = new DataViewContainer<Room>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Room>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Room>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<Room>("orderByPublic", "ispublic", container));
+ DataViewContainer<Room> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByPublic", "ispublic", container));
add(container.getLinks());
add(navigator);
add(form = new RoomForm("form", listContainer, new Room()));
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Wed Mar 1 06:11:13 2017
@@ -41,16 +41,16 @@ import org.apache.wicket.util.time.Durat
/**
* Form component to insert/update/delete {@link Server}
- *
+ *
* @author swagner
- *
+ *
*/
public class ServerForm extends AdminBaseForm<Server> {
private final WebMarkupContainer listContainer;
private static final long serialVersionUID = 1L;
public ServerForm(String id, WebMarkupContainer listContainer, final Server server) {
- super(id, new CompoundPropertyModel<Server>(server));
+ super(id, new CompoundPropertyModel<>(server));
setOutputMarkupId(true);
this.listContainer = listContainer;
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Wed Mar 1 06:11:13 2017
@@ -37,15 +37,15 @@ import org.apache.wicket.markup.repeater
/**
* Form component with list and form to manipulate {@link Server}
- *
+ *
* @author swagner
- *
+ *
*/
public class ServersPanel extends AdminPanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private ServerForm form;
-
+
@Override
public BasePanel onMenuPanelLoad(IPartialPageRequestHandler handler) {
super.onMenuPanelLoad(handler);
@@ -56,7 +56,7 @@ public class ServersPanel extends AdminP
public ServersPanel(String id) {
super(id);
SearchableDataView<Server> dataView = new SearchableDataView<Server>("serverList",
- new SearchableDataProvider<Server>(ServerDao.class)) {
+ new SearchableDataProvider<>(ServerDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -79,7 +79,7 @@ public class ServersPanel extends AdminP
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
}
};
-
+
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 1L;
@@ -89,16 +89,16 @@ public class ServersPanel extends AdminP
target.add(listContainer);
}
};
- DataViewContainer<Server> container = new DataViewContainer<Server>(listContainer, dataView, navigator);
- container.addLink(new OmOrderByBorder<Server>("orderById", "id", container))
- .addLink(new OmOrderByBorder<Server>("orderByName", "name", container))
- .addLink(new OmOrderByBorder<Server>("orderByAddress", "address", container));
+ DataViewContainer<Server> container = new DataViewContainer<>(listContainer, dataView, navigator);
+ container.addLink(new OmOrderByBorder<>("orderById", "id", container))
+ .addLink(new OmOrderByBorder<>("orderByName", "name", container))
+ .addLink(new OmOrderByBorder<>("orderByAddress", "address", container));
add(container.getLinks());
add(navigator);
-
+
form = new ServerForm("form", listContainer, new Server());
form.showNewRecord();
add(form);
-
+
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Wed Mar 1 06:11:13 2017
@@ -86,12 +86,12 @@ public class UserForm extends AdminBaseF
private final WebMarkupContainer listContainer;
private final WebMarkupContainer domain = new WebMarkupContainer("domain");
private GeneralUserForm generalForm;
- private final RequiredTextField<String> login = new RequiredTextField<String>("login");
+ private final RequiredTextField<String> login = new RequiredTextField<>("login");
private final MessageDialog warning;
- private final DropDownChoice<Long> domainId = new DropDownChoice<Long>("domainId");
+ private final DropDownChoice<Long> domainId = new DropDownChoice<>("domainId");
public UserForm(String id, WebMarkupContainer listContainer, final User user, MessageDialog warning) {
- super(id, new CompoundPropertyModel<User>(user));
+ super(id, new CompoundPropertyModel<>(user));
setOutputMarkupId(true);
this.listContainer = listContainer;
this.warning = warning;
@@ -176,7 +176,7 @@ public class UserForm extends AdminBaseF
add(generalForm = new GeneralUserForm("general", getModel(), true));
- add(new DropDownChoice<Type>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
+ add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@Override
@@ -192,7 +192,7 @@ public class UserForm extends AdminBaseF
add(new CheckBox("forceTimeZoneCheck"));
- add(new Select2MultiChoice<Right>("rights", null, new ChoiceProvider<Right>() {
+ add(new Select2MultiChoice<>("rights", null, new ChoiceProvider<Right>() {
private static final long serialVersionUID = 1L;
@Override
@@ -235,8 +235,8 @@ public class UserForm extends AdminBaseF
public void updateDomain(AjaxRequestTarget target) {
User u = getModelObject();
- final Map<Long, String> values = new Hashtable<Long, String>();
- List<Long> ids = new ArrayList<Long>();
+ final Map<Long, String> values = new Hashtable<>();
+ List<Long> ids = new ArrayList<>();
if (u.getType() == Type.ldap) {
for (LdapConfig c : getBean(LdapConfigDao.class).getActive()) {
ids.add(c.getId());