Commits

Anonymous committed f9faf85 Draft Merge
  • Participants
  • Parent commits 22cb37d, 7165d16

Comments (0)

Files changed (3)

File jira/src/org/netbeans/modules/jira/issue/CommentsPanel.java

 import org.netbeans.modules.bugtracking.commons.UIUtils;
 import org.netbeans.modules.jira.Jira;
 import org.netbeans.modules.jira.kenai.KenaiRepository;
+import org.netbeans.modules.jira.repository.JiraConfiguration;
 import org.netbeans.modules.team.spi.TeamAccessorUtils;
 import org.openide.util.NbBundle;
 import org.openide.util.RequestProcessor;
             Jira.LOG.log(Level.INFO, null, nfex);
         }
         String description = issue.getFieldValue(NbJiraIssue.IssueField.DESCRIPTION);
-        String reporter = issue.getRepository().getConfiguration().getUser(issue.getFieldValue(NbJiraIssue.IssueField.REPORTER)).getFullName();
+        JiraConfiguration rc = issue.getRepository().getConfiguration();
+        String reporter = rc != null ? rc.getUser(issue.getFieldValue(NbJiraIssue.IssueField.REPORTER)).getFullName() : ""; // NOI18N
         NbJiraIssue.Comment[] comments = issue.getComments();
         this.sections = new ArrayList<>(comments.length);
         sections.add(addSection(

File maven/src/org/netbeans/modules/maven/nodes/OtherRootNodeFactory.java

 import org.netbeans.modules.maven.NbMavenProjectImpl;
 import org.netbeans.modules.maven.api.NbMavenProject;
 import org.netbeans.api.project.Project;
+import org.netbeans.api.queries.VisibilityQuery;
 import org.netbeans.spi.project.ui.support.NodeFactory;
 import org.netbeans.spi.project.ui.support.NodeList;
 import org.openide.filesystems.FileAttributeEvent;
                 // the content of OtherRoots can change from keys() to node(String)
                 if (fls.length > 0 && fls[0].getParentFile() != null) {
                     FileObject fo = FileUtil.toFileObject(fls[0].getParentFile());
-                    return new OthersRootNode(project, false, fo);
+                    if(VisibilityQuery.getDefault().isVisible(fo)) {
+                        return new OthersRootNode(project, false, fo);
+                    }
                 }
                 return null;
             } else if (KEY_OTHER_TEST.equals(key)) {
                 // the content of OtherRoots can change from keys() to node(String)
                 if (fls.length > 0 && fls[0].getParentFile() != null) {
                     FileObject fo = FileUtil.toFileObject(fls[0].getParentFile());
-                    return new OthersRootNode(project, true, fo);
+                    if(VisibilityQuery.getDefault().isVisible(fo)) {
+                        return new OthersRootNode(project, true, fo);
+                    }
                 }
                 return null;
             }

File odcs.tasks/src/org/netbeans/modules/odcs/tasks/issue/IssuePanel.java

 
             @Override
             protected boolean storeValue () {
-                int value = ((Number) privateEstimateField.getValue()).intValue();
+                Object valueObj = privateEstimateField.getValue();
+                int value = valueObj instanceof Number ? ((Number) valueObj).intValue() : 0;
                 if (value != issue.getEstimate()) {
                     issue.setTaskEstimate(value, false);
                     return true;