//----------------------------------------------------------------------------//
//                                                                            //
//                             A u d i v e r i s                              //
//                                                                            //
//----------------------------------------------------------------------------//
// <editor-fold defaultstate="collapsed" desc="hdr">                          //
//  Copyright (C) Herve Bitteur 2000-2009. All rights reserved.               //
//  This software is released under the GNU General Public License.           //
//  Please contact users@audiveris.dev.java.net to report bugs & suggestions. //
//----------------------------------------------------------------------------//
// </editor-fold>
import java.io.File;
import java.net.URISyntaxException;

/**
 * Class <code>Audiveris</code> is simply the entry point to OMR, which
 * delegates the call to {@link omr.Main#main}.
 * <p>Note that a few initial operations are performed here, because they need
 * to be done before any other class is loaded.
 *
 * @author Herv&eacute; Bitteur
 * @version $Id$
 */
public final class Audiveris
{
    //~ Static fields/initializers ---------------------------------------------

    /** Name of the config folder */
    private static final String CONFIG_FOLDER_NAME = "config";

    /** Default name for the logging configuration file */
    private static final String LOGGING_CONFIG_NAME = "logging.properties";

    /** Classes container, beware of escaped blanks */
    private static final File classContainer;

    static {
        try {
            classContainer = new File(
                Audiveris.class.getProtectionDomain().getCodeSource().getLocation().toURI());
        } catch (URISyntaxException ex) {
            System.err.println("Cannot decode container, " + ex);
            throw new RuntimeException(ex);
        }
    }

    /** Installation folder is 2 folders higher than the container */
    // .../build/classes when running from classes files
    // .../dist/audiveris.jar when running from the jar archive
    private static final File homeFolder = classContainer.getParentFile()
                                                         .getParentFile();

    /** Config folder */
    private static final File configFolder = new File(
        homeFolder,
        CONFIG_FOLDER_NAME);

    static {
        /** Workaround for Swing performance problem in java 1.6.0 u10&11 */
        //System.setProperty("sun.java2d.d3d", "false");

        /** Turn off JAI native acceleration */
        System.setProperty("com.sun.media.jai.disableMediaLib", "true");

        /** Default logging configuration file (if none already defined) */
        String LOGGING_KEY = "java.util.logging.config.file";

        if (System.getProperty(LOGGING_KEY) == null) {
            System.setProperty(
                LOGGING_KEY,
                new File(configFolder, LOGGING_CONFIG_NAME).toString());
        }
    }

    //~ Constructors -----------------------------------------------------------

    //-----------//
    // Audiveris //
    //-----------//
    /** To avoid instantiation */
    private Audiveris ()
    {
    }

    //~ Methods ----------------------------------------------------------------

    //------//
    // main //
    //------//
    /**
     * The main entry point, which just calls {@link omr.Main#main}
     *
     * @param args These args are simply passed to Main
     */
    public static void main (final String[] args)
    {
        omr.Main.main(classContainer, homeFolder, configFolder, args);
    }
}

@@ -2536,18 +2536,16 @@
         
-//
 System.s

Rollback regarding sun.java2d.d3d, since performance problems are still there