This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 136354
Collapse All | Expand All

(-)a/core.startup/src/org/netbeans/core/startup/ModuleList.java (-4 / +5 lines)
Lines 1-7 Link Here
1 
/*
 1 
/*
2 
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 2 
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3 
 *
 3 
 *
4 
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 4 
 * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
5 
 *
 5 
 *
6 
 * The contents of this file are subject to the terms of either the GNU
 6 
 * The contents of this file are subject to the terms of either the GNU
7 
 * General Public License Version 2 only ("GPL") or the Common
 7 
 * General Public License Version 2 only ("GPL") or the Common
Lines 24-30 Link Here
24 
 * Contributor(s):
 24 
 * Contributor(s):
25 
 *
 25 
 *
26 
 * The Original Software is NetBeans. The Initial Developer of the Original
 26 
 * The Original Software is NetBeans. The Initial Developer of the Original
27 
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 27 
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
28 
 * Microsystems, Inc. All Rights Reserved.
 28 
 * Microsystems, Inc. All Rights Reserved.
29 
 *
 29 
 *
30 
 * If you wish your version of this file to be governed by only the CDDL
 30 
 * If you wish your version of this file to be governed by only the CDDL
Lines 430-437 Link Here
430 
            LOG.log(Level.WARNING, null, ie);
 430 
            LOG.log(Level.WARNING, null, ie);
431 
            Module bad = ie.getModule();
 431 
            Module bad = ie.getModule();
432 
            if (bad == null) throw new IllegalStateException();
 432 
            if (bad == null) throw new IllegalStateException();
433 
            ev.log(Events.FAILED_INSTALL_NEW_UNEXPECTED, bad, ie);
 433 
            Set<Module> affectedModules = mgr.getModuleInterdependencies (bad, true, true);
434 
            modules.remove(bad);
 434 
            ev.log(Events.FAILED_INSTALL_NEW_UNEXPECTED, bad, affectedModules, ie);
435 
            modules.removeAll (affectedModules);
435 
            // Try again without it. Note that some other dependent modules might
 436 
            // Try again without it. Note that some other dependent modules might
436 
            // then be in the missing list for the second round.
 437 
            // then be in the missing list for the second round.
437 
            installNew(modules);
 438 
            installNew(modules);
(-)a/core.startup/src/org/netbeans/core/startup/NbEvents.java (-5 / +9 lines)
Lines 1-7 Link Here
1 
/*
 1 
/*
2 
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 2 
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3 
 *
 3 
 *
4 
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 4 
 * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
5 
 *
 5 
 *
6 
 * The contents of this file are subject to the terms of either the GNU
 6 
 * The contents of this file are subject to the terms of either the GNU
7 
 * General Public License Version 2 only ("GPL") or the Common
 7 
 * General Public License Version 2 only ("GPL") or the Common
Lines 24-30 Link Here
24 
 * Contributor(s):
 24 
 * Contributor(s):
25 
 *
 25 
 *
26 
 * The Original Software is NetBeans. The Initial Developer of the Original
 26 
 * The Original Software is NetBeans. The Initial Developer of the Original
27 
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 27 
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun
28 
 * Microsystems, Inc. All Rights Reserved.
 28 
 * Microsystems, Inc. All Rights Reserved.
29 
 *
 29 
 *
30 
 * If you wish your version of this file to be governed by only the CDDL
 30 
 * If you wish your version of this file to be governed by only the CDDL
Lines 45-50 Link Here
45 
import java.awt.Dimension;
 45 
import java.awt.Dimension;
46 
import java.io.File;
 46 
import java.io.File;
47 
import java.text.MessageFormat;
 47 
import java.text.MessageFormat;
48 
import java.util.ArrayList;
48 
import java.util.Collection;
 49 
import java.util.Collection;
49 
import java.util.Collections;
 50 
import java.util.Collections;
50 
import java.util.List;
 51 
import java.util.List;
Lines 164-180 Link Here
164 
            setStatusText("");
 165 
            setStatusText("");
165 
        } else if (message == FAILED_INSTALL_NEW_UNEXPECTED) {
 166 
        } else if (message == FAILED_INSTALL_NEW_UNEXPECTED) {
166 
            Module m = (Module)args[0];
 167 
            Module m = (Module)args[0];
167 
            // ignore args[1]: InvalidException
 168 
            List<Module> modules = new ArrayList<Module> ();
169 
            modules.add (m);
170 
            modules.addAll (NbCollections.checkedSetByCopy((Set) args[1], Module.class, true));
171 
            // ignore args[2]: InvalidException
168 
            {
 172 
            {
169 
                StringBuilder buf = new StringBuilder(NbBundle.getMessage(NbEvents.class, "MSG_failed_install_new_unexpected", m.getDisplayName()));
 173 
                StringBuilder buf = new StringBuilder(NbBundle.getMessage(NbEvents.class, "MSG_failed_install_new_unexpected", m.getDisplayName()));
170 
                NbProblemDisplayer.problemMessagesForModules(buf, Collections.singleton(m), false);
 174 
                NbProblemDisplayer.problemMessagesForModules(buf, modules, false);
171 
                buf.append('\n');
 175 
                buf.append('\n');
172 
                logger.log(Level.INFO, buf.toString());
 176 
                logger.log(Level.INFO, buf.toString());
173 
            }
 177 
            }
174 

          178
          

        

        

          175
          
            {

          179
          
            {

        

        

          176
          
                StringBuilder buf = new StringBuilder(NbBundle.getMessage(NbEvents.class, "MSG_failed_install_new_unexpected", m.getDisplayName()));

          180
          
                StringBuilder buf = new StringBuilder(NbBundle.getMessage(NbEvents.class, "MSG_failed_install_new_unexpected", m.getDisplayName()));

        

          
            

              177
              
                NbProblemDisplayer.problemMessagesForModules(buf, Collections.singleton(m), true);


              181
              
                NbProblemDisplayer.problemMessagesForModules(buf, modules, true);

            

        

          178
          
                notify(buf.toString(), true);

          182
          
                notify(buf.toString(), true);

        

        

          179
          
            }

          183
          
            }

        

        

          180
          
            setStatusText("");

          184
          
            setStatusText("");

        



(-)a/core.startup/src/org/netbeans/core/startup/NbProblemDisplayer.java
      (-3 / +4 lines)




  

    
      
            Lines 1-7
          
      
      
        Link Here
      
    
  

        

          1
          
/*

          1
          
/*

        

        

          2
          
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

          2
          
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

        

        

          3
          
 *

          3
          
 *

        

          
            

              4
              
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.


              4
              
 * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.

            

        

          5
          
 *

          5
          
 *

        

        

          6
          
 * The contents of this file are subject to the terms of either the GNU

          6
          
 * The contents of this file are subject to the terms of either the GNU

        

        

          7
          
 * General Public License Version 2 only ("GPL") or the Common

          7
          
 * General Public License Version 2 only ("GPL") or the Common

        

  

    
      
            Lines 24-30
          
      
      
        Link Here
      
    
  

        

          24
          
 * Contributor(s):

          24
          
 * Contributor(s):

        

        

          25
          
 *

          25
          
 *

        

        

          26
          
 * The Original Software is NetBeans. The Initial Developer of the Original

          26
          
 * The Original Software is NetBeans. The Initial Developer of the Original

        

          
            

              27
              
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun


              27
              
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2008 Sun

            

        

          28
          
 * Microsystems, Inc. All Rights Reserved.

          28
          
 * Microsystems, Inc. All Rights Reserved.

        

        

          29
          
 *

          29
          
 *

        

        

          30
          
 * If you wish your version of this file to be governed by only the CDDL

          30
          
 * If you wish your version of this file to be governed by only the CDDL

        

  

    
      
            Lines 43-48
          
      
      
        Link Here
      
    
  

        

          43
          

          43
          

        

        

          44
          
import java.io.IOException;

          44
          
import java.io.IOException;

        

        

          45
          
import java.text.Collator;

          45
          
import java.text.Collator;

        

            

              
              
              46
              
import java.util.Collection;

            

        

          46
          
import java.util.HashSet;

          47
          
import java.util.HashSet;

        

        

          47
          
import java.util.Iterator;

          48
          
import java.util.Iterator;

        

        

          48
          
import java.util.Set;

          49
          
import java.util.Set;

        

  

    
      
            Lines 181-187
          
      
      
        Link Here
      
    
  

        

          181
          
        }

          182
          
        }

        

        

          182
          
    }

          183
          
    }

        

        

          183
          

          184
          

        

          
            

              184
              
    static void problemMessagesForModules(Appendable writeTo, Set<? extends Module> modules, boolean justRootCause) {


              185
              
    static void problemMessagesForModules(Appendable writeTo, Collection<? extends Module> modules, boolean justRootCause) {

            

        

          185
          
        try {

          186
          
        try {

        

        

          186
          
            HashSet<String> names = new HashSet<String>();

          187
          
            HashSet<String> names = new HashSet<String>();

        

        

          187
          
            for (Module m : modules) {

          188
          
            for (Module m : modules) {

        






  

  Return to bug 136354