Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
0e53df85
Commit
0e53df85
authored
Nov 13, 2015
by
Christian Schudt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace deprecated JiveConstants.XMPP_DELAY_DATETIME_FORMAT usage
with XMPPDateTimeFormat
parent
7a0753ba
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
ChatTranscriptManager.java
...ware/openfire/fastpath/history/ChatTranscriptManager.java
+3
-3
XmppDateUtil.java
...com/reucon/openfire/plugin/archive/util/XmppDateUtil.java
+2
-2
No files found.
src/plugins/fastpath/src/java/org/jivesoftware/openfire/fastpath/history/ChatTranscriptManager.java
View file @
0e53df85
...
@@ -42,8 +42,8 @@ import org.dom4j.DocumentHelper;
...
@@ -42,8 +42,8 @@ import org.dom4j.DocumentHelper;
import
org.dom4j.Element
;
import
org.dom4j.Element
;
import
org.jivesoftware.database.DbConnectionManager
;
import
org.jivesoftware.database.DbConnectionManager
;
import
org.jivesoftware.util.EmailService
;
import
org.jivesoftware.util.EmailService
;
import
org.jivesoftware.util.JiveConstants
;
import
org.jivesoftware.util.StringUtils
;
import
org.jivesoftware.util.StringUtils
;
import
org.jivesoftware.util.XMPPDateTimeFormat
;
import
org.jivesoftware.xmpp.workgroup.DbProperties
;
import
org.jivesoftware.xmpp.workgroup.DbProperties
;
import
org.jivesoftware.xmpp.workgroup.Workgroup
;
import
org.jivesoftware.xmpp.workgroup.Workgroup
;
import
org.jivesoftware.xmpp.workgroup.WorkgroupManager
;
import
org.jivesoftware.xmpp.workgroup.WorkgroupManager
;
...
@@ -175,7 +175,7 @@ public class ChatTranscriptManager {
...
@@ -175,7 +175,7 @@ public class ChatTranscriptManager {
}
}
// Define time zone used in the transcript.
// Define time zone used in the transcript.
SimpleDateFormat
UTC_FORMAT
=
new
SimpleDateFormat
(
JiveConstants
.
XMPP_DELAY_DATETIME_FORMAT
);
SimpleDateFormat
UTC_FORMAT
=
new
SimpleDateFormat
(
XMPPDateTimeFormat
.
XMPP_DELAY_DATETIME_FORMAT
);
UTC_FORMAT
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
UTC_FORMAT
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
final
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"h:mm a"
);
final
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"h:mm a"
);
...
@@ -378,7 +378,7 @@ public class ChatTranscriptManager {
...
@@ -378,7 +378,7 @@ public class ChatTranscriptManager {
if
(
transcript
==
null
||
""
.
equals
(
transcript
))
{
if
(
transcript
==
null
||
""
.
equals
(
transcript
))
{
return
""
;
return
""
;
}
}
final
SimpleDateFormat
UTC_FORMAT
=
new
SimpleDateFormat
(
JiveConstants
.
XMPP_DELAY_DATETIME_FORMAT
);
final
SimpleDateFormat
UTC_FORMAT
=
new
SimpleDateFormat
(
XMPPDateTimeFormat
.
XMPP_DELAY_DATETIME_FORMAT
);
UTC_FORMAT
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
UTC_FORMAT
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
final
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"h:mm a"
);
final
SimpleDateFormat
formatter
=
new
SimpleDateFormat
(
"h:mm a"
);
...
...
src/plugins/monitoring/src/java/com/reucon/openfire/plugin/archive/util/XmppDateUtil.java
View file @
0e53df85
package
com
.
reucon
.
openfire
.
plugin
.
archive
.
util
;
package
com
.
reucon
.
openfire
.
plugin
.
archive
.
util
;
import
org.jivesoftware.util.
JiveConstants
;
import
org.jivesoftware.util.
XMPPDateTimeFormat
;
import
java.text.DateFormat
;
import
java.text.DateFormat
;
import
java.text.ParseException
;
import
java.text.ParseException
;
...
@@ -16,7 +16,7 @@ public class XmppDateUtil {
...
@@ -16,7 +16,7 @@ public class XmppDateUtil {
private
static
final
DateFormat
dateFormatWithoutMillis
;
private
static
final
DateFormat
dateFormatWithoutMillis
;
static
{
static
{
dateFormat
=
new
SimpleDateFormat
(
JiveConstants
.
XMPP_DATETIME_FORMAT
);
dateFormat
=
new
SimpleDateFormat
(
XMPPDateTimeFormat
.
XMPP_DATETIME_FORMAT
);
dateFormat
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
dateFormat
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
dateFormatWithoutMillis
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss'Z'"
);
dateFormatWithoutMillis
=
new
SimpleDateFormat
(
"yyyy-MM-dd'T'HH:mm:ss'Z'"
);
dateFormatWithoutMillis
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
dateFormatWithoutMillis
.
setTimeZone
(
TimeZone
.
getTimeZone
(
"UTC"
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment