Author: snjeza Date: 2011-12-08 12:54:00 -0500 (Thu, 08 Dec 2011) New Revision: 37123 Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java Log: JBIDE-10334 system property option for configuring central discovery has dissappeared Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java =================================================================== --- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-08 17:28:01 UTC (rev 37122) +++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-08 17:54:00 UTC (rev 37123) @@ -67,9 +67,7 @@ */ public class JBossCentralActivator extends AbstractUIPlugin { - private static final String JBOSS_DISCOVERY_DIRECTORY = "jboss.discovery.directory.url"; - - //public static final String JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML = "http://download.jboss.org/jbosstools/updates/development/indigo/jbosstools-directory.xml"; + public static final String JBOSS_DISCOVERY_DIRECTORY = "jboss.discovery.directory.url"; public static final String ICON = "icon"; @@ -472,14 +470,6 @@ public BundleContext getBundleContext() { return bundleContext; } - - public String getJBossDiscoveryDirectory() { - String directory = System.getProperty(JBOSS_DISCOVERY_DIRECTORY, null); - if (directory == null) { - return getConfigurator().getJBossDiscoveryDirectory(); - } - return directory; - } public static boolean isInternalWebBrowserAvailable() { if (isInternalWebBrowserAvailable != null) { Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java =================================================================== --- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-08 17:28:01 UTC (rev 37122) +++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-08 17:54:00 UTC (rev 37123) @@ -43,7 +43,11 @@ @Override public String getJBossDiscoveryDirectory() { - return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML; + String directory = System.getProperty(JBossCentralActivator.JBOSS_DISCOVERY_DIRECTORY, null); + if (directory == null) { + return JBOSS_DISCOVERY_DIRECTORY_3_3_0_XML; + } + return directory; } @Override Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java =================================================================== --- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-08 17:28:01 UTC (rev 37122) +++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-08 17:54:00 UTC (rev 37123) @@ -337,7 +337,7 @@ connectorDiscoveries[0].getDiscoveryStrategies().add(new BundleDiscoveryStrategy()); RemoteBundleDiscoveryStrategy remoteDiscoveryStrategy = new RemoteBundleDiscoveryStrategy(); - remoteDiscoveryStrategy.setDirectoryUrl(JBossCentralActivator.getDefault().getJBossDiscoveryDirectory()); + remoteDiscoveryStrategy.setDirectoryUrl(JBossCentralActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory()); connectorDiscoveries[0].getDiscoveryStrategies().add(remoteDiscoveryStrategy); connectorDiscoveries[0].setEnvironment(JBossCentralActivator.getEnvironment()); Modified: branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java =================================================================== --- branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-08 17:28:01 UTC (rev 37122) +++ branches/jbosstools-3.3.0.M5/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-08 17:54:00 UTC (rev 37123) @@ -128,7 +128,7 @@ discoveryViewer = new DiscoveryViewer(getSite(), this); discoveryViewer.setShowConnectorDescriptorKindFilter(false); discoveryViewer.setShowInstalledFilterEnabled(true); - discoveryViewer.setDirectoryUrl(JBossCentralActivator.getDefault().getJBossDiscoveryDirectory()); + discoveryViewer.setDirectoryUrl(JBossCentralActivator.getDefault().getConfigurator().getJBossDiscoveryDirectory()); discoveryViewer.createControl(pageBook); discoveryViewer.setEnvironment(getEnvironment()); discoveryViewer.addFilter(new ViewerFilter() {