From fb062ef825f0f5cdcdfd3459e512d900ce149e09 Mon Sep 17 00:00:00 2001
From: Nikolay Chashnikov <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 1 Sep 2009 13:40:03 +0400
Subject: [PATCH] conversion ui fixes

---
 .../conversion/impl/ConversionServiceImpl.java     | 10 +++---
 .../conversion/impl/ui/StartConversionStep.form    | 24 +++++---------
 .../conversion/impl/ui/StartConversionStep.java    | 38 +++++++++++++++-------
 .../src/messages/IdeBundle.properties              |  9 +----
 4 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java
index d150231b54..e2dc9adbe4 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ConversionServiceImpl.java
@@ -143,7 +143,7 @@ public class ConversionServiceImpl extends ConversionService {
 
   private List<ConversionRunner> getConvertersToRun(final ConversionContextImpl context) throws CannotConvertException {
     final CachedConversionResult conversionResult = loadCachedConversionResult(context.getProjectFile());
-    return createConversionRunners(context, conversionResult.myConverters);
+    return createConversionRunners(context, conversionResult.myAppliedConverters);
   }
 
   private List<ConversionRunner> createConversionRunners(ConversionContextImpl context, final Set<String> performedConversionIds) {
@@ -172,12 +172,13 @@ public class ConversionServiceImpl extends ConversionService {
   private void saveConversionResult(ConversionContextImpl context) {
     final CachedConversionResult conversionResult = loadCachedConversionResult(context.getProjectFile());
     for (ConverterProvider provider : ConverterProvider.EP_NAME.getExtensions()) {
-      conversionResult.myConverters.add(provider.getId());
+      conversionResult.myAppliedConverters.add(provider.getId());
     }
     for (File file : context.getNonExistingModuleFiles()) {
       conversionResult.myNotConvertedModules.add(file.getAbsolutePath());
     }
     final File infoFile = getConversionInfoFile(context.getProjectFile());
+    infoFile.getParentFile().mkdirs();
     try {
       JDOMUtil.writeDocument(new Document(XmlSerializer.serialize(conversionResult)), infoFile, SystemProperties.getLineSeparator());
     }
@@ -267,10 +268,11 @@ public class ConversionServiceImpl extends ConversionService {
     }
   }
 
+  @Tag("conversion")
   public static class CachedConversionResult {
-    @Tag("converters")
+    @Tag("applied-converters")
     @AbstractCollection(surroundWithTag = false, elementTag = "converter", elementValueAttribute = "id")
-    public Set<String> myConverters = new HashSet<String>();
+    public Set<String> myAppliedConverters = new HashSet<String>();
 
     @Tag("not-converted-modules")
     @AbstractCollection(surroundWithTag = false, elementTag = "module", elementValueAttribute = "path")
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.form b/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.form
index cdd556d3c4..3999f13988 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.form
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.form
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.conversion.impl.ui.StartConversionStep">
-  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myMainPanel" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="500" height="400"/>
+      <xy x="20" y="20" width="154" height="400"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
-      <component id="20583" class="javax.swing.JLabel" binding="myTitleLabel">
-        <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties>
-          <text resource-bundle="messages/IdeBundle" key="label.project.has.older.format.the.following.conversions.will.be.performed.text"/>
-        </properties>
-      </component>
       <vspacer id="ed2ab">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <component id="d0f57" class="javax.swing.JLabel" binding="myConvertersDescriptionsLabel">
+      <component id="f024" class="javax.swing.JTextPane" binding="myTextPane">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="50"/>
+          </grid>
         </constraints>
-        <properties>
-          <text value="Label"/>
-        </properties>
+        <properties/>
       </component>
     </children>
   </grid>
diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.java b/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.java
index fc28839da1..ca19163900 100644
--- a/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.java
+++ b/platform/lang-impl/src/com/intellij/conversion/impl/ui/StartConversionStep.java
@@ -1,11 +1,15 @@
 package com.intellij.conversion.impl.ui;
 
-import com.intellij.conversion.impl.ConversionRunner;
 import com.intellij.conversion.impl.ConversionContextImpl;
+import com.intellij.conversion.impl.ConversionRunner;
 import com.intellij.ide.IdeBundle;
+import com.intellij.openapi.ui.Messages;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import javax.swing.text.html.HTMLEditorKit;
 import java.util.List;
 
 /**
@@ -13,19 +17,31 @@ import java.util.List;
  */
 public class StartConversionStep extends AbstractConversionStep {
   private JPanel myMainPanel;
-  private JLabel myConvertersDescriptionsLabel;
-  private JLabel myTitleLabel;
+  private JTextPane myTextPane;
 
-  public StartConversionStep(ConversionContextImpl context, List<ConversionRunner> conversionRunners) {
-    myTitleLabel.setText(IdeBundle.message("label.project.has.older.format.the.following.conversions.will.be.performed.text",
+  public StartConversionStep(ConversionContextImpl context, final List<ConversionRunner> conversionRunners) {
+    JLabel templateLabel = new JLabel();
+    myTextPane.setFont(templateLabel.getFont());
+    myTextPane.setContentType("text/html");
+    myTextPane.setEditorKit(new HTMLEditorKit());
+    myTextPane.setEditable(false);
+    myTextPane.setBackground(templateLabel.getBackground());
+    myTextPane.setForeground(templateLabel.getForeground());
+    myTextPane.setText(IdeBundle.message("label.text.project.has.older.format",
                                            context.getProjectFile().getName()));
 
-    @NonNls StringBuilder descriptions = new StringBuilder("<html>");
-    for (ConversionRunner runner : conversionRunners) {
-      descriptions.append(runner.getProvider().getConversionDescription()).append("<br>");
-    }
-    descriptions.append("</html>");
-    myConvertersDescriptionsLabel.setText(descriptions.toString());
+    myTextPane.addHyperlinkListener(new HyperlinkListener() {
+      public void hyperlinkUpdate(HyperlinkEvent e) {
+        if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+          @NonNls StringBuilder descriptions = new StringBuilder("<html>The following conversions will be performed:<br>");
+          for (ConversionRunner runner : conversionRunners) {
+            descriptions.append(runner.getProvider().getConversionDescription()).append("<br>");
+          }
+          descriptions.append("</html>");
+          Messages.showInfoMessage(descriptions.toString(), IdeBundle.message("dialog.title.convert.project"));
+        }
+      }
+    });
   }
 
   public JComponent getComponent() {
diff --git a/platform/platform-resources-en/src/messages/IdeBundle.properties b/platform/platform-resources-en/src/messages/IdeBundle.properties
index 7107287657..3bf9520a9d 100644
--- a/platform/platform-resources-en/src/messages/IdeBundle.properties
+++ b/platform/platform-resources-en/src/messages/IdeBundle.properties
@@ -250,11 +250,7 @@ error.project.file.is.corrupted=Project file is corrupted
 
 title.cannot.convert.project=Cannot Convert Project
 dialog.title.convert.project=Convert Project
-label.project.has.older.format.text=The project ''{0}'' has an older format.
-label.project.has.older.format.the.following.conversions.will.be.performed.text=<html><body>The project ''{0}'' has an older format. The following conversions will be performed:</body></html>
-label.project.has.older.format.and.will.be.converted.text=<html><body>The project ''{0}'' has an older format. It will be converted to the new format.</body></html>
-radio.convert.project.text=&Convert to the new format now. You will not be able to open the project by earlier versions of IDEA.
-radio.dont.convert.project.text=Convert &later. Some features will be unavailable until you convert the project.
+label.text.project.has.older.format=<html><body>The project ''{0}'' has an older format and will be converted. You will not be able to open the project by earlier versions of IDEA. <a href="details">Details</a></body></html>
 label.text.unlock.read.only.files=The following files are read only. IDEA will unlock them.
 error.message.cannot.make.files.writable=Cannot make the following files writable:\n{0}
 label.text.project.was.succesfully.converted.old.version.was.saved.to.0=<html><body>Your project was succesfully converted. \
@@ -264,9 +260,6 @@ error.some.file.is.corrupted.message=<html><body>File ''{0}'' is corrupted: <br>
 message.files.doesn.t.exists.0.so.the.corresponding.modules.won.t.be.converted.do.you.want.to.continue=<html><body>The following files doesn''t exists: <br>\
   {0}The corresponding modules won''t be converted. Do you want to continue?</body></html>
 
-message.text.this.feature.is.not.available.for.project.in.older.format=<html><body>This feature is not available for project in older format. <br>\
-  Convert your project first (File | Convert Project).</body></html>
-
 select.in.project.settings=Project Structure
 select.in.file.structure=File Structure
 message.nothing.to.show.in.structure.view=Nothing to show in the Structure View
-- 
2.11.4.GIT