Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.html Wed Mar 1 06:11:13 2017 @@ -7,16 +7,16 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:extend>
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java Wed Mar 1 06:11:13 2017 @@ -58,8 +58,8 @@ public class RoomInvitationForm extends private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user)); private final Long roomId; private final WebMarkupContainer groupContainer = new WebMarkupContainer("groupContainer"); - final Select2MultiChoice<Group> groups = new Select2MultiChoice<Group>("groups" - , new CollectionModel<Group>(new ArrayList<Group>()) + final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups" + , new CollectionModel<>(new ArrayList<Group>()) , new GroupChoiceProvider()); final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container"); @@ -85,17 +85,17 @@ public class RoomInvitationForm extends groupContainer.add( groups.setLabel(Model.of(Application.getString(126))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") { private static final long serialVersionUID = 1L; - + @Override protected void onUpdate(AjaxRequestTarget target) { url.setModelObject(null); updateButtons(target); } }).setOutputMarkupId(true) - , new Radio<InviteeType>("group", Model.of(InviteeType.group)) + , new Radio<>("group", Model.of(InviteeType.group)) ); rdi.add(recipients, groupContainer.setVisible(showGroups)); - rdi.add(new Radio<InviteeType>("user", Model.of(InviteeType.user))); + rdi.add(new Radio<>("user", Model.of(InviteeType.user))); add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true)); sipContainer.add(new Label("room.confno", "")).setVisible(false); } @@ -110,7 +110,7 @@ public class RoomInvitationForm extends dialog.generate.setEnabled(false, target); } } - + @Override public void updateModel(AjaxRequestTarget target) { super.updateModel(target); Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java Wed Mar 1 06:11:13 2017 @@ -56,7 +56,7 @@ public class CreatePollDialog extends Ab private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true)); public CreatePollDialog(String id, Long roomId) { - super(id, Application.getString(18), new CompoundPropertyModel<RoomPoll>(new RoomPoll())); + super(id, Application.getString(18), new CompoundPropertyModel<>(new RoomPoll())); this.roomId = roomId; add(form = new PollForm("form", getModel())); } @@ -106,7 +106,7 @@ public class CreatePollDialog extends Ab super(id, model); add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString(1410)))); add(new TextArea<String>("question")); - add(new DropDownChoice<RoomPoll.Type>("type", Arrays.asList(RoomPoll.Type.values()) + add(new DropDownChoice<>("type", Arrays.asList(RoomPoll.Type.values()) , new ChoiceRenderer<RoomPoll.Type>() { private static final long serialVersionUID = 1L; Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java Wed Mar 1 06:11:13 2017 @@ -46,6 +46,12 @@ import org.wicketstuff.jqplot.behavior.J import org.wicketstuff.jqplot.behavior.JqPlotCssResourceReference; import org.wicketstuff.jqplot.behavior.JqPlotJavascriptResourceReference; +import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; +import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; +import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; + import br.com.digilabs.jqplot.Chart; import br.com.digilabs.jqplot.ChartConfiguration; import br.com.digilabs.jqplot.JqPlotResources; @@ -56,12 +62,6 @@ import br.com.digilabs.jqplot.elements.H import br.com.digilabs.jqplot.elements.Location; import br.com.digilabs.jqplot.elements.RendererOptions; -import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons; -import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon; -import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog; - /** * @author solomax * @@ -122,12 +122,12 @@ public class PollResultsDialog extends A public int getWidth() { return 500; } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(delete, close, cancel); } - + public void updateModel(AjaxRequestTarget target, boolean moderator) { selForm.updateModel(target); this.moderator = moderator; @@ -137,7 +137,7 @@ public class PollResultsDialog extends A builder.append("$('#").append(PollResultsDialog.this.getMarkupId()).append("').on('dialogopen', function( event, ui ) {"); builder.append(getScript(barChart(p))); builder.append("});"); - + target.appendJavaScript(builder.toString()); } @@ -151,13 +151,13 @@ public class PollResultsDialog extends A builder.append(");"); return builder; } - + @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render(JavaScriptHeaderItem.forReference(JqPlotJavascriptResourceReference.get())); response.render(CssHeaderItem.forReference(JqPlotCssResourceReference.get())); - Chart<?> c1 = new PieChart<Number>(null); + Chart<?> c1 = new PieChart<>(null); c1.getChartConfiguration().setHighlighter(new Highlighter()); for (Chart<?> chart : new Chart<?>[]{c1, new BarChart<Integer>(null)}) { for (String resource : JqPlotUtils.retriveJavaScriptResources(chart)) { @@ -165,42 +165,41 @@ public class PollResultsDialog extends A } } } - - private static String removeMinified(String name_) { - String name = name_; - int idxOfExtension = name.lastIndexOf('.'); - if (idxOfExtension > -1) { - String extension = name.substring(idxOfExtension); - name = name.substring(0, name.length() - extension.length() + 1); - if (name.endsWith(".min.")) - { - name = name.substring(0, name.length() - 5) + extension; - } - } - return name; - } - - @Override - public void onClick(AjaxRequestTarget target, DialogButton button) { - if (close.equals(button)) { - closeConfirm.open(target); - } else if (delete.equals(button)) { - deleteConfirm.open(target); - } else { - super.onClick(target, button); - } - } - - @Override - public void onClose(IPartialPageRequestHandler handler, DialogButton button) { - } - - private static String[] getTicks(RoomPoll p) { + + private static String removeMinified(String name_) { + String name = name_; + int idxOfExtension = name.lastIndexOf('.'); + if (idxOfExtension > -1) { + String extension = name.substring(idxOfExtension); + name = name.substring(0, name.length() - extension.length() + 1); + if (name.endsWith(".min.")) { + name = name.substring(0, name.length() - 5) + extension; + } + } + return name; + } + + @Override + public void onClick(AjaxRequestTarget target, DialogButton button) { + if (close.equals(button)) { + closeConfirm.open(target); + } else if (delete.equals(button)) { + deleteConfirm.open(target); + } else { + super.onClick(target, button); + } + } + + @Override + public void onClose(IPartialPageRequestHandler handler, DialogButton button) { + } + + private static String[] getTicks(RoomPoll p) { return p != null && RoomPoll.Type.numeric == p.getType() ? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"} : new String[] {Application.getString(34), Application.getString(35)}; - } - + } + private static Integer[] initValues(int size) { Integer[] values = new Integer[size]; for (int i = 0; i < size; ++i) { @@ -208,7 +207,7 @@ public class PollResultsDialog extends A } return values; } - + private static Integer[] getValues(RoomPoll p) { Integer[] values = initValues(p != null && RoomPoll.Type.numeric == p.getType() ? 10 : 2); if (p != null && RoomPoll.Type.numeric == p.getType()) { @@ -222,64 +221,63 @@ public class PollResultsDialog extends A } return values; } - + private static PieChart<Integer> pieChart(RoomPoll p) { - PieChart<Integer> pieChart = new PieChart<Integer>(null); + PieChart<Integer> pieChart = new PieChart<>(null); String[] ticks = getTicks(p); Integer[] values = getValues(p); - for (int i = 0; i < values.length; ++i) { - pieChart.addValue(ticks[i], values[i]); - } - - pieChart.getSeriesDefaults().setRendererOptions( - new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) - .setFill(false).setSliceMargin(4).setLineWidth(5)); - - Highlighter h = new Highlighter(); - h.setShow(true); - h.setFormatString("%s, %P"); - h.setTooltipLocation(Location.ne); - h.setShowTooltip(true); - h.setUseAxesFormatters(false); - - pieChart.getChartConfiguration().setLegend(null).setHighlighter(h); - return pieChart; + for (int i = 0; i < values.length; ++i) { + pieChart.addValue(ticks[i], values[i]); + } + + pieChart.getSeriesDefaults().setRendererOptions(new RendererOptions().setHighlightMouseDown(true) + .setShowDataLabels(true).setFill(false).setSliceMargin(4).setLineWidth(5)); + + Highlighter h = new Highlighter(); + h.setShow(true); + h.setFormatString("%s, %P"); + h.setTooltipLocation(Location.ne); + h.setShowTooltip(true); + h.setUseAxesFormatters(false); + + pieChart.getChartConfiguration().setLegend(null).setHighlighter(h); + return pieChart; } - + private static BarChart<Integer> barChart(RoomPoll p) { String[] ticks = getTicks(p); - BarChart<Integer> barChart = new BarChart<Integer>(null); + BarChart<Integer> barChart = new BarChart<>(null); barChart.addValue(Arrays.asList(getValues(p))); - - barChart.getSeriesDefaults().setRendererOptions( - new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) - .setFill(false).setSliceMargin(4).setLineWidth(5).setBarDirection("horizontal")); - - Highlighter h = new Highlighter(); - h.setShow(true); - h.setFormatString("%s, %P"); - h.setTooltipLocation(Location.ne); - h.setShowTooltip(true); - h.setUseAxesFormatters(false); - - ChartConfiguration<Long> cfg = barChart.getChartConfiguration(); - cfg.setLegend(null).setHighlighter(h); - cfg.axesInstance().setXaxis(null); - /*cfg.axesInstance().xAxisInstance().setRenderer(JqPlotResources.AxisTickRenderer);*/ - cfg.axesInstance() - .yAxisInstance() - .setTicks(ticks) - .setRenderer(JqPlotResources.CategoryAxisRenderer); - return barChart; + + barChart.getSeriesDefaults() + .setRendererOptions(new RendererOptions().setHighlightMouseDown(true).setShowDataLabels(true) + .setFill(false).setSliceMargin(4).setLineWidth(5).setBarDirection("horizontal")); + + Highlighter h = new Highlighter(); + h.setShow(true); + h.setFormatString("%s, %P"); + h.setTooltipLocation(Location.ne); + h.setShowTooltip(true); + h.setUseAxesFormatters(false); + + ChartConfiguration<Long> cfg = barChart.getChartConfiguration(); + cfg.setLegend(null).setHighlighter(h); + cfg.axesInstance().setXaxis(null); + /* + * cfg.axesInstance().xAxisInstance().setRenderer(JqPlotResources. + * AxisTickRenderer); + */ + cfg.axesInstance().yAxisInstance().setTicks(ticks).setRenderer(JqPlotResources.CategoryAxisRenderer); + return barChart; } - + private class PollSelectForm extends Form<RoomPoll> { private static final long serialVersionUID = 1L; private final DropDownChoice<RoomPoll> select; PollSelectForm(String id) { super(id); - add((select = new DropDownChoice<RoomPoll>("polls", Model.of((RoomPoll)null), new ArrayList<RoomPoll>(), new ChoiceRenderer<RoomPoll>() { + add((select = new DropDownChoice<>("polls", Model.of((RoomPoll)null), new ArrayList<RoomPoll>(), new ChoiceRenderer<RoomPoll>() { private static final long serialVersionUID = 1L; @Override @@ -303,7 +301,7 @@ public class PollResultsDialog extends A } public void updateModel(IPartialPageRequestHandler handler) { - List<RoomPoll> list = new ArrayList<RoomPoll>(); + List<RoomPoll> list = new ArrayList<>(); RoomPoll p = getBean(PollDao.class).getByRoom(roomId); if (p != null) { list.add(p); @@ -316,7 +314,7 @@ public class PollResultsDialog extends A } } } - + private class PollResultsForm extends Form<RoomPoll> { private static final long serialVersionUID = 1L; private final String SIMPLE_CHART = Application.getString(1414); @@ -324,7 +322,7 @@ public class PollResultsDialog extends A private final IModel<String> name = Model.of((String)null); private final IModel<String> question = Model.of((String)null); private final IModel<Integer> count = Model.of(0); - private final DropDownChoice<String> chartType = new DropDownChoice<String>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART)); + private final DropDownChoice<String> chartType = new DropDownChoice<>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART)); PollResultsForm(String id) { super(id, Model.of((RoomPoll)null)); @@ -342,7 +340,7 @@ public class PollResultsDialog extends A })); add(chartDiv.setOutputMarkupId(true)); } - + public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) { setModelObject(poll); name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator())); @@ -355,13 +353,13 @@ public class PollResultsDialog extends A redraw(handler); } } - + private void redraw(IPartialPageRequestHandler handler) { RoomPoll poll = getModelObject(); Chart<?> chart = SIMPLE_CHART.equals(chartType.getModelObject()) ? barChart(poll) : pieChart(poll); handler.appendJavaScript(getScript(chart)); } - + @Override protected void onDetach() { name.detach(); Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java Wed Mar 1 06:11:13 2017 @@ -54,7 +54,7 @@ import com.googlecode.wicket.kendo.ui.pa */ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> { private static final long serialVersionUID = 1L; - private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added + private final static List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); //TODO max vote should be added private final PollAnswerForm form; private final DialogButton vote = new DialogButton("vote", Application.getString(32)); private final DialogButton cancel = new DialogButton("cancel", Application.getString(25)); @@ -63,13 +63,13 @@ public class VoteDialog extends Abstract public VoteDialog(String id) { super(id, Application.getString(18)); - add(form = new PollAnswerForm("form", new CompoundPropertyModel<RoomPollAnswer>(new RoomPollAnswer()))); + add(form = new PollAnswerForm("form", new CompoundPropertyModel<>(new RoomPollAnswer()))); } - + static String getName(User u) { return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString(1411) : u.getFirstname() + " " + u.getLastname()); } - + public void updateModel(IPartialPageRequestHandler target, RoomPoll rp) { RoomPollAnswer a = new RoomPollAnswer(); a.setRoomPoll(rp); @@ -82,12 +82,12 @@ public class VoteDialog extends Abstract form.typeInt.setVisible(typeNum); target.add(form); } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(vote, cancel); } - + /* (non-Javadoc) * @see com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog#getSubmitButton() */ @@ -122,7 +122,7 @@ public class VoteDialog extends Abstract a.getRoomPoll().getAnswers().add(a); getBean(PollDao.class).update(a.getRoomPoll()); } - + @Override protected void onDetach() { user.detach(); @@ -139,9 +139,9 @@ public class VoteDialog extends Abstract add(new Label("user", user)); add(new Label("roomPoll.question")); add(typeBool.add(new RadioGroup<Boolean>("answer").setRequired(true) - .add(new Radio<Boolean>("true", Model.of(Boolean.TRUE))).add(new Radio<Boolean>("false", Model.of(Boolean.FALSE))) + .add(new Radio<>("true", Model.of(Boolean.TRUE))).add(new Radio<>("false", Model.of(Boolean.FALSE))) ).setOutputMarkupPlaceholderTag(true).setVisible(false)); - add(typeInt.add(new DropDownChoice<Integer>("pointList", answers).setRequired(true)) + add(typeInt.add(new DropDownChoice<>("pointList", answers).setRequired(true)) .setOutputMarkupPlaceholderTag(true).setVisible(false)); } } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java Wed Mar 1 06:11:13 2017 @@ -36,10 +36,10 @@ import com.googlecode.wicket.jquery.ui.w public class AboutDialog extends AbstractDialog<String> { private static final long serialVersionUID = 1L; - + public AboutDialog(String id) { super(id, Application.getString(1549)); - + add(new Label("name", getBean(ConfigurationDao.class).getAppName())); add(new Label("version", getVersion())); add(new Label("revision", getRevision())); @@ -48,7 +48,7 @@ public class AboutDialog extends Abstrac @Override protected List<DialogButton> getButtons() { - return new ArrayList<DialogButton>(); + return new ArrayList<>(); } @Override Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java Wed Mar 1 06:11:13 2017 @@ -43,10 +43,10 @@ public class InviteUserMessageDialog ext private static final long serialVersionUID = 1L; private final DialogButton send = new DialogButton("send", Application.getString(1139)); private final DialogButton cancel = new DialogButton("cancel", Application.getString(219)); - private final Form<Void> form = new Form<Void>("form"); + private final Form<Void> form = new Form<>("form"); private final TextArea<String> message = new TextArea<>("message", Model.of("")); private final CheckBox enterRoom = new CheckBox("enterRoom", Model.of(false)); - + public InviteUserMessageDialog(String id) { super(id, Application.getString(1138)); add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true)); @@ -60,12 +60,12 @@ public class InviteUserMessageDialog ext handler.add(form); open(handler); } - + @Override protected List<DialogButton> getButtons() { return Arrays.asList(send, cancel); } - + @Override public DialogButton getSubmitButton() { return send; @@ -79,12 +79,12 @@ public class InviteUserMessageDialog ext @Override protected void onError(AjaxRequestTarget target) { // TODO Auto-generated method stub - + } @Override protected void onSubmit(AjaxRequestTarget target) { // TODO Auto-generated method stub - + } } Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Wed Mar 1 06:11:13 2017 @@ -86,7 +86,7 @@ public class MessageDialog extends Abstr private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now())); private final DateTimePicker end = new OmDateTimePicker("end", Model.of(LocalDateTime.now())); private boolean isPrivate = false; - private final IModel<Collection<User>> modelTo = new CollectionModel<User>(new ArrayList<User>()); + private final IModel<Collection<User>> modelTo = new CollectionModel<>(new ArrayList<User>()); @Override public int getWidth() { @@ -131,7 +131,7 @@ public class MessageDialog extends Abstr public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) { super(id, Application.getString(1209), model); - form = new Form<PrivateMessage>("form", getModel()); + form = new Form<>("form", getModel()); form.add(feedback.setOutputMarkupId(true)); form.add(new UserMultiChoice("to", modelTo).setRequired(true)); Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html Wed Mar 1 06:11:13 2017 @@ -7,16 +7,16 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + --> <html xmlns:wicket="http://wicket.apache.org";> <wicket:panel> @@ -29,90 +29,90 @@ <li><a href="#tab3"><wicket:message key="appointment.tab.advanced"/></a></li> </ul> <div id="tab1"> - <table> - <tr> - <td><wicket:message key="572" /></td> - <td><input type="text" wicket:id="title" /></td> - </tr> - <tr> - <td><wicket:message key="570" /></td> - <td><span class="date time picker" wicket:id="start"></span></td> - </tr> - <tr> - <td><wicket:message key="571" /></td> - <td><span class="date time picker" wicket:id="end"></span></td> - </tr> - <tr wicket:id="owner-row"> - <td><wicket:message key="1156" /></td> - <td><span wicket:id="aowner"></span></td> - </tr> - <tr> - <td><wicket:message key="803" /></td> - <td wicket:message="title:1588" class="om-select2"><select class="appointment attendees input" wicket:id="attendees"></select></td> - </tr> - <tr> - <td><wicket:message key="569" /></td> - <td><input type="text" wicket:id="location" /></td> - </tr> - <tr> - <td><wicket:message key="573" /></td> - <td> + <div class="table"> + <div> + <div class="column label"><wicket:message key="572" /></div> + <div class="column data"><input type="text" wicket:id="title" /></div> + </div> + <div> + <div class="column label"><wicket:message key="570" /></div> + <div class="column data"><span class="date time picker" wicket:id="start"></span></div> + </div> + <div> + <div class="column label"><wicket:message key="571" /></div> + <div class="column data"><span class="date time picker" wicket:id="end"></span></div> + </div> + <div wicket:id="owner-row"> + <div class="column label"><wicket:message key="1156" /></div> + <div class="column data"><span wicket:id="aowner"></span></div> + </div> + <div wicket:id="inviteeType"> + <div> + <div class="column label"><input type="radio" wicket:id="user"/><label wicket:for="user"><wicket:message key="803" /></label></div> + <div class="column data om-select2" wicket:message="title:1588"><select class="appointment attendees input" wicket:id="attendees"></select></div> + </div> + <div wicket:id="groupContainer"> + <div class="column label"><input type="radio" wicket:id="group"/><label wicket:for="group"><wicket:message key="126" /></label></div> + <div class="column data om-select2"><select wicket:id="groups" class="input invitees"></select></div> + </div> + </div> + <div> + <div class="column label"><wicket:message key="569" /></div> + <div class="column data"><input type="text" wicket:id="location" /></div> + </div> + <div> + <div class="column label"><wicket:message key="573" /></div> + <div class="column data"> <div wicket:id="toolbarContainer"></div> <div wicket:id="description"></div> - </td> - </tr> - <tr> - <td><wicket:message key="162" /></td> - <td><select wicket:id="calendar"></select></td> - </tr> - </table> + </div> + </div> + </div> </div> <div id="tab2"> - <table> - <tbody> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label></td> - </tr> - </tbody> - <tbody wicket:id="create-room-block"> - <tr> - <td><wicket:message key="619" /></td> - <td><select wicket:id="type" ></select></td> - </tr> - <tr> - <td><label wicket:for="moderated"><wicket:message key="640" /></label></td> - <td><input type="checkbox" wicket:id="moderated" /></td> - </tr> - </tbody> - <tbody> - <tr> - <td><wicket:message key="436" /></td> - <td><select wicket:id="groom" ></select></td> - </tr> - <tr wicket:id="sip-container"> - <td><wicket:message key="1003"/></td> - <td><span wicket:id="room.confno"></span></td> - </tr> - </tbody> - </table> + <div class="table"> + <div> + <input type="checkbox" wicket:id="createRoom" /><label wicket:for="createRoom"><wicket:message key="1509" /></label> + </div> + <div wicket:id="create-room-block"> + <div> + <div class="column label"><wicket:message key="619" /></div> + <div class="column data"><select wicket:id="type" ></select></div> + </div> + <div> + <div class="column label"><label wicket:for="moderated"><wicket:message key="640" /></label></div> + <div class="column data"><input type="checkbox" wicket:id="moderated" /></div> + </div> + </div> + <div> + <div class="column label"><wicket:message key="436" /></div> + <div class="column data"><select wicket:id="groom" ></select></div> + </div> + <div wicket:id="sip-container"> + <div class="column label"><wicket:message key="1003"/></div> + <div class="column data"><span wicket:id="room.confno"></span></div> + </div> + </div> </div> <div id="tab3"> - <table> - <tr> - <td><wicket:message key="565" /></td> - <td><select wicket:id="reminder" ></select></td> - </tr> - <tr> - <td colspan="2"><input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label></td> - </tr> - <tr> - <td><wicket:message key="525" /></td> - <td><input type="password" wicket:id="password" /></td> - </tr> - <tr> - <td colspan="2" style="font-size: smaller;"><wicket:message key="1445" /></td> - </tr> - </table> + <div class="table"> + <div> + <div class="column label"><wicket:message key="565" /></div> + <div class="column data"><select wicket:id="reminder" ></select></div> + </div> + <div> + <input type="checkbox" wicket:id="passwordProtected" /><label wicket:for="passwordProtected"><wicket:message key="524" /></label> + </div> + <div> + <div class="column label"><wicket:message key="525" /></div> + <div class="column data"><input type="password" wicket:id="password" /></div> + </div> + <div><wicket:message key="1445" /></div> + <div> + <div class="column label"><wicket:message key="162" /></div> + <div class="column data"><select wicket:id="calendar"></select></div> + </div> + </div> </div> </div> </form> Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentModel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/OmDashboardPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/calendar/TestSendIcalMessage.java (original) +++ openmeetings/application/branches/3.2.x/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 = "[email protected]"; 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("[email protected]")); 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/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/GroupWebService.java (original) +++ openmeetings/application/branches/3.2.x/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/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java (original) +++ openmeetings/application/branches/3.2.x/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()))) { Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/BaseConverter.java Wed Mar 1 06:11:13 2017 @@ -120,7 +120,7 @@ public abstract class BaseConverter { } protected String[] mergeAudioToWaves(List<File> waveFiles, File wav) throws IOException { - List<String> argv = new ArrayList<String>(); + List<String> argv = new ArrayList<>(); argv.add(getPathToSoX()); argv.add("-m"); Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/FlvExplorerConverter.java Wed Mar 1 06:11:13 2017 @@ -58,7 +58,7 @@ public class FlvExplorerConverter extend } public List<ConverterProcessResult> convertToMP4(FileExplorerItem f, String ext) { - List<ConverterProcessResult> logs = new ArrayList<ConverterProcessResult>(); + List<ConverterProcessResult> logs = new ArrayList<>(); try { File mp4 = f.getFile(EXTENSION_MP4); f.setType(Type.Video); Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java Wed Mar 1 06:11:13 2017 @@ -112,9 +112,9 @@ public class InterviewConverter extends List<File> waveFiles = new ArrayList<>(); File streamFolder = getStreamFolder(r); List<RecordingMetaData> metaDataList = metaDataDao.getAudioMetaDataByRecording(r.getId()); - + stripAudioFirstPass(r, logs, waveFiles, streamFolder, metaDataList); - + // Merge Wave to Full Length File streamFolderGeneral = getStreamsHibernateDir(); @@ -166,7 +166,7 @@ public class InterviewConverter extends /* * CHECK FILE: * ffmpeg -i rec_316_stream_567_2013_08_28_11_51_45.flv -v error -f null file.null - */ + */ String[] args = new String[] {getPathToFFMPEG(), "-y" , "-i", path , "-an" // only input files with video will be treated as video sources @@ -191,7 +191,7 @@ public class InterviewConverter extends , "-pix_fmt", "yuv420p" // , podPB }; logs.add(ProcessHelper.executeScript("blankFlvPod_" + pod , argsPodB)); - + //ffmpeg -y -i out.flv -i rec_15_stream_4_2014_07_15_20_41_03.flv -filter_complex '[0:0]setsar=1/1[sarfix];[1:0]scale=320:260,setsar=1/1[scale];[sarfix] [scale] concat=n=2:v=1:a=0 [v]' -map '[v]' output1.flv File podF = new File(streamFolder, OmFileHelper.getName(meta.getStreamName() + "_pod_" + pod, EXTENSION_FLV)); String podP = podF.getCanonicalPath(); @@ -202,7 +202,7 @@ public class InterviewConverter extends , "-map", "[v]" // , podP }; logs.add(ProcessHelper.executeScript("shiftedFlvPod_" + pod , argsPod)); - + pods[pod - 1] = podP; } else { pods[pod - 1] = path; @@ -220,7 +220,7 @@ public class InterviewConverter extends return; } boolean shortest = false; - List<String> args = new ArrayList<String>(); + List<String> args = new ArrayList<>(); for (int i = 0; i < 2; ++i) { /* * INSERT BLANK INSTEAD OF BAD PAD: Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/conference/RoomManager.java Wed Mar 1 06:11:13 2017 @@ -43,9 +43,9 @@ import org.springframework.beans.factory import org.springframework.transaction.annotation.Transactional; /** - * + * * @author swagner - * + * */ @Transactional public class RoomManager { @@ -56,14 +56,14 @@ public class RoomManager { @Autowired private ISessionManager sessionManager; - @Autowired + @Autowired private RoomDao roomDao; - @Autowired + @Autowired private SipDao sipDao; public SearchResult<Room> getRooms(int start, int max, String orderby, boolean asc, String search) { try { - SearchResult<Room> sResult = new SearchResult<Room>(); + SearchResult<Room> sResult = new SearchResult<>(); sResult.setRecords(this.selectMaxFromRooms(search)); sResult.setObjectName(Room.class.getName()); sResult.setResult(this.getRoomsInternatlByHQL(start, max, @@ -74,10 +74,10 @@ public class RoomManager { } return null; } - + public SearchResult<Room> getRoomsWithCurrentUsers(int start, int max, String orderby, boolean asc) { try { - SearchResult<Room> sResult = new SearchResult<Room>(); + SearchResult<Room> sResult = new SearchResult<>(); sResult.setRecords(this.selectMaxFromRooms("")); sResult.setObjectName(Room.class.getName()); @@ -148,7 +148,7 @@ public class RoomManager { /** * gets a list of all availible rooms - * + * * @param user_level * @param start * @param max @@ -182,7 +182,7 @@ public class RoomManager { /** * gets a list of all availible rooms - * + * * @param user_level * @param start * @param max @@ -203,7 +203,7 @@ public class RoomManager { } if (orderby != null) { hql += " ORDER BY " + (orderby.startsWith("c.") ? "" : "c.") + orderby; - + if (asc) { hql += " ASC"; } else { @@ -288,24 +288,24 @@ public class RoomManager { } catch (Exception ex2) { log.error("[getRoomsByIds] ", ex2); } - return new LinkedList<Room>(); + return new LinkedList<>(); } // --------------------------------------------------------------------------------------------- - /** - * Returns number of SIP conference participants - * @param roomId id of room - * @return number of participants - */ - public Integer getSipConferenceMembersNumber(Long roomId) { - Room r = roomDao.get(roomId); - return r == null || r.getConfno() == null ? null : sipDao.countUsers(r.getConfno()); - } + /** + * Returns number of SIP conference participants + * @param roomId id of room + * @return number of participants + */ + public Integer getSipConferenceMembersNumber(Long roomId) { + Room r = roomDao.get(roomId); + return r == null || r.getConfno() == null ? null : sipDao.countUsers(r.getConfno()); + } /** * get List of RoomGroup by group and roomtype - * + * * @param groupId * @param typeId * @return @@ -324,7 +324,7 @@ public class RoomManager { /** * Gets all rooms by an group - * + * * @param groupId * @return list of RoomGroup with Rooms as Sub-Objects or null */ @@ -347,7 +347,7 @@ public class RoomManager { public SearchResult<RoomGroup> getRoomGroupByGroupId(long groupId, int start, int max, String orderby, boolean asc) { try { - SearchResult<RoomGroup> sResult = new SearchResult<RoomGroup>(); + SearchResult<RoomGroup> sResult = new SearchResult<>(); sResult.setObjectName(RoomGroup.class.getName()); sResult.setRecords(this.selectMaxFromRoomsByGroup(groupId).longValue()); sResult.setResult(getRoomGroupsByGroupId(groupId, start, max, orderby, asc)); @@ -374,7 +374,7 @@ public class RoomManager { } /** - * + * * @param groupId * @param start * @param max Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/record/listener/async/BaseStreamWriter.java Wed Mar 1 06:11:13 2017 @@ -70,7 +70,7 @@ public abstract class BaseStreamWriter i protected String streamName = ""; protected final RecordingMetaDataDao metaDataDao; - private final BlockingQueue<CachedEvent> queue = new LinkedBlockingQueue<CachedEvent>(); + private final BlockingQueue<CachedEvent> queue = new LinkedBlockingQueue<>(); public BaseStreamWriter(String streamName, IScope scope, Long metaDataId, boolean isScreenData, RecordingMetaDataDao metaDataDao) { startedSessionTimeDate = new Date(); @@ -87,13 +87,13 @@ public abstract class BaseStreamWriter i RecordingMetaData metaData = metaDataDao.get(metaDataId); metaData.setStreamStatus(Status.STARTED); metaDataDao.update(metaData); - + open(); } /** * Initialization - * + * * @throws IOException * I/O exception */ @@ -134,7 +134,7 @@ public abstract class BaseStreamWriter i try { CachedEvent item = queue.poll(100, TimeUnit.MICROSECONDS); if (item != null) { - log.trace("##REC:: got packet"); + log.trace("##REC:: got packet"); lastPackedRecieved = System.currentTimeMillis(); if (dostopping) { log.trace("metadatId: {} :: Recording stopped but still packets to write to file!", metaDataId); @@ -142,7 +142,7 @@ public abstract class BaseStreamWriter i packetReceived(item); } else if (dostopping || lastPackedRecieved + TIME_TO_WAIT_FOR_FRAME < System.currentTimeMillis()) { - log.debug(String.format("##REC:: none packets received for: %s minutes, exiting", (System.currentTimeMillis() - lastPackedRecieved) / MINUTE_MULTIPLIER)); + log.debug(String.format("##REC:: none packets received for: %s minutes, exiting", (System.currentTimeMillis() - lastPackedRecieved) / MINUTE_MULTIPLIER)); stopping = true; closeStream(); } @@ -158,7 +158,7 @@ public abstract class BaseStreamWriter i /** * Write the actual packet data to the disk and do calculate any needed additional information - * + * * @param streampacket */ public abstract void packetReceived(CachedEvent streampacket); Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java?rev=1784854&r1=1784853&r2=1784854&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteBoardObjectSyncManager.java Wed Mar 1 06:11:13 2017 @@ -29,13 +29,13 @@ import org.slf4j.Logger; /** * Memory based, configured as singleton in spring configuration - * + * * @author sebawagner * */ public class WhiteBoardObjectSyncManager { - private Map<Long, Map<String, WhiteboardSyncLockObject>> whiteBoardSyncList = new ConcurrentHashMap<Long, Map<String, WhiteboardSyncLockObject>>(); - private Map<Long, Map<String, Map<String, WhiteboardSyncLockObject>>> whiteBoardObjectSyncList = new ConcurrentHashMap<Long, Map<String, Map<String, WhiteboardSyncLockObject>>>(); + private Map<Long, Map<String, WhiteboardSyncLockObject>> whiteBoardSyncList = new ConcurrentHashMap<>(); + private Map<Long, Map<String, Map<String, WhiteboardSyncLockObject>>> whiteBoardObjectSyncList = new ConcurrentHashMap<>(); private static final Logger log = Red5LoggerFactory.getLogger(WhiteBoardObjectSyncManager.class, webAppRootKey);
