From 3a33c4bdfbb0c9afabb0acd20a301c57baaf4283 Mon Sep 17 00:00:00 2001 From: Jakub Valtar Date: Mon, 28 Sep 2015 17:15:31 -0400 Subject: [PATCH] CM - fix NPE related to restart button --- app/src/processing/app/contrib/ContributionTab.java | 7 +++++-- app/src/processing/app/contrib/DetailPanel.java | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/processing/app/contrib/ContributionTab.java b/app/src/processing/app/contrib/ContributionTab.java index 9e005bc40..b10801ca4 100644 --- a/app/src/processing/app/contrib/ContributionTab.java +++ b/app/src/processing/app/contrib/ContributionTab.java @@ -46,11 +46,11 @@ public class ContributionTab extends JPanel { Contribution.Filter filter; JComboBox categoryChooser; - JScrollPane scrollPane; ListPanel contributionListPanel; StatusPanel statusPanel; FilterField filterField; - JButton restartButton; + // TODO: remove or initialize restartButton + //JButton restartButton; JLabel categoryLabel; JLabel loaderLabel; @@ -200,6 +200,9 @@ public class ContributionTab extends JPanel { }); filterField = new FilterField(); + + // TODO: initialize restartButton, whatever it is + // restartButton = ??? } diff --git a/app/src/processing/app/contrib/DetailPanel.java b/app/src/processing/app/contrib/DetailPanel.java index 1deab30f0..435bd9658 100644 --- a/app/src/processing/app/contrib/DetailPanel.java +++ b/app/src/processing/app/contrib/DetailPanel.java @@ -164,7 +164,8 @@ class DetailPanel extends JPanel { } } } - listPanel.contributionTab.restartButton.setVisible(toBeRestarted); + // TODO: remove or uncomment if the button was added + //listPanel.contributionTab.restartButton.setVisible(toBeRestarted); } } }; @@ -864,7 +865,8 @@ class DetailPanel extends JPanel { if (isModeActive) { updateButton.setEnabled(true); } else { - listPanel.contributionTab.restartButton.setVisible(true); + // TODO: remove or uncomment if the button was added + //listPanel.contributionTab.restartButton.setVisible(true); } } }; @@ -930,7 +932,8 @@ class DetailPanel extends JPanel { if (isModeActive) { updateButton.setEnabled(true); } else { - contributionTab.restartButton.setVisible(true); + // TODO: remove or uncomment if the button was added + //contributionTab.restartButton.setVisible(true); } } };