Sync with L2JServer Jan 9th 2015.
This commit is contained in:
@ -1,58 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2004-2015 L2J Server
|
||||
*
|
||||
* This file is part of L2J Server.
|
||||
*
|
||||
* L2J Server is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* L2J Server is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.l2jserver.tools.dbinstaller;
|
||||
|
||||
import java.awt.HeadlessException;
|
||||
|
||||
import javax.swing.UIManager;
|
||||
|
||||
import com.l2jserver.tools.dbinstaller.console.DBInstallerConsole;
|
||||
import com.l2jserver.tools.dbinstaller.gui.DBConfigGUI;
|
||||
|
||||
/**
|
||||
* Contains main class for Database Installer If system doesn't support the graphical UI, start the installer in console mode.
|
||||
* @author mrTJO
|
||||
*/
|
||||
public class LauncherCS
|
||||
{
|
||||
public static void main(String[] args)
|
||||
{
|
||||
String mode = "l2jcs";
|
||||
String dir = "../sql/community/";
|
||||
String cleanUp = "cs_cleanup.sql";
|
||||
|
||||
try
|
||||
{
|
||||
// Set OS Look And Feel
|
||||
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
new DBConfigGUI(mode, dir, cleanUp);
|
||||
}
|
||||
catch (HeadlessException e)
|
||||
{
|
||||
new DBInstallerConsole(mode, dir, cleanUp);
|
||||
}
|
||||
}
|
||||
}
|
@ -24,8 +24,8 @@ import java.util.prefs.Preferences;
|
||||
|
||||
import com.l2jserver.tools.dbinstaller.DBOutputInterface;
|
||||
import com.l2jserver.tools.dbinstaller.RunTasks;
|
||||
import com.l2jserver.tools.dbinstaller.util.CloseShieldedInputStream;
|
||||
import com.l2jserver.tools.dbinstaller.util.mysql.MySqlConnect;
|
||||
import com.l2jserver.util.CloseShieldedInputStream;
|
||||
|
||||
/**
|
||||
* @author mrTJO
|
||||
|
@ -0,0 +1,148 @@
|
||||
/*
|
||||
* Copyright (C) 2004-2015 L2J Server
|
||||
*
|
||||
* This file is part of L2J Server.
|
||||
*
|
||||
* L2J Server is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* L2J Server is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.l2jserver.tools.dbinstaller.util;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
|
||||
/**
|
||||
* Prevent the underlying input stream to close.
|
||||
* @author Joe Cheng, Zoey76
|
||||
*/
|
||||
public class CloseShieldedInputStream extends InputStream
|
||||
{
|
||||
private InputStream _in = null;
|
||||
|
||||
/**
|
||||
* Instantiates a new close shielded input stream.
|
||||
* @param in the in
|
||||
*/
|
||||
public CloseShieldedInputStream(InputStream in)
|
||||
{
|
||||
_in = in;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public void close()
|
||||
{
|
||||
_in = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public int read() throws IOException
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
throw new IOException("Stream is null!");
|
||||
}
|
||||
return _in.read();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public int read(byte b[]) throws IOException
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
throw new IOException("Stream is null!");
|
||||
}
|
||||
return _in.read(b);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public int read(byte b[], int off, int len) throws IOException
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
throw new IOException("Stream is null!");
|
||||
}
|
||||
return _in.read(b, off, len);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public long skip(long n) throws IOException
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
throw new IOException("Stream is null!");
|
||||
}
|
||||
return _in.skip(n);
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public synchronized void mark(int readlimit)
|
||||
{
|
||||
if (_in != null)
|
||||
{
|
||||
_in.mark(readlimit);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public boolean markSupported()
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
return _in.markSupported();
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritDoc}
|
||||
*/
|
||||
@Override
|
||||
public synchronized void reset() throws IOException
|
||||
{
|
||||
if (_in == null)
|
||||
{
|
||||
throw new IOException("Stream is null!");
|
||||
}
|
||||
_in.reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the underlying stream.
|
||||
* @return the underlying stream
|
||||
*/
|
||||
public InputStream getUnderlyingStream()
|
||||
{
|
||||
return _in;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user