Skip to content

Commit 9d5b273

Browse files
committed
Fix the validation order
1 parent e4239c8 commit 9d5b273

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

src/main/java/com/junichi11/netbeans/modules/github/issues/repository/GitHubRepositoryController.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,20 @@ private GitHubRepositoryPanel getPanel() {
148148
"GithubRepositoryController.label.repositoryName=Repository Name",})
149149
private void validate() {
150150
GitHubRepositoryPanel repositoryPanel = getPanel();
151+
if (!repositoryPanel.isPropertyFile()) {
152+
// oauth token
153+
if (StringUtils.isEmpty(repositoryPanel.getOAuthToken())) {
154+
errorMessage = Bundle.GithubRepositoryController_message_empty_error(Bundle.GithubRepositoryController_label_oauthToken());
155+
return;
156+
}
157+
158+
// user name
159+
if (StringUtils.isEmpty(repositoryPanel.getUserName())) {
160+
errorMessage = Bundle.GithubRepositoryController_message_empty_error(Bundle.GithubRepositoryController_label_userName());
161+
return;
162+
}
163+
}
164+
151165
// display name
152166
String displayName = repositoryPanel.getDisplayName();
153167
if (StringUtils.isEmpty(displayName)) {
@@ -169,20 +183,6 @@ private void validate() {
169183
}
170184
}
171185

172-
if (!repositoryPanel.isPropertyFile()) {
173-
// user name
174-
if (StringUtils.isEmpty(repositoryPanel.getUserName())) {
175-
errorMessage = Bundle.GithubRepositoryController_message_empty_error(Bundle.GithubRepositoryController_label_userName());
176-
return;
177-
}
178-
179-
// oauth token
180-
if (StringUtils.isEmpty(repositoryPanel.getOAuthToken())) {
181-
errorMessage = Bundle.GithubRepositoryController_message_empty_error(Bundle.GithubRepositoryController_label_oauthToken());
182-
return;
183-
}
184-
}
185-
186186
// repository
187187
if (StringUtils.isEmpty(repositoryPanel.getRepositoryAuthor())) {
188188
errorMessage = Bundle.GithubRepositoryController_message_empty_error(Bundle.GithubRepositoryController_label_repositoryAuthor());

0 commit comments

Comments
 (0)