Changeset 1018 for java

Timestamp:

Mar 28, 2015, 7:11:52 PM (10 years ago)

Author:

alloc

Message:

AEI 2.20: Center download window on parent window

Location:

java/installer2/src/net/oni2/aeinstaller

Files:

• AEInstaller.properties (modified) (1 diff)
• gui/MainWin.java (modified) (3 diffs)
• gui/downloadwindow/Downloader.java (modified) (3 diffs)
• gui/modtable/ModTable.java (modified) (4 diffs)
• gui/toolmanager/ToolManager.java (modified) (1 diff)

java/installer2/src/net/oni2/aeinstaller/AEInstaller.properties

@@ -1 +1 @@
 appname=AE Installer 2
-appversion=.19
+appversion=.20

java/installer2/src/net/oni2/aeinstaller/gui/MainWin.java

@@ -375 +375 @@
         private void doUpdate() {
                 if (execUpdates != null && execUpdates.size() > 0) {
-                        Downloader dl = new Downloader(execUpdates, null, false);
+                        Downloader dl = new Downloader(execUpdates, null, false, this);
                         try {
                                 dl.setVisible(true);
@@ -699 +699 @@
                         }
                         if (execCoreUpdates.size() > 0) {
-                                Downloader dl = new Downloader(execCoreUpdates, null, true);
+                                Downloader dl = new Downloader(execCoreUpdates, null, true, this);
                                 try {
                                         dl.setVisible(true);
@@ -755 +755 @@
 
                         if (toDownload.size() > 0) {
-                                Downloader dl = new Downloader(toDownload, installDeps, false);
+                                Downloader dl = new Downloader(toDownload, installDeps, false, this);
                                 try {
                                         dl.setVisible(true);

java/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.downloadwindow;
 
+import java.awt.Component;
 import java.util.ResourceBundle;
 import java.util.TreeSet;
@@ -53 +54 @@
          * @param isCoreDownload
          *            Downloading core packages - can not be aborted
+         * @param parent
+         *            Reference to parent window for centering
          */
         public Downloader(TreeSet<Package> mods, TreeSet<Package> dependencies,
-                        boolean isCoreDownload) {
+                        boolean isCoreDownload, Component parent) {
                 super();
 
@@ -65 +68 @@
                 setResizable(false);
                 setSize(600, (int) getSize().getHeight());
+                setLocationRelativeTo(parent);
 
                 if (dependencies != null)

java/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTable.java

@@ -1 +1 @@
 package net.oni2.aeinstaller.gui.modtable;
 
+import java.awt.Component;
 import java.awt.Desktop;
 import java.awt.Rectangle;
@@ -88 +89 @@
                 setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
                 getSelectionModel().addListSelectionListener(this);
-                addMouseListener(new MouseEventHandler());
+                addMouseListener(new MouseEventHandler(this));
                 addKeyListener(new KeyEventHandler());
                 // To get checkbox-cells with background of row
@@ -289 +290 @@
 
         private class MouseEventHandler extends MouseAdapter {
+                private final Component parent;
+                
+                public MouseEventHandler(Component parent) {
+                        this.parent = parent;
+                }
+
                 private void mouseEventProcessing(MouseEvent e) {
                         int r = rowAtPoint(e.getPoint());
@@ -349 +356 @@
                                                                 toDo.add(mod);
                                                                 Downloader dl = new Downloader(toDo, deps,
-                                                                                false);
+                                                                                false, parent);
                                                                 try {
                                                                         dl.setVisible(true);

java/installer2/src/net/oni2/aeinstaller/gui/toolmanager/ToolManager.java

@@ -115 +115 @@
                                         toDownload.add(selectedPackage);
 
-                                        Downloader dl = new Downloader(toDownload, null, false);
+                                        Downloader dl = new Downloader(toDownload, null, false, this);
                                         try {
                                                 dl.setVisible(true);