[jbosstools-commits] JBoss Tools SVN: r24573 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog.

[jbosstools-commits at lists.jboss.org]

Author: dmaliarevich
Date: 2010-08-31 07:37:39 -0400 (Tue, 31 Aug 2010)
New Revision: 24573

Modified:
   trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java
Log:
https://jira.jboss.org/browse/JBIDE-6945 , initial error message was removed, key value was updated.

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-08-31 09:38:47 UTC (rev 24572)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dialog/ExternalizeStringsWizardPage.java	2010-08-31 11:37:39 UTC (rev 24573)
@@ -108,7 +108,7 @@
 	private Group propsFilesGroup;
 	private Status propsKeyStatus;
 	private Status propsValueStatus;
-	private Status rbComboStatus;
+	private Status duplicateKeyStatus;
 	private Table tagsTable;
 	
 	
@@ -133,7 +133,7 @@
 		}
 		propsKeyStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
 		propsValueStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
-		rbComboStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
+		duplicateKeyStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
 	}
 
 	public void createControl(Composite parent) {
@@ -332,8 +332,6 @@
 			/*
 			 * Update text string field.
 			 * Trim the text to remove line breaks and caret returns.
-			 */
-			/*
 			 * Replace line delimiters white space
 			 */
 			for (char ch : LINE_DELEMITERS) {
@@ -365,6 +363,42 @@
 				}
 			}
 			/*
+			 * Check the initial key value
+			 * If there is the error - add sequence number to the key
+			 */
+			updateDuplicateKeyStatus();
+			while (!duplicateKeyStatus.isOK()) {
+				int index = propsKey.getText().lastIndexOf('_');
+				String newKey = Constants.EMPTY;
+				if (index != -1) {
+					/*
+					 * String sequence at the end should be checked.
+					 * If it is a sequence number - it should be increased by 1.
+					 * If not - new number should be added.
+					 */
+					String numberString =  propsKey.getText().substring(index + 1);
+					int number;
+					try {
+						number = Integer.parseInt(numberString);
+						number++;
+						newKey = propsKey.getText().substring(0, index + 1) + number;
+					} catch (NumberFormatException e) {
+						newKey = propsKey.getText() + "_1"; //$NON-NLS-1$
+					}
+				} else {
+					/*
+					 * If the string has no sequence number - add it.
+					 */
+					newKey = propsKey.getText() + "_1"; //$NON-NLS-1$
+				}
+				/*
+				 * Set the new key text
+				 * Update the key status
+				 */
+				propsKey.setText(newKey);
+				updateDuplicateKeyStatus();
+			}
+			/*
 			 * Update status message.
 			 */
 			updateStatus();
@@ -559,12 +593,12 @@
 	 */
 	private void updateDuplicateKeyStatus() {
 		if (isDuplicatedKey(propsKey.getText())) {
-			rbComboStatus = new Status(
+			duplicateKeyStatus = new Status(
 					IStatus.ERROR,
 					VpePlugin.PLUGIN_ID,
 					VpeUIMessages.EXTERNALIZE_STRINGS_DIALOG_KEY_ALREADY_EXISTS); 
 		} else {
-			rbComboStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
+			duplicateKeyStatus = new Status(IStatus.OK, VpePlugin.PLUGIN_ID, Constants.EMPTY);
 		}
 	}
 
@@ -611,7 +645,7 @@
 		/*
 		 * Apply status to the dialog
 		 */
-		applyStatus(this, new IStatus[] {propsKeyStatus, propsValueStatus, rbComboStatus});
+		applyStatus(this, new IStatus[] {propsKeyStatus, propsValueStatus, duplicateKeyStatus});
 		/*
 		 * Set page complete
 		 */