[jbosstools-commits] JBoss Tools SVN: r22878 - in trunk/vpe: tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Jun 18 07:40:47 EDT 2010
Author: dmaliarevich
Date: 2010-06-18 07:40:46 -0400 (Fri, 18 Jun 2010)
New Revision: 22878
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6287 , key generation was updated, escaped symbols were added.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 09:41:13 UTC (rev 22877)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java 2010-06-18 11:40:46 UTC (rev 22878)
@@ -80,6 +80,9 @@
public class ExternalizeStringsWizardPage extends WizardPage {
+ private final char[] REPLACED_CHARACTERS = new char[] {'~', '!', '@', '#',
+ '$', '%', '^', '&', '*', '(', ')', '-', '+', '=', '{', '}', '[', ']', ':', ';', ',', '.', '?', '\\', '/'};
+ private final char[] LINE_DELEMITERS = new char[] {'\r', '\n', '\t'};
private final int DIALOG_WIDTH = 450;
private final int DIALOG_HEIGHT = 650;
private StructuredTextEditor editor;
@@ -330,8 +333,15 @@
* Update text string field.
* Trim the text to remove line breaks and caret returns.
*/
- propsValue.setText(text.trim());
/*
+ * Replace line delimiters white space
+ */
+ for (char ch : LINE_DELEMITERS) {
+ text = text.trim().replace(ch, ' ');
+ }
+ propsValue.setText(text);
+ propsKey.setText(generatePropertyKey(text));
+ /*
* Initialize bundle messages field
*/
if (bm == null) {
@@ -743,4 +753,51 @@
return bm;
}
+ /**
+ * Generate properties key.
+ * Replaces all non-word characters with
+ * underline character.
+ *
+ * @param text the text
+ * @return the result string
+ */
+ public String generatePropertyKey(String text) {
+ String result = text.trim();
+ /*
+ * Replace all other symbols with '_'
+ */
+ for (char ch : REPLACED_CHARACTERS) {
+ result = result.replace(ch, '_');
+ }
+ /*
+ * Replace line delimiters white space
+ */
+ for (char ch : LINE_DELEMITERS) {
+ result = result.replace(ch, ' ');
+ }
+ /*
+ * Replace all white spaces with '_'
+ */
+ result = result.replaceAll(Constants.WHITE_SPACE,
+ Constants.UNDERSCORE);
+ /*
+ * Correct underline symbols:
+ * show only one of them
+ */
+ result = result.replaceAll("_+", Constants.UNDERSCORE); //$NON-NLS-1$
+ /*
+ * Remove leading and trailing '_'
+ */
+ if (result.startsWith(Constants.UNDERSCORE)) {
+ result = result.substring(1);
+ }
+ if (result.endsWith(Constants.UNDERSCORE)) {
+ result = result.substring(0, result.length() - 1);
+ }
+ /*
+ * Return the result
+ */
+ return result;
+ }
+
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-18 09:41:13 UTC (rev 22877)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard/ExternalizeStringsDialogTest.java 2010-06-18 11:40:46 UTC (rev 22878)
@@ -25,6 +25,14 @@
private final String FOLDER_TEXT_LABEL = "Enter or select the parent folder:"; //$NON-NLS-1$
private final String INCORRECT_TABLE_VALUE = "Table value is incorrect"; //$NON-NLS-1$
private final String CANNOT_FIND_PROPERTY_VALUE = "Cannot find 'Property Value' text field"; //$NON-NLS-1$
+ private final String COMPLEX_TEXT = "!! HELLO ~ Input User, Name.Page ?" //$NON-NLS-1$
+ + " \r\n and some more text \r\n" //$NON-NLS-1$
+ + "@ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ " //$NON-NLS-1$
+ + "\t ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
+ private final String COMPLEX_KEY_RESULT = "HELLO_Input_User_Name_Page_and" + //$NON-NLS-1$
+ "_some_more_text_vc_yy_ghg_l_kk_mmm_fdg_df_ee_df_df_ty"; //$NON-NLS-1$
+ private final String COMPLEX_VALUE_RESULT = "!! HELLO ~ Input User, Name.Page ?" + //$NON-NLS-1$
+ " and some more text @ \\# vc \\$ % yy^ &*(ghg ) _l-kk+mmm\\/fdg\\ ;.df:,ee {df}df[ty]"; //$NON-NLS-1$
public ExternalizeStringsDialogTest() {
super();
@@ -64,8 +72,7 @@
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull("Cannot find 'Property Key' text field", defKeyText); //$NON-NLS-1$
- assertText(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_DEFAULT_KEY,
- defKeyText);
+ assertText("User",defKeyText); //$NON-NLS-1$
SWTBotText defValueText = bot.textWithLabelInGroup(
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
@@ -108,8 +115,8 @@
/*
* Check replaced text
*/
- editor.toTextEditor().selectRange(7, 18, 14);
- assertEquals("Replaced text is incorrect", "#{Message.key}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
+ editor.toTextEditor().selectRange(7, 18, 15);
+ assertEquals("Replaced text is incorrect", "#{Message.User}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Check that properties file has been updated
*/
@@ -118,7 +125,7 @@
"Messages.properties"); //$NON-NLS-1$
editor2.toTextEditor().selectLine(3);
String line = editor2.toTextEditor().getSelection();
- assertEquals("'Messages.properties' was updated incorrectly", "key=User", line); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("'Messages.properties' was updated incorrectly", "User=User", line); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testNewFileInExternalizeStringsDialog() throws Throwable {
@@ -167,8 +174,8 @@
/*
* Check that the text was replaced
*/
- editor.toTextEditor().selectRange(7, 12, 7);
- assertEquals("Replaced text is incorrect", "#{.key}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
+ editor.toTextEditor().selectRange(7, 12, 9);
+ assertEquals("Replaced text is incorrect", "#{.Input}", editor.toTextEditor().getSelection()); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Check that properties file has been created
*/
@@ -177,7 +184,7 @@
"externalize.properties"); //$NON-NLS-1$
editor2.toTextEditor().selectLine(1);
String line = editor2.toTextEditor().getSelection();
- assertEquals("Created file is incorrect", "key=Input", line); //$NON-NLS-1$ //$NON-NLS-2$
+ assertEquals("Created file is incorrect", "Input=Input", line); //$NON-NLS-1$ //$NON-NLS-2$
}
public void testEmptySelectionInExternalizeStringsDialog() throws Throwable {
@@ -218,7 +225,7 @@
/*
* Type some text outside the tag
*/
- editor.toTextEditor().typeText(13, 0, "Plain text in the JSP file"); //$NON-NLS-1$
+ editor.toTextEditor().typeText(13, 0, COMPLEX_TEXT);
/*
* Select nothing and call the dialog --
* the whole text should be selected.
@@ -231,13 +238,18 @@
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).setFocus();
bot.shell(VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_TITLE).activate();
/*
- * Check that the property value text is empty
+ * Check that the property key and value text
*/
+ SWTBotText defKeyText = bot.textWithLabelInGroup(
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_KEY,
+ VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
+ assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defKeyText);
+ assertText(COMPLEX_KEY_RESULT, defKeyText);
defValueText = bot.textWithLabelInGroup(
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE,
VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP);
assertNotNull(CANNOT_FIND_PROPERTY_VALUE, defValueText);
- assertText("Plain text in the JSP file", defValueText); //$NON-NLS-1$
+ assertText(COMPLEX_VALUE_RESULT, defValueText);
/*
* Close the dialog
*/
@@ -245,7 +257,7 @@
/*
* Check selection in the attribute's value
*/
- editor.toTextEditor().selectRange(18, 50, 0);
+ editor.toTextEditor().selectRange(22, 50, 0);
/*
* Activate the dialog
*/
More information about the jbosstools-commits
mailing list