[jbosstools-commits] JBoss Tools SVN: r3019 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2007-08-09 13:28:13 -0400 (Thu, 09 Aug 2007)
New Revision: 3019

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
graying boxes as per max's request. also changing default server/runtime name to include version. 

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java	2007-08-09 17:07:55 UTC (rev 3018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java	2007-08-09 17:28:13 UTC (rev 3019)
@@ -180,8 +180,18 @@
 				"c:/program files/jboss-" + getRuntimeVersionId() + ".x" : 
 				"/usr/bin/jboss-" + getRuntimeVersionId() + ".x");
 	}
+	
+	public String getVersion() {
+		IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+		String id = rt.getRuntimeType().getId();
+		if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) return "3.2";
+		else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) return "4.0";
+		else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) return "4.2";
+		return ""; // default
+	}
+
 	private String generateNewRuntimeName() {
-		String base = "JBoss-runtime";
+		String base = "JBoss " + getVersion() + " runtime";
 		IRuntime rt = ServerCore.findRuntime(base);
 		if( rt == null ) return base;
 		

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java	2007-08-09 17:07:55 UTC (rev 3018)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java	2007-08-09 17:28:13 UTC (rev 3019)
@@ -141,6 +141,15 @@
 		else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
 		return JBossServerUISharedImages.getImageDescriptor(imageKey);
 	}
+	
+	public String getVersion() {
+		IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
+		String id = rt.getRuntimeType().getId();
+		if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) return "3.2";
+		else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) return "4.0";
+		else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) return "4.2";
+		return ""; // default
+	}
 
 	private void createExplanationLabel(Composite main) {
 		explanationLabel = new Label(main, SWT.NONE);
@@ -193,7 +202,7 @@
 	}
 	
 	private String getDefaultNameText() {
-		String base = "JBoss-server";
+		String base = "JBoss " + getVersion() + " server";
 		if( findServer(base) == null ) return base;
 		int i = 1;
 		while( ServerCore.findServer(base + " " + i) != null ) 
@@ -227,7 +236,7 @@
 		homeDirLabel.setText(Messages.wizardFragmentHomeDirLabel);
 		
 		homeDirText = new Text(homeDirComposite, SWT.BORDER);
-		homeDirText.setEditable(false);
+		homeDirText.setEnabled(false);
 		
 		// Set Layout Data
 		FormData labelData = new FormData();
@@ -289,6 +298,7 @@
 		cData.left = new FormAttachment(0,5);
 		cData.right = new FormAttachment(100,-5);
 		cData.top = new FormAttachment(jreComposite, 5);
+		cData.bottom = new FormAttachment(100, -5);
 		configComposite.setLayoutData(cData);
 
 		configComposite.setLayout(new FormLayout());
@@ -299,7 +309,7 @@
 		configLabel.setText("Configuration");
 		
 		configText = new Text(configComposite, SWT.BORDER);
-		configText.setEditable(false);
+		configText.setEnabled(false);
 		
 		// Set Layout Data
 		FormData labelData = new FormData();