From c7c672119a80a7873a3a43bc657c9f817f25aed7 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 22 Nov 2011 08:40:42 +0100 Subject: [PATCH 1/2] move invert if intention description to the correct plugin --- .../intentionDescriptions/InvertIfIntention/after.groovy.template | 0 .../InvertIfIntention/before.groovy.template | 0 .../intentionDescriptions/InvertIfIntention/description.html | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename plugins/{IntelliLang/src => groovy/resources}/intentionDescriptions/InvertIfIntention/after.groovy.template (100%) rename plugins/{IntelliLang/src => groovy/resources}/intentionDescriptions/InvertIfIntention/before.groovy.template (100%) rename plugins/{IntelliLang/src => groovy/resources}/intentionDescriptions/InvertIfIntention/description.html (100%) diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/after.groovy.template b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/after.groovy.template similarity index 100% rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/after.groovy.template rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/after.groovy.template diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/before.groovy.template b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/before.groovy.template similarity index 100% rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/before.groovy.template rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/before.groovy.template diff --git a/plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/description.html b/plugins/groovy/resources/intentionDescriptions/InvertIfIntention/description.html similarity index 100% rename from plugins/IntelliLang/src/intentionDescriptions/InvertIfIntention/description.html rename to plugins/groovy/resources/intentionDescriptions/InvertIfIntention/description.html From 3f6abef3aaf496997e049113876e2a59edd83d86 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 22 Nov 2011 11:32:37 +0400 Subject: [PATCH 2/2] IDEA-77316: Replace IDEA->IntelliJ IDEA --- .../com/intellij/conversion/impl/ui/ConvertProjectDialog.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java b/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java index 4df11088be71..bf6306bdde9a 100644 --- a/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java +++ b/platform/lang-impl/src/com/intellij/conversion/impl/ui/ConvertProjectDialog.java @@ -72,7 +72,7 @@ public class ConvertProjectDialog extends DialogWrapper { } else { message.append(IdeBundle.message("conversion.dialog.text.1", context.getProjectFile().getName(), - ApplicationNamesInfo.getInstance().getProductName())); + ApplicationNamesInfo.getInstance().getFullProductName())); } message.append(IdeBundle.message("conversion.dialog.text.2", myBackupDir.getAbsolutePath())); message.append(""); @@ -155,7 +155,7 @@ public class ConvertProjectDialog extends DialogWrapper { List files = getReadOnlyFiles(); if (!files.isEmpty()) { final String message = IdeBundle.message("message.text.unlock.read.only.files", - ApplicationNamesInfo.getInstance().getProductName(), + ApplicationNamesInfo.getInstance().getFullProductName(), getFilesString(files)); final String[] options = {CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText()}; if (Messages.showOkCancelDialog(myMainPanel, message, IdeBundle.message("dialog.title.convert.project"), options[0], options[1], null) != 0) {