Repository: openmeetings Updated Branches: refs/heads/master 58598dbc0 -> d6ca151b5
[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/d6ca151b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/d6ca151b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/d6ca151b Branch: refs/heads/master Commit: d6ca151b508d44bb828fa0d452411b093326c250 Parents: 58598db Author: Maxim Solodovnik <[email protected]> Authored: Wed Oct 11 22:41:45 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Wed Oct 11 22:41:45 2017 +0700 ---------------------------------------------------------------------- .../service/mail/template/AbstractTemplatePanel.java | 2 +- .../service/mail/template/subject/AppointmentTemplate.java | 2 +- .../mail/template/subject/InvitedAppointmentTemplate.java | 2 +- .../service/mail/template/subject/SubjectEmailTemplate.java | 2 +- .../java/org/apache/openmeetings/web/pages/auth/SignInPage.java | 4 ++-- .../java/org/apache/openmeetings/invitiation/TestInvitation.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java index f0ed23d..b8a691c 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractTemplatePanel.java @@ -37,7 +37,7 @@ public abstract class AbstractTemplatePanel extends Panel { public static final String COMP_ID = "template"; protected final Locale locale; - public AbstractTemplatePanel(Locale locale) { + protected AbstractTemplatePanel(Locale locale) { super(COMP_ID); this.locale = locale == null ? getDefault() : locale; add(new TransparentWebMarkupContainer("container").add(AttributeModifier.append("dir", FormatHelper.isRtlLanguage(this.locale.toLanguageTag()) ? "rtl" : "ltr"))); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.java index 5bdcce0..52977f1 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/AppointmentTemplate.java @@ -39,7 +39,7 @@ public abstract class AppointmentTemplate extends SubjectEmailTemplate { protected Appointment a; protected TimeZone tz; - public AppointmentTemplate(Locale locale, Appointment a, TimeZone tz) { + AppointmentTemplate(Locale locale, Appointment a, TimeZone tz) { super(locale); this.a = a; this.tz = tz; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java index 358af85..7f0b00d 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/InvitedAppointmentTemplate.java @@ -28,7 +28,7 @@ public abstract class InvitedAppointmentTemplate extends AppointmentTemplate { private static final long serialVersionUID = 1L; protected final String invitorName; - protected InvitedAppointmentTemplate(Locale locale, Appointment a, TimeZone tz, String invitorName) { + InvitedAppointmentTemplate(Locale locale, Appointment a, TimeZone tz, String invitorName) { super(locale, a, tz); this.invitorName = invitorName; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java index eddd604..be298c5 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/subject/SubjectEmailTemplate.java @@ -30,7 +30,7 @@ public abstract class SubjectEmailTemplate extends AbstractTemplatePanel { private String subject = null; private boolean created = false; - public SubjectEmailTemplate(Locale locale) { + SubjectEmailTemplate(Locale locale) { super(locale); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java index 5f6754c..dc7622b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java @@ -221,7 +221,7 @@ public class SignInPage extends BaseInitedPage { } } - private AuthInfo getToken(String code, OAuthServer server) throws IOException { + private static AuthInfo getToken(String code, OAuthServer server) throws IOException { String requestTokenBaseUrl = server.getRequestTokenUrl(); // build url params to request auth token String requestTokenParams = server.getRequestTokenAttributes(); @@ -264,7 +264,7 @@ public class SignInPage extends BaseInitedPage { return result; } - private Map<String, String> getAuthParams(String token, String code, OAuthServer server) throws IOException { + private static Map<String, String> getAuthParams(String token, String code, OAuthServer server) throws IOException { // get attributes names String loginAttributeName = server.getLoginParamName(); String emailAttributeName = server.getEmailParamName(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/d6ca151b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java index d327f7c..2fa636d 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/invitiation/TestInvitation.java @@ -61,7 +61,7 @@ public class TestInvitation extends AbstractWicketTester { invitationManager.sendInvitationLink(i, MessageType.Create, "subject", "message", false); } - private void checkTemplate(SubjectEmailTemplate t) { + private static void checkTemplate(SubjectEmailTemplate t) { Assert.assertNotNull("Template should be created", t); Assert.assertFalse("Subject should be not empty", Strings.isEmpty(t.getSubject())); Assert.assertFalse("Boby should be not empty", Strings.isEmpty(t.getEmail()));
