[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config ...

[Robert Stryker]

  User: rawb    
  Date: 06/09/06 15:35:38

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config 
                        JBossLaunchConfigurationTabGroup.java
  Log:
  Removed requirement for unchanging host
  
  Revision  Changes    Path
  1.8       +18 -13    jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config/JBossLaunchConfigurationTabGroup.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossLaunchConfigurationTabGroup.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config/JBossLaunchConfigurationTabGroup.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- JBossLaunchConfigurationTabGroup.java	29 Aug 2006 16:49:06 -0000	1.7
  +++ JBossLaunchConfigurationTabGroup.java	6 Sep 2006 19:35:38 -0000	1.8
  @@ -651,25 +651,30 @@
   			return isHostAndConfigValid();
   		}
   
  +		// Host requirement has been removed
   		private boolean isHostAndConfigValid() {
   			String progArgs = fPrgmArgumentsText.getText();
   			String workingConfig = RuntimeConfigUtil.getCommandArgument(progArgs, "-c", "--configuration");
  -			String workingHost = RuntimeConfigUtil.getCommandArgument(progArgs, "-b", "--host");
  +			//String workingHost = RuntimeConfigUtil.getCommandArgument(progArgs, "-b", "--host");
   
   			String oldConfig = RuntimeConfigUtil.getCommandArgument(originalProgramArgs, "-c", "--configuration");
  -			String oldHost = RuntimeConfigUtil.getCommandArgument(originalProgramArgs, "-b", "--host");
  +			//String oldHost = RuntimeConfigUtil.getCommandArgument(originalProgramArgs, "-b", "--host");
   			
  -			if( oldConfig == null || oldHost == null ) return true;
  -			
  -			boolean valid = true;
  -			if( !workingHost.equals(oldHost)) {
  -				valid = false;
  -			}
  -			if( !workingConfig.equals(oldConfig)) {
  -				valid = false;
  -			}
  +			if( oldConfig != null && !workingConfig.equals(oldConfig)) return false;
  +			return true;
   
  -			return valid;
  +//			if( oldConfig == null || oldHost == null ) return true;
  +//			
  +//			boolean valid = true;
  +//			
  +//			if( !workingHost.equals(oldHost)) {
  +//				valid = false;
  +//			}
  +//			if( !workingConfig.equals(oldConfig)) {
  +//				valid = false;
  +//			}
  +//
  +//			return valid;
   		}
   		public boolean isValid(ILaunchConfiguration config) {
   			boolean sup = super.isValid(config);
  @@ -679,7 +684,7 @@
   				
   				boolean valid = isHostAndConfigValid();
   				if( !valid ) {
  -					setErrorMessage("You may not change the configuration directory or the host in this fashion.");
  +					setErrorMessage("You may not change the configuration.");
   					//getLaunchConfigurationDialog().updateButtons();
   					return false;
   				}