mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Ludovic Poitou
23.43.2011 73c704c26d72014de0dd12de1f0c8a21b3e94469
Fix issue OPENDJ-207. setup in CLI mode seems to require GUI (or X server).
Some formatting code was making calls to Font (javax.awt.font) which triggered calls to the Graphic subsystem.
3 files modified
16 ■■■■ changed files
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java 10 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java 3 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java 3 ●●●● patch | view | raw | blame | history
opends/src/quicksetup/org/opends/quicksetup/installer/Installer.java
@@ -2164,9 +2164,11 @@
   * Updates the contents of the provided map with the localized summary
   * strings.
   * @param hmSummary the Map to be updated.
   * @param isCli a boolean to indicate if the install is using CLI or GUI
   */
  protected void initSummaryMap(
      Map<InstallProgressStep, Message> hmSummary)
      Map<InstallProgressStep, Message> hmSummary,
      boolean isCli)
  {
    hmSummary.put(InstallProgressStep.NOT_STARTED,
        getFormattedSummary(INFO_SUMMARY_INSTALL_NOT_STARTED.get()));
@@ -2204,7 +2206,11 @@
    Installation installation = getInstallation();
    String cmd = Utils.addWordBreaks(
        getPath(installation.getControlPanelCommandFile()), 60, 5);
    cmd = UIFactory.applyFontToHtml(cmd, UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
    if (!isCli)
    {
      cmd = UIFactory.applyFontToHtml(cmd,
                    UIFactory.INSTRUCTIONS_MONOSPACE_FONT);
    }
    String formattedPath = Utils.addWordBreaks(
        formatter.getFormattedText(
            Message.raw(getPath(new File(getInstancePath())))).toString(),
opends/src/quicksetup/org/opends/quicksetup/installer/offline/OfflineInstaller.java
@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */
package org.opends.quicksetup.installer.offline;
@@ -443,7 +444,7 @@
   */
  protected void initMaps()
  {
    initSummaryMap(hmSummary);
    initSummaryMap(hmSummary, true);
    /*
     * hmTime contains the relative time that takes for each task to be
opends/src/quicksetup/org/opends/quicksetup/installer/webstart/WebStartInstaller.java
@@ -23,6 +23,7 @@
 *
 *
 *      Copyright 2006-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2011 ForgeRock AS
 */
package org.opends.quicksetup.installer.webstart;
@@ -359,7 +360,7 @@
   */
  private void initMaps()
  {
    initSummaryMap(hmSummary);
    initSummaryMap(hmSummary, false);
    /*
     * hmTime contains the relative time that takes for each task to be