[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core ...

[Robert Stryker]

  User: rawb    
  Date: 06/07/12 23:57:15

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core 
                        JBossServerCorePreferences.java
  Log:
  max timeout defaults to value in plugin.xml if no preference max is found. 
  
  Revision  Changes    Path
  1.2       +24 -1     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePreferences.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerCorePreferences.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePreferences.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- JBossServerCorePreferences.java	10 Jul 2006 15:42:03 -0000	1.1
  +++ JBossServerCorePreferences.java	13 Jul 2006 03:57:15 -0000	1.2
  @@ -2,6 +2,9 @@
   
   import org.eclipse.core.runtime.Preferences;
   import org.eclipse.wst.server.core.IModule;
  +import org.eclipse.wst.server.core.IServerType;
  +import org.eclipse.wst.server.core.ServerCore;
  +import org.eclipse.wst.server.core.internal.ServerType;
   import org.jboss.ide.eclipse.as.core.server.JBossServer;
   
   public class JBossServerCorePreferences {
  @@ -9,6 +12,7 @@
   	public static JBossServerCorePreferences getDefault() {
   		if( prefs == null ) {
   			prefs = new JBossServerCorePreferences();
  +			setMaxTimeout();
   		}
   		return prefs;
   	}
  @@ -17,6 +21,25 @@
   	public JBossServerCorePreferences() {
   	}
   	
  +	public static void setMaxTimeout() {
  +		IServerType[] types = ServerCore.getServerTypes();
  +		int maxStart = 0;
  +		int maxStop = 0;
  +
  +		for( int i = 0; i < types.length; i++ ) {
  +			if( types[i].getId().equals("org.jboss.ide.eclipse.as.40") || 
  +					types[i].getId().equals("org.jboss.ide.eclipse.as.32") ) {
  +				if( ((ServerType)types[i]).getStartTimeout() > maxStart ) {
  +					maxStart = ((ServerType)types[i]).getStartTimeout();
  +				}
  +				if( ((ServerType)types[i]).getStopTimeout() > maxStart ) {
  +					maxStop = ((ServerType)types[i]).getStopTimeout();
  +				}
  +			}
  +		}
  +		MAX_TIMEOUT = (maxStart > maxStop ? maxStart : maxStop );
  +	}
  +	
   	
   	public static final int NO_CLIENT_ACTION = 0;
   	public static final int VERIFY_CLIENT_ACTION = 1;
  @@ -29,7 +52,7 @@
   	 * Get the preferences for that plugin from preferneces.
   	 * If not set, use the max.
   	 */
  -	public static final int MAX_TIMEOUT = 180000;
  +	protected static int MAX_TIMEOUT;
   	public static final String START_TIMEOUT = "_START_TIMEOUT_";
   	public static final String STOP_TIMEOUT = "_STOP_TIMEOUT_";