[jbosstools-commits] JBoss Tools SVN: r36930 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: configurators and 2 other directories.

Author: snjeza Date: 2011-12-04 14:31:11 -0500 (Sun, 04 Dec 2011) New Revision: 36930 Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java trunk/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: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 00:31:45 UTC (rev 36929) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java 2011-12-04 19:31:11 UTC (rev 36930) @@ -67,7 +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 = "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"; @@ -467,14 +467,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: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-04 00:31:45 UTC (rev 36929) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/configurators/DefaultJBossCentralConfigurator.java 2011-12-04 19:31:11 UTC (rev 36930) @@ -44,7 +44,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: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-04 00:31:45 UTC (rev 36929) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-12-04 19:31:11 UTC (rev 36930) @@ -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: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java =================================================================== --- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-04 00:31:45 UTC (rev 36929) +++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java 2011-12-04 19:31:11 UTC (rev 36930) @@ -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() {