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
a602c8b6
Commit
a602c8b6
authored
Nov 09, 2015
by
Christian Schudt
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #350 from sco0ter/browser
Launcher: Use Desktop.getDesktop().browse().
parents
7e628c51
8256b86b
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
719 deletions
+5
-719
BrowserLauncher.java
...a/org/jivesoftware/openfire/launcher/BrowserLauncher.java
+0
-715
Launcher.java
src/java/org/jivesoftware/openfire/launcher/Launcher.java
+5
-4
No files found.
src/java/org/jivesoftware/openfire/launcher/BrowserLauncher.java
deleted
100644 → 0
View file @
7e628c51
This diff is collapsed.
Click to expand it.
src/java/org/jivesoftware/openfire/launcher/Launcher.java
View file @
a602c8b6
...
@@ -25,6 +25,7 @@ import java.awt.BorderLayout;
...
@@ -25,6 +25,7 @@ import java.awt.BorderLayout;
import
java.awt.CardLayout
;
import
java.awt.CardLayout
;
import
java.awt.Color
;
import
java.awt.Color
;
import
java.awt.Cursor
;
import
java.awt.Cursor
;
import
java.awt.Desktop
;
import
java.awt.Dimension
;
import
java.awt.Dimension
;
import
java.awt.Frame
;
import
java.awt.Frame
;
import
java.awt.Graphics
;
import
java.awt.Graphics
;
...
@@ -50,6 +51,7 @@ import java.io.InputStream;
...
@@ -50,6 +51,7 @@ import java.io.InputStream;
import
java.io.OutputStream
;
import
java.io.OutputStream
;
import
java.io.OutputStreamWriter
;
import
java.io.OutputStreamWriter
;
import
java.io.Writer
;
import
java.io.Writer
;
import
java.net.URI
;
import
java.net.URL
;
import
java.net.URL
;
import
javax.swing.BorderFactory
;
import
javax.swing.BorderFactory
;
...
@@ -278,8 +280,7 @@ public class Launcher {
...
@@ -278,8 +280,7 @@ public class Launcher {
}
}
else
if
(
"Launch Admin"
.
equals
(
e
.
getActionCommand
()))
{
else
if
(
"Launch Admin"
.
equals
(
e
.
getActionCommand
()))
{
launchBrowser
();
launchBrowser
();
}
}
else
if
(
"Quit"
.
equals
(
e
.
getActionCommand
()))
{
else
if
(
"Quit"
.
equals
(
e
.
getActionCommand
()))
{
stopApplication
();
stopApplication
();
System
.
exit
(
0
);
System
.
exit
(
0
);
}
}
...
@@ -589,9 +590,9 @@ public class Launcher {
...
@@ -589,9 +590,9 @@ public class Launcher {
securePort
=
securePortElement
.
getTextContent
();
securePort
=
securePortElement
.
getTextContent
();
}
}
if
(
"-1"
.
equals
(
port
))
{
if
(
"-1"
.
equals
(
port
))
{
BrowserLauncher
.
openURL
(
"https://127.0.0.1:"
+
securePort
+
"/index.html"
);
Desktop
.
getDesktop
().
browse
(
URI
.
create
(
"https://127.0.0.1:"
+
securePort
+
"/index.html"
)
);
}
else
{
}
else
{
BrowserLauncher
.
openURL
(
"http://127.0.0.1:"
+
port
+
"/index.html"
);
Desktop
.
getDesktop
().
browse
(
URI
.
create
(
"http://127.0.0.1:"
+
port
+
"/index.html"
)
);
}
}
}
}
catch
(
Exception
e
)
{
catch
(
Exception
e
)
{
...
...
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