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

[jbosstools-commits at lists.jboss.org]

Author: max.andersen at jboss.com
Date: 2011-10-19 02:54:34 -0400 (Wed, 19 Oct 2011)
New Revision: 35792

Removed:
   trunk/central/plugins/org.jboss.tools.central/icons/jbds16.png
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/editors/JBossCentralEditor.java
Log:
JBIDE-9835 title should be JBoss Central + don't check for JBDS.

Deleted: trunk/central/plugins/org.jboss.tools.central/icons/jbds16.png
===================================================================
(Binary files differ)

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-10-19 05:54:24 UTC (rev 35791)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/JBossCentralActivator.java	2011-10-19 06:54:34 UTC (rev 35792)
@@ -98,8 +98,6 @@
 	public static final String PROFILE_ID = "profileId";
 
 	public static final String PROFILE_TIMESTAMP = "profileTimestamp";
-
-	public static final String JBDS_PRODUCT_PLUGIN_ID = "com.jboss.jbds.product";
 	
 	public static final String NEW_PROJECT_EXAMPLES_WIZARD_ID = "org.jboss.tools.project.examples.wizard.NewProjectExamplesWizard";
 	
@@ -215,10 +213,6 @@
 		return prefs.getBoolean(SHOW_JBOSS_CENTRAL_ON_STARTUP, SHOW_JBOSS_CENTRAL_ON_STARTUP_DEFAULT_VALUE);
 	}
 	
-	public static boolean isJBDS() {
-		Bundle bundle = Platform.getBundle(JBDS_PRODUCT_PLUGIN_ID);
-		return bundle != null;
-	}
 	
 	public static void openUrl(String location, Shell shell) {
 		URL url = null;

Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java	2011-10-19 05:54:24 UTC (rev 35791)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java	2011-10-19 06:54:34 UTC (rev 35792)
@@ -56,8 +56,6 @@
 
 	public static final String ID = "org.jboss.tools.central.editors.JBossCentralEditor";
 
-	private static final String JBDS_CENTRAL = "JBoss Developer Studio Central";
-	
 	private AbstractJBossCentralPage gettingStartedPage;
 	
 	private SoftwarePage softwarePage;
@@ -104,11 +102,7 @@
 		if (!(editorInput instanceof JBossCentralEditorInput))
 			throw new PartInitException("Invalid Input: Must be JBossCentralEditorInput");
 		super.init(site, editorInput);
-		if (JBossCentralActivator.isJBDS()) {
-			setPartName(JBDS_CENTRAL);
-		} else {
-			setPartName(JBOSS_CENTRAL);
-		}
+		setPartName(JBOSS_CENTRAL);
 	}
 	/* (non-Javadoc)
 	 * Method declared on IEditorPart.
@@ -147,13 +141,9 @@
 	@Override
 	protected void createHeaderContents(IManagedForm headerForm) {
 		ScrolledForm form = headerForm.getForm();
-		if (JBossCentralActivator.isJBDS()) {
-			form.setText(JBDS_CENTRAL);
-			form.setToolTipText(JBDS_CENTRAL);
-		} else {
-			form.setText(JBOSS_CENTRAL);
-			form.setToolTipText(JBOSS_CENTRAL);
-		}
+		form.setText(JBOSS_CENTRAL);
+		form.setToolTipText(JBOSS_CENTRAL);
+		
 		form.setImage(getHeaderImage());
 		getToolkit().decorateFormHeading(form.getForm());
 		
@@ -309,11 +299,7 @@
 
 	private Image getHeaderImage() {
 		if (headerImage == null) {
-			if (JBossCentralActivator.isJBDS()) {
-				headerImage = JBossCentralActivator.getImageDescriptor("/icons/jbds16.png").createImage();
-			} else {
-				headerImage = JBossCentralActivator.getImageDescriptor("/icons/jboss.gif").createImage();
-			}
+			headerImage = JBossCentralActivator.getImageDescriptor("/icons/jboss.gif").createImage();
 		}
 		return headerImage;
 	}