9:24 p.m.
Author: rob.stryker(a)jboss.com
Date: 2011-11-08 22:24:10 -0500 (Tue, 08 Nov 2011)
New Revision: 36235
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-10087 - remove invalid widgets for as7 (until config is re-added)
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java
(rev 0)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7ServerWizardFragment.java 2011-11-09
03:24:10 UTC (rev 36235)
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.ui.wizards;
+
+import org.eclipse.swt.widgets.Composite;
+
+public class JBoss7ServerWizardFragment extends JBossServerWizardFragment {
+
+ public JBoss7ServerWizardFragment() {
+ }
+
+ protected void createRuntimeGroup(Composite main) {
+ createRuntimeGroup2(main);
+ fillRuntimeGroupStandard();
+ }
+
+}
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 2011-11-09
02:55:04 UTC (rev 36234)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2011-11-09
03:24:10 UTC (rev 36235)
@@ -108,14 +108,21 @@
}
- private void createRuntimeGroup(Composite main) {
-
+ protected void createRuntimeGroup(Composite main) {
+ createRuntimeGroup2(main);
+ fillRuntimeGroupStandard();
+ fillRuntimeGroupConfig();
+ }
+
+ protected void createRuntimeGroup2(Composite main) {
runtimeGroup = new Group(main, SWT.NONE);
runtimeGroup.setText(Messages.swf_RuntimeInformation);
FormData groupData = UIUtil.createFormData2(serverExplanationLabel, 5, null, 0,
0,5,100,-5);
runtimeGroup.setLayoutData(groupData);
-
runtimeGroup.setLayout(new GridLayout(2, false));
+ }
+
+ protected void fillRuntimeGroupStandard() {
GridData d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
// explanation 2
@@ -141,7 +148,9 @@
jreValLabel = new Label(runtimeGroup, SWT.NONE);
d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
jreValLabel.setLayoutData(d);
-
+ }
+
+ protected void fillRuntimeGroupConfig() {
Label configLocationLabel = new Label(runtimeGroup, SWT.NONE);
configLocationLabel.setText(Messages.swf_ConfigurationLocation);
configLocValLabel = new Label(runtimeGroup, SWT.NONE);
@@ -149,7 +158,7 @@
configLabel = new Label(runtimeGroup, SWT.NONE);
configLabel.setText(Messages.wf_ConfigLabel);
configValLabel = new Label(runtimeGroup, SWT.NONE);
- d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
+ GridData d = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
configValLabel.setLayoutData(d);
}
@@ -201,13 +210,15 @@
if(homeValLabel !=null && !homeValLabel.isDisposed()) {
IJBossServerRuntime srt = getRuntime();
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
- configValLabel.setText(srt.getJBossConfiguration());
execEnvironmentValLabel.setText(srt.getExecutionEnvironment().getDescription());
IVMInstall vm = srt.getHardVM();
String jreVal = vm == null ? NLS.bind(Messages.rwf_DefaultJREForExecEnv,
getRuntime().getExecutionEnvironment().getId()) :
vm.getInstallLocation().getAbsolutePath() + " (" + vm.getName() +
")";//$NON-NLS-1$ //$NON-NLS-2$
jreValLabel.setText(jreVal);
- configLocValLabel.setText(srt.getConfigLocation());
+ if( configValLabel != null && !configValLabel.isDisposed())
+ configValLabel.setText(srt.getJBossConfiguration());
+ if( configLocValLabel != null && !configLocValLabel.isDisposed())
+ configLocValLabel.setText(srt.getConfigLocation());
runtimeGroup.layout();
updateErrorMessage();
}