diff options
| author | Reinier Zwitserloot <reinier@tipit.to> | 2009-07-20 21:55:29 +0200 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@tipit.to> | 2009-07-20 21:55:29 +0200 |
| commit | 14195c50740ff2c5881c8a342fb64126e9c85f95 (patch) | |
| tree | 8528d678e7c7e44ddce015a953d48c7b71b39ee3 /src/lombok/installer | |
| parent | c0c0f90eb72aebdfa4d2d6bd975b1918139bc83c (diff) | |
| download | lombok-14195c50740ff2c5881c8a342fb64126e9c85f95.tar.gz lombok-14195c50740ff2c5881c8a342fb64126e9c85f95.tar.bz2 lombok-14195c50740ff2c5881c8a342fb64126e9c85f95.zip | |
Worked on the installer so that it's vertically a lot smaller, and at least according to Roel, it looks better too.
Diffstat (limited to 'src/lombok/installer')
| -rw-r--r-- | src/lombok/installer/Installer.java | 44 | ||||
| -rw-r--r-- | src/lombok/installer/lombok.png | bin | 47483 -> 24994 bytes |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/lombok/installer/Installer.java b/src/lombok/installer/Installer.java index be746df7..6f8a4c32 100644 --- a/src/lombok/installer/Installer.java +++ b/src/lombok/installer/Installer.java @@ -92,6 +92,7 @@ public class Installer { private List<EclipseLocation> toUninstall; private JHyperLink uninstallButton; + private JLabel uninstallPlaceholder; private JButton installButton; public static void main(String[] args) { @@ -259,17 +260,18 @@ public class Installer { container.setLayout(new GridBagLayout()); GridBagConstraints constraints = new GridBagConstraints(); constraints.anchor = GridBagConstraints.WEST; + constraints.insets = new Insets(8, 0, 0, 16); container.add(new JLabel(JAVAC_TITLE), constraints); constraints.gridy = 1; - constraints.insets = new Insets(8, 0, 0, 16); + constraints.weightx = 1.0; + constraints.fill = GridBagConstraints.HORIZONTAL; container.add(new JLabel(JAVAC_EXPLANATION), constraints); JLabel example = new JLabel(JAVAC_EXAMPLE); constraints.gridy = 2; - constraints.insets = new Insets(8, 0, 0, 16); container.add(example, constraints); return container; } @@ -281,10 +283,10 @@ public class Installer { GridBagConstraints constraints = new GridBagConstraints(); constraints.anchor = GridBagConstraints.WEST; + constraints.insets = new Insets(8, 0, 0, 16); container.add(new JLabel(ECLIPSE_TITLE), constraints); constraints.gridy = 1; - constraints.insets = new Insets(8, 0, 0, 16); container.add(new JLabel(ECLIPSE_EXPLANATION), constraints); constraints.gridy = 2; @@ -430,7 +432,17 @@ public class Installer { constraints.gridy = 5; constraints.fill = GridBagConstraints.NONE; + JHyperLink showMe = new JHyperLink("Show me what this installer will do to my Eclipse installation."); + container.add(showMe, constraints); + showMe.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { + showWhatIDo(); + } + }); + + constraints.gridy = 6; uninstallButton = new JHyperLink("Uninstall lombok from selected Eclipse installations."); + uninstallPlaceholder = new JLabel("<html> </html>"); uninstallButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { List<EclipseLocation> locationsToUninstall = new ArrayList<EclipseLocation>(); @@ -448,15 +460,9 @@ public class Installer { } }); container.add(uninstallButton, constraints); + uninstallPlaceholder.setVisible(false); + container.add(uninstallPlaceholder, constraints); - constraints.gridy = 6; - JHyperLink showMe = new JHyperLink("Show me what this installer will do to my Eclipse installation."); - container.add(showMe, constraints); - showMe.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { - showWhatIDo(); - } - }); return container; } @@ -594,6 +600,7 @@ public class Installer { } uninstallButton.setVisible(uninstallAvailable); + uninstallPlaceholder.setVisible(!uninstallAvailable); installButton.setEnabled(installAvailable); } @@ -665,7 +672,6 @@ public class Installer { private void buildChrome(Container appWindowContainer) { JLabel leftGraphic = new JLabel(new ImageIcon(Installer.class.getResource("/lombok/installer/lombok.png"))); - JLabel topGraphic = new JLabel(new ImageIcon(Installer.class.getResource("/lombok/installer/lombokText.png"))); GridBagConstraints constraints = new GridBagConstraints(); @@ -677,23 +683,17 @@ public class Installer { constraints.gridy = 0; constraints.insets = new Insets(8, 8, 8, 8); appWindowContainer.add(leftGraphic,constraints); + constraints.insets = new Insets(0, 0, 0, 0); constraints.gridx++; - constraints.gridheight = 1; - constraints.fill = GridBagConstraints.NONE; - constraints.ipadx = 40; - constraints.ipady = 64; - appWindowContainer.add(topGraphic, constraints); - constraints.gridy++; + constraints.gridheight = 1; + constraints.fill = GridBagConstraints.HORIZONTAL; constraints.ipadx = 16; - constraints.ipady = 16; + constraints.ipady = 14 ; appWindowContainer.add(javacArea, constraints); constraints.gridy++; - constraints.weightx = 1; - constraints.weighty = 1; - constraints.fill = GridBagConstraints.BOTH; appWindowContainer.add(eclipseArea, constraints); appWindowContainer.add(uninstallArea, constraints); diff --git a/src/lombok/installer/lombok.png b/src/lombok/installer/lombok.png Binary files differindex f2edb700..d4efde04 100644 --- a/src/lombok/installer/lombok.png +++ b/src/lombok/installer/lombok.png |
