From cde5c0f2bced6579f980ca09a633786c8c372551 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 12 Nov 2008 13:59:58 +0000
Subject: [PATCH] [244051] JJ: Environment Variables property page allows
 duplicates (apply patch from Justin Lin)

---
 .../rse/ui/widgets/EnvironmentVariablesForm.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java
index e687381943b..f30eda246c9 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/EnvironmentVariablesForm.java
@@ -12,7 +12,8 @@
  * 
  * Contributors:
  * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType 
- * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty() 
+ * Martin Oberhuber (Wind River) - [186640] Add IRSESystemType.testProperty()
+ * Justin Lin (IBM) - [244051] JJ: Environment Variables property page allows duplicates...
  ********************************************************************************/
 
 package org.eclipse.rse.ui.widgets;
@@ -591,16 +592,15 @@ public class EnvironmentVariablesForm extends SystemBaseForm implements Selectio
 				}
 						
 				// next check for duplicate env var names
-				int numberFound = 0;
 				int itemCount = envVarTable.getItemCount();
 				for (int i = 0; i < itemCount; i++) {
 					TableItem item = envVarTable.getItem(i);
 					String itemName = item.getText(0);
-					if (itemName.equals(name)) numberFound++;
-				}
-				if (numberFound > 1) {
-					msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_ENVVAR_DUPLICATE);
-					msg.makeSubstitution(name);
+					if (itemName.equals(name) && i != envVarTable.getSelectionIndex()) {
+						msg = RSEUIPlugin.getPluginMessage(ISystemMessages.MSG_COMM_ENVVAR_DUPLICATE);
+						msg.makeSubstitution(name);
+						break;
+					}
 				}
 			}					
 		}