Repository: openmeetings Updated Branches: refs/heads/master 328be41ff -> a06a73525
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/a06a7352 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/a06a7352 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/a06a7352 Branch: refs/heads/master Commit: a06a7352536a2e1e2410f90b2c01cd899bf654e3 Parents: 328be41 Author: Maxim Solodovnik <[email protected]> Authored: Mon Oct 9 20:03:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Mon Oct 9 20:03:45 2017 +0700 ---------------------------------------------------------------------- .../db/entity/room/StreamClient.java | 4 +-- .../java/org/apache/openmeetings/cli/Admin.java | 9 +++--- .../screenshare/RTMPClientPublish.java | 8 ----- .../screenshare/gui/ScreenSharerFrame.java | 32 ++++++++++---------- .../mail/template/RegisterUserTemplate.java | 12 ++++---- .../service/room/InvitationManager.java | 8 ++--- .../openmeetings/service/user/UserManager.java | 6 ++-- .../openmeetings/util/OMContextListener.java | 5 --- .../web/common/OmDateTimePicker.java | 9 +----- .../web/common/tree/FileTreePanel.java | 5 --- .../web/user/profile/UserSearchPanel.java | 2 +- 11 files changed, 37 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java index 1e0058f..e93379b 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/room/StreamClient.java @@ -264,8 +264,8 @@ public class StreamClient implements IClient { return picture_uri; } - public void setPicture_uri(String picture_uri) { - this.picture_uri = picture_uri; + public void setPicture_uri(String pictureUri) { + this.picture_uri = pictureUri; } public String getLanguage() { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 3073a29..96082c7 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -73,7 +73,6 @@ import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.Validatable; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; -import org.springframework.beans.BeansException; import org.springframework.scheduling.quartz.SchedulerFactoryBean; import org.springframework.web.context.WebApplicationContext; @@ -330,9 +329,9 @@ public class Admin { private void processBackup(String file) throws Exception { File f; if (!cmdl.hasOption("file")) { - file = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip"; - f = new File(home, file); - log("File name was not specified, '" + file + "' will be used"); + String fn = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip"; + f = new File(home, fn); + log("File name was not specified, '" + fn + "' will be used"); } else { f = new File(file); } @@ -357,7 +356,7 @@ public class Admin { log(report); } - private void processLdap() throws BeansException, OmException { + private void processLdap() throws OmException { if (!cmdl.hasOption("d")) { log("Please specify LDAP domain Id."); throw new ExitException(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java index 2beea08..ac8dd1e 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/RTMPClientPublish.java @@ -22,11 +22,8 @@ import org.red5.client.net.rtmp.INetStreamEventHandler; import org.red5.client.net.rtmp.RTMPClient; import org.red5.server.api.service.IPendingServiceCall; import org.red5.server.api.service.IPendingServiceCallback; -import org.red5.server.net.ICommand; -import org.red5.server.net.rtmp.Channel; import org.red5.server.net.rtmp.RTMPConnection; import org.red5.server.net.rtmp.event.Notify; -import org.red5.server.net.rtmp.message.Header; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,11 +71,6 @@ class RTMPClientPublish extends RTMPClient implements IPendingServiceCallback, I } @Override - protected void onCommand(RTMPConnection conn, Channel channel, Header source, ICommand command) { - super.onCommand(conn, channel, source, command); - } - - @Override public void resultReceived(IPendingServiceCall call) { String method = call == null ? null : call.getServiceMethodName(); logger.trace("call ### get Method Name " + method); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index 2ba3cd1..df32d32 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -292,41 +292,41 @@ public class ScreenSharerFrame extends JFrame { audioNotify.setSelected(core.isAudioNotify()); audioNotify.addActionListener(e -> core.setAudioNotify(audioNotify.isSelected())); - GroupLayout gl_contentPane = new GroupLayout(contentPane); - gl_contentPane.setHorizontalGroup( - gl_contentPane.createParallelGroup(Alignment.LEADING) - .addGroup(gl_contentPane.createSequentialGroup() - .addGroup(gl_contentPane.createParallelGroup(Alignment.LEADING) - .addGroup(gl_contentPane.createSequentialGroup() + GroupLayout glContentPane = new GroupLayout(contentPane); + glContentPane.setHorizontalGroup( + glContentPane.createParallelGroup(Alignment.LEADING) + .addGroup(glContentPane.createSequentialGroup() + .addGroup(glContentPane.createParallelGroup(Alignment.LEADING) + .addGroup(glContentPane.createSequentialGroup() .addGap(7) .addComponent(lblStartSharing) .addGap(15) .addComponent(audioNotify)) - .addGroup(gl_contentPane.createSequentialGroup() + .addGroup(glContentPane.createSequentialGroup() .addGap(21) .addComponent(btnStartStopSharing, 200, 200, 200) .addGap(52) ) - .addGroup(gl_contentPane.createSequentialGroup() + .addGroup(glContentPane.createSequentialGroup() .addGap(7) .addComponent(lblSelectArea, GroupLayout.PREFERRED_SIZE, 470, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_contentPane.createSequentialGroup() + .addGroup(glContentPane.createSequentialGroup() .addContainerGap() .addComponent(panelScreen, GroupLayout.PREFERRED_SIZE, 472, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_contentPane.createSequentialGroup() + .addGroup(glContentPane.createSequentialGroup() .addContainerGap() .addComponent(tabbedPane, GroupLayout.PREFERRED_SIZE, 472, GroupLayout.PREFERRED_SIZE)) - .addGroup(gl_contentPane.createSequentialGroup() + .addGroup(glContentPane.createSequentialGroup() .addComponent(panelStatus, 494, 494, 494))) .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); - gl_contentPane.setVerticalGroup( - gl_contentPane.createParallelGroup(Alignment.LEADING) - .addGroup(gl_contentPane.createSequentialGroup() + glContentPane.setVerticalGroup( + glContentPane.createParallelGroup(Alignment.LEADING) + .addGroup(glContentPane.createSequentialGroup() .addGap(7) .addComponent(lblStartSharing) .addGap(4) - .addGroup(gl_contentPane.createParallelGroup(Alignment.LEADING) + .addGroup(glContentPane.createParallelGroup(Alignment.LEADING) .addComponent(btnStartStopSharing, 32, 32, 32).addComponent(audioNotify, 32, 32, 32) ) .addGap(4) @@ -593,7 +593,7 @@ public class ScreenSharerFrame extends JFrame { BorderFactory.createEmptyBorder(0, 5, 0, 0))); panelStatus.add(lblStatus); - contentPane.setLayout(gl_contentPane); + contentPane.setLayout(glContentPane); // Background Image //We have no logo, that is why we need no background, sebawagner 29.04.2012 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java index a147af5..cebfe71 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RegisterUserTemplate.java @@ -26,19 +26,19 @@ import org.apache.wicket.markup.html.link.ExternalLink; public class RegisterUserTemplate extends AbstractTemplatePanel { private static final long serialVersionUID = 1L; - public RegisterUserTemplate(String username, String email, String verification_url) { + public RegisterUserTemplate(String username, String email, String verificationUrl) { super(getOmSession().getLocale()); add(new Label("registrationLbl", getString("506", locale))); add(new Label("username", username)); add(new Label("email", email)); WebMarkupContainer verification = new WebMarkupContainer("verification"); - add(verification.add(new Label("verification_url2", verification_url)) - .add(new ExternalLink("verification_url1", verification_url)) - .setVisible(verification_url != null)); + add(verification.add(new Label("verification_url2", verificationUrl)) + .add(new ExternalLink("verification_url1", verificationUrl)) + .setVisible(verificationUrl != null)); add(new Label("groupLbl", getString("511", locale))); } - public static String getEmail(String username, String email, String verification_url) { - return ComponentRenderer.renderComponent(new RegisterUserTemplate(username, email, verification_url)).toString(); + public static String getEmail(String username, String email, String verificationUrl) { + return ComponentRenderer.renderComponent(new RegisterUserTemplate(username, email, verificationUrl)).toString(); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java index 14bfa2a..9b4c7fa 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/room/InvitationManager.java @@ -103,15 +103,15 @@ public class InvitationManager implements IInvitationManager { @Override public void sendInvitationLink(Invitation i, MessageType type, String subject, String message, boolean ical) throws Exception { - String invitation_link = null; + String invitationLink = null; if (type != MessageType.Cancel) { IApplication app = ensureApplication(1L); - invitation_link = app.getOmInvitationLink(i); + invitationLink = app.getOmInvitationLink(i); } User owner = i.getInvitedBy(); String invitorName = owner.getFirstname() + " " + owner.getLastname(); - String template = InvitationTemplate.getEmail(i.getInvitee(), invitorName, message, invitation_link); + String template = InvitationTemplate.getEmail(i.getInvitee(), invitorName, message, invitationLink); String email = i.getInvitee().getAddress().getEmail(); String replyToEmail = owner.getAddress().getEmail(); @@ -131,7 +131,7 @@ public class InvitationManager implements IInvitationManager { Appointment a = i.getAppointment(); // Create ICal Message - String meetingId = handler.addNewMeeting(a.getStart(), a.getEnd(), a.getTitle(), atts, invitation_link, + String meetingId = handler.addNewMeeting(a.getStart(), a.getEnd(), a.getTitle(), atts, invitationLink, organizerAttendee, a.getIcalId(), timezoneUtil.getTimeZone(owner).getID()); // Writing back meetingUid http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java index 86022e1..2eed0ff 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java @@ -97,7 +97,7 @@ public class UserManager implements IUserManager { * Group with the id specified in the configuration value default.group.id * * @param login - * @param Userpass + * @param userpass * @param lastname * @param firstname * @param email @@ -117,7 +117,7 @@ public class UserManager implements IUserManager { * @return */ @Override - public Object registerUser(String login, String Userpass, String lastname, + public Object registerUser(String login, String userpass, String lastname, String firstname, String email, Date age, String street, String additionalname, String fax, String zip, String country, String town, long languageId, String phone, boolean sendSMS, @@ -137,7 +137,7 @@ public class UserManager implements IUserManager { // TODO: Read and generate SIP-Data via RPC-Interface Issue 1098 Object user = registerUserInit(UserDao.getDefaultRights(), login, - Userpass, lastname, firstname, email, age, street, + userpass, lastname, firstname, email, age, street, additionalname, fax, zip, country, town, languageId, true, Arrays.asList(cfgDao.getLong(CONFIG_DEFAULT_GROUP_ID, null)), phone, sendSMS, sendConfirmation, timezoneUtil.getTimeZone(jNameTimeZone), false, "", "", false, true, null); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java ---------------------------------------------------------------------- diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java index 170a62b..0f944af 100644 --- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java +++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OMContextListener.java @@ -28,11 +28,6 @@ import org.red5.logging.ContextLoggingListener; public class OMContextListener extends ContextLoggingListener { @Override - public void contextDestroyed(ServletContextEvent event) { - super.contextDestroyed(event); - } - - @Override public void contextInitialized(ServletContextEvent event) { setWebAppRootKey(pathToName(event)); System.setProperty("current_openmeetings_context_name", getWebAppRootKey()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java index 2b28eff..b7a90e0 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java @@ -24,7 +24,6 @@ import java.time.LocalTime; import java.util.Locale; import org.apache.openmeetings.web.app.WebSession; -import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; import com.googlecode.wicket.jquery.core.Options; @@ -52,11 +51,5 @@ public class OmDateTimePicker extends DateTimePicker { tp.setLabel(getLabel()); return tp; } - - @Override - public void renderHead(IHeaderResponse response) { - super.renderHead(response); - //TODO this is remain here until localized AM/PM will be correctly handled - //response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale())); - } + //TODO render KendoCultureHeaderItem as soon as localized AM/PM will be correctly handled } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java index b12eaef..6b82454 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/FileTreePanel.java @@ -221,11 +221,6 @@ public abstract class FileTreePanel extends Panel { } @Override - protected void onEvent(AjaxRequestTarget target) { - super.onEvent(target); - } - - @Override protected void onSubmit(AjaxRequestTarget target) { deleteAll(target); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/a06a7352/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java index b2f3bfc..c2a1677 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.java @@ -125,7 +125,7 @@ public class UserSearchPanel extends UserBasePanel { .add(addOnClick(String.format("addContact(%s);", userId)))); item.add(new WebMarkupContainer("message").setVisible(userId != getUserId()).add(addOnClick(String.format("privateMessage(%s);", userId)))); item.add(new WebMarkupContainer("invite").setVisible(userId != getUserId()).add(addOnClick(String.format("inviteUser(%s);", userId)))); - //item.add(new TooltipBehavior(new Options("content", "TODO:: Picture will be displayed"))); + //TODO:: add Picture tooltip } };
