[jbosstools-commits] JBoss Tools SVN: r30996 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui/editor and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2011-05-02 09:58:01 -0400 (Mon, 02 May 2011)
New Revision: 30996

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
[JBIDE-8611] disabled autodetect option for web port in as7 editor

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java	2011-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/PortSection.java	2011-05-02 13:58:01 UTC (rev 30996)
@@ -130,6 +130,17 @@
 		}
 	}
 	
+	public static class JBoss7WebPortEditorExtension extends PortEditorExtension {
+		public JBoss7WebPortEditorExtension() {
+			super(Messages.EditorWebPort, 
+					null,
+					IJBossServerConstants.WEB_PORT_DETECT,
+					IJBossServerConstants.WEB_PORT,
+					null, 
+					Messages.EditorChangeWebCommandName);
+		}
+	}
+
 	public static class JBoss6JMXRMIPortEditorExtension extends PortEditorExtension {
 		public JBoss6JMXRMIPortEditorExtension() {
 			super(Messages.EditorJMXRMIPort, 
@@ -213,6 +224,7 @@
 		protected void initialize() {
 			boolean shouldDetect = helper.getAttribute(detectXPathKey, true);
 			detect.setSelection(shouldDetect);
+			detect.setEnabled(defaultXPath != null);
 			link.setEnabled(shouldDetect);
 			text.setEnabled(!shouldDetect);
 			text.setEditable(!shouldDetect);

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties	2011-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.properties	2011-05-02 13:58:01 UTC (rev 30996)
@@ -27,4 +27,5 @@
 AllJBossServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
 JBossServer6AndBelow=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50
 AllJBTServerTypes=org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50,org.jboss.ide.eclipse.as.systemCopyServer
-ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60
+ServerTypesJBoss6OrHigher=org.jboss.ide.eclipse.as.60,org.jboss.ide.eclipse.as.70
+ServerTypesJBoss7=org.jboss.ide.eclipse.as.70
\ No newline at end of file

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2011-05-02 12:50:27 UTC (rev 30995)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml	2011-05-02 13:58:01 UTC (rev 30996)
@@ -275,9 +275,13 @@
       </section>
       <section
             class="org.jboss.ide.eclipse.as.ui.editor.PortSection$WebPortEditorExtension"
-            serverIds="%AllJBossServerTypes">
+            serverIds="%JBossServer6AndBelow">
       </section>
       <section
+            class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss7WebPortEditorExtension"
+            serverIds="%ServerTypesJBoss7">
+      </section>
+      <section
             class="org.jboss.ide.eclipse.as.ui.editor.PortSection$JBoss6JMXRMIPortEditorExtension"
             serverIds="org.jboss.ide.eclipse.as.60">
       </section>