[jbosstools-commits] JBoss Tools SVN: r39487 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-03-14 03:19:52 -0400 (Wed, 14 Mar 2012)
New Revision: 39487

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
   trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
   trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java
Log:
JBIDE-11304 - npe due to bad adaptations

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java	2012-03-14 05:54:45 UTC (rev 39486)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java	2012-03-14 07:19:52 UTC (rev 39487)
@@ -23,8 +23,9 @@
 
 public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory, IJBossToolingConstants {
 	
-	public static JBossExtendedProperties getExtendedProperties(IServer server) {
-		return (JBossExtendedProperties) new ExtendedServerPropertiesAdapterFactory().getAdapter(server, JBossExtendedProperties.class);
+	public static JBossExtendedProperties getJBossExtendedProperties(IServer server) {
+		Object ret = new ExtendedServerPropertiesAdapterFactory().getAdapter(server, JBossExtendedProperties.class);
+		return ret instanceof JBossExtendedProperties ? (JBossExtendedProperties)ret : null;
 	}
 	
 	@Override

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java	2012-03-14 05:54:45 UTC (rev 39486)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java	2012-03-14 07:19:52 UTC (rev 39487)
@@ -43,6 +43,8 @@
 import org.eclipse.jst.server.core.IWebModule;
 import org.eclipse.wst.server.core.IModule;
 import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
 import org.eclipse.wst.server.core.model.IURLProvider;
 import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
 import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
@@ -51,6 +53,7 @@
 import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
 import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
 import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
 import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader;
 import org.jboss.ide.eclipse.as.core.util.ExpressionResolverUtil;
 import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -147,7 +150,7 @@
 	}
 	
 	public JBossExtendedProperties getExtendedProperties() {
-		return (JBossExtendedProperties)getServer().loadAdapter(JBossExtendedProperties.class, null);
+		return (JBossExtendedProperties)getServer().loadAdapter(ServerExtendedProperties.class, null);
 	}
 	
 	public String getTempDeployFolder() {

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2012-03-14 05:54:45 UTC (rev 39486)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml	2012-03-14 07:19:52 UTC (rev 39487)
@@ -1198,6 +1198,9 @@
          <adapter
                type="org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties">
          </adapter>
+         <adapter
+               type="org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties">
+         </adapter>
       </factory>
    </extension>
    

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java	2012-03-14 05:54:45 UTC (rev 39486)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnectionProvider.java	2012-03-14 07:19:52 UTC (rev 39487)
@@ -80,7 +80,7 @@
 	}
 	
 	protected IConnectionWrapper createConnection(IServer server) {
-		JBossExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getExtendedProperties(server);
+		JBossExtendedProperties props = ExtendedServerPropertiesAdapterFactory.getJBossExtendedProperties(server);
 		int type = props == null ? -1 : props.getJMXProviderType();
 		switch(type) {
 		case JBossExtendedProperties.JMX_AS_3_TO_6_PROVIDER: