Author: dazarov Date: 2008-11-10 12:08:03 -0500 (Mon, 10 Nov 2008) New Revision: 11642 Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java Log: https://jira.jboss.org/jira/browse/JBDS-455 Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-11-10 16:37:32 UTC (rev 11641) +++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/src/org/jboss/tools/jst/firstrun/JBossASAdapterInitializer.java 2008-11-10 17:08:03 UTC (rev 11642) @@ -133,15 +133,17 @@ if(namePosition < 0) break; // server type - position = str.indexOf(",",namePosition+1); + int typePosition = str.indexOf(",",namePosition+1); if(position < 0) break; - String name = str.substring(namePosition+1,position).trim(); + String name = str.substring(namePosition+1,typePosition).trim(); // server version - int versionPosition = str.indexOf(",",position+1); + int versionPosition = str.indexOf(",",typePosition+1); if(versionPosition < 0) break; + String type = str.substring(typePosition+1,versionPosition).trim(); + // server location position = str.indexOf(",",versionPosition+1); if(position < 0) break; @@ -149,15 +151,17 @@ String version = str.substring(versionPosition+1,position); int index = 0; - - if(version.startsWith("3.2")) - index = 0; - else if(version.startsWith("4.0")) - index = 1; - else if(version.startsWith("4.2")) + if(type.startsWith("AS")){ + if(version.startsWith("3.2")) + index = 0; + else if(version.startsWith("4.0")) + index = 1; + else if(version.startsWith("4.2")) + index = 2; + else if(version.startsWith("5.0")) + index = 3; + }else index = 2; - else if(version.startsWith("5.0")) - index = 3; int next = str.indexOf("server",position+1);