keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fix headless operation, hopefully

Browse source
This commit is contained in:
Christian 2012-09-02 13:29:46 -04:00
parent 599476d587
commit 5bea2a0bbd
2 changed files with 22 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
fml/common/cpw/mods/fml/relauncher/Downloader.java
View file

@ -18,7 +18,6 @@ import cpw.mods.fml.common.FMLLog;
public class Downloader extends JOptionPane
{
private static Downloader instance;
private JDialog container;
private JLabel currentActivity;
private JProgressBar progress;
@ -28,21 +27,6 @@ public class Downloader extends JOptionPane
public Downloader()
{
super();
instance = this;
setMessageType(JOptionPane.INFORMATION_MESSAGE);
setMessage(makeProgressPanel());
setOptions(new Object[] { "Stop" });
addPropertyChangeListener(new PropertyChangeListener()
{
@Override
public void propertyChange(PropertyChangeEvent evt)
{
if (evt.getSource() == instance && evt.getPropertyName()==VALUE_PROPERTY)
{
requestClose("This will stop minecraft from launching\nAre you sure you want to do this?");
}
}
});
}
private Box makeProgressPanel()
@ -66,19 +50,27 @@ public class Downloader extends JOptionPane
return box;
}
public static void main(String[] args)
{
instance = new Downloader();
instance.makeDialog();
}
JDialog makeDialog()
{
setMessageType(JOptionPane.INFORMATION_MESSAGE);
setMessage(makeProgressPanel());
setOptions(new Object[] { "Stop" });
addPropertyChangeListener(new PropertyChangeListener()
{
@Override
public void propertyChange(PropertyChangeEvent evt)
{
if (evt.getSource() == Downloader.this && evt.getPropertyName()==VALUE_PROPERTY)
{
requestClose("This will stop minecraft from launching\nAre you sure you want to do this?");
}
}
});
container = new JDialog(null, "Hello", ModalityType.MODELESS);
container.setResizable(false);
container.setLocationRelativeTo(null);
container.add(instance);
instance.updateUI();
container.add(this);
this.updateUI();
container.pack();
container.setMinimumSize(container.getPreferredSize());
container.setVisible(true);
@ -88,7 +80,7 @@ public class Downloader extends JOptionPane
@Override
public void windowClosing(WindowEvent e)
{
instance.requestClose("Closing this window will stop minecraft from launching\nAre you sure you wish to do this?");
requestClose("Closing this window will stop minecraft from launching\nAre you sure you wish to do this?");
}
});
return container;
@ -132,11 +124,10 @@ public class Downloader extends JOptionPane
}
}
static void makeHeadless()
void makeHeadless()
{
instance.container = null;
instance.progress = null;
instance.currentActivity = null;
container = null;
progress = null;
currentActivity = null;
}
}

2
fml/common/cpw/mods/fml/relauncher/FMLRelauncher.java
View file

@ -64,8 +64,8 @@ public class FMLRelauncher
}
catch (Exception e)
{
Downloader.makeHeadless();
popupWindow = null;
RelaunchLibraryManager.downloadMonitor.makeHeadless();
}
}