Changeset 638 for AE/installer2/src/net
- Timestamp:
- Jan 20, 2013, 3:01:47 PM (12 years ago)
- Location:
- AE/installer2/src/net/oni2/aeinstaller
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
r637 r638 1 1 appname=AE Installer 2 2 appversion=0.9 42 appversion=0.95 -
AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloader.java
r605 r638 28 28 */ 29 29 INTERRUPTED, 30 /** 31 * When the last file was downloaded and only unpacking is left 32 */ 33 LAST_FILE_DOWNLOADED, 30 34 /** 31 35 * Everything completed … … 69 73 if ((state == State.RUNNING) && (currentDownload < downloads.size())) { 70 74 downloads.get(currentDownload).start(); 75 }else if (state == State.RUNNING) { 76 state = State.LAST_FILE_DOWNLOADED; 77 notifyListener(); 71 78 } else { 72 79 notifyListener(); … … 75 82 76 83 private int getTimeElapsed() { 77 int total = (int) (new Date().getTime() - startMS) 78 / 1000; 84 int total = (int) (new Date().getTime() - startMS) / 1000; 79 85 return total; 80 86 } -
AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
r637 r638 99 99 private JLabel lblPlatformVal; 100 100 private JLabel lblPackageNumberVal; 101 private JLabel lblVersionNumberVal; 101 102 private HTMLLinkLabel lblDescriptionVal; 102 103 … … 565 566 lblPlatformVal.setText(""); 566 567 lblPackageNumberVal.setText(""); 568 lblVersionNumberVal.setText(""); 567 569 if (m != null) { 568 570 lblSubmitterVal.setText(m.getName()); … … 579 581 lblPlatformVal.setText(m.getPlatform().toString()); 580 582 lblPackageNumberVal.setText(m.getPackageNumberString()); 583 lblVersionNumberVal.setText(m.getVersion()); 581 584 } 582 585 } -
AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
r631 r638 79 79 - JLabel(name=lblPackageNumber, text=lblPackageNumber.text) 80 80 - JLabel(name=lblPackageNumberVal) 81 - JLabel(name=lblVersionNumber, text=lblVersionNumber.text) 82 - JLabel(name=lblVersionNumberVal) 81 83 - JLabel(name=lblDescription, text=lblDescription.text) 82 84 - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded): … … 89 91 >lblPlatform lblPlatformVal [min] 90 92 >lblPackageNumber lblPackageNumberVal [min] 93 >lblVersionNumber lblVersionNumberVal [min] 91 94 >^lblDescription scrollDescription [grow] 92 95 - MigLayout: -
AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java
r629 r638 4 4 import java.util.TreeSet; 5 5 6 import javax.swing.JButton; 6 7 import javax.swing.JDialog; 7 8 import javax.swing.JLabel; … … 36 37 private JLabel lblRateVal; 37 38 private JProgressBar progress; 39 40 private JButton btnAbort; 38 41 39 42 private ModDownloader downloader; … … 87 90 close(); 88 91 } else { 92 if (state == State.LAST_FILE_DOWNLOADED) 93 btnAbort.setEnabled(false); 94 89 95 progress.setValue(bytesDown); 90 96 progress.setToolTipText(String.format("%d / %d files downloaded", -
AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java
r637 r638 59 59 case 5: 60 60 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); 61 return sdf 62 .format(new Date(mod.getFile().getTimestamp() * 1000)); 61 if (mod.getFile() != null) 62 return sdf.format(new Date( 63 mod.getFile().getTimestamp() * 1000)); 64 else 65 return null; 63 66 } 64 67 return null; -
AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
r632 r638 47 47 lblPlatform.text=Platform: 48 48 lblPackageNumber.text=Package number: 49 lblVersionNumber.text=Version number: 49 50 lblFiles.text=Number of files: 50 51 lblDescription.text=Description:
Note:
See TracChangeset
for help on using the changeset viewer.