[jbosstools-commits] JBoss Tools SVN: r35676 - in trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central: editors and 1 other directories.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Fri Oct 14 14:56:12 EDT 2011
Author: snjeza
Date: 2011-10-14 14:56:11 -0400 (Fri, 14 Oct 2011)
New Revision: 35676
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/editors/GettingStartedPage.java
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/model/NewsEntry.java
Log:
JBIDE-9368 Dashboard(s) for easy news aggregation, twitter and easy additional/3rd party plugin installation and project template/creation
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-10-14 18:53:24 UTC (rev 35675)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/dialogs/ProjectExamplesDialog.java 2011-10-14 18:56:11 UTC (rev 35676)
@@ -353,7 +353,7 @@
@Override
protected void createButtonsForButtonBar(Composite parent) {
- createButton(parent, IDialogConstants.OK_ID, "Run",
+ createButton(parent, IDialogConstants.OK_ID, "Start",
true);
createButton(parent, IDialogConstants.CANCEL_ID,
IDialogConstants.CANCEL_LABEL, false);
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-14 18:53:24 UTC (rev 35675)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/GettingStartedPage.java 2011-10-14 18:56:11 UTC (rev 35676)
@@ -419,6 +419,7 @@
IExtension[] extensions = extensionPoint.getExtensions();
List<String> wizardIDs = new ArrayList<String>();
+ wizardIDs.add("org.jboss.ide.eclipse.as.openshift.express.ui.wizard.NewServerAdapter");
wizardIDs.add("org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard");
wizardIDs.add("org.jboss.tools.seam.ui.wizards.SeamProjectWizard");
wizardIDs.add("org.eclipse.m2e.core.wizards.Maven2ProjectWizard");
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-14 18:53:24 UTC (rev 35675)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/JBossCentralEditor.java 2011-10-14 18:56:11 UTC (rev 35676)
@@ -17,7 +17,6 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jface.action.IToolBarManager;
import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
import org.eclipse.swt.SWT;
@@ -28,7 +27,6 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.MenuItem;
@@ -129,12 +127,12 @@
}
setPageImage(index, gettingStartedImage);
- /*softwarePage = new SoftwarePage(this);
+ softwarePage = new SoftwarePage(this);
index = addPage(softwarePage);
if (softwareImage == null) {
softwareImage = JBossCentralActivator.getImageDescriptor("/icons/software.png").createImage();
}
- setPageImage(index, softwareImage);*/
+ setPageImage(index, softwareImage);
} catch (PartInitException e) {
JBossCentralActivator.log(e, "Error adding page");
@@ -164,24 +162,24 @@
headerComposite.setLayout(new GridLayout(2, false));
headerComposite.setBackground(null);
- Button showOnStartup = getToolkit().createButton(headerComposite, "Show on Startup", SWT.CHECK);
- showOnStartup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
- showOnStartup.setBackground(null);
- showOnStartup.setSelection(JBossCentralActivator.getDefault().showJBossCentralOnStartup());
- showOnStartup.addSelectionListener(new SelectionAdapter() {
+// Button showOnStartup = getToolkit().createButton(headerComposite, "Show on Startup", SWT.CHECK);
+// showOnStartup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
+// showOnStartup.setBackground(null);
+// showOnStartup.setSelection(JBossCentralActivator.getDefault().showJBossCentralOnStartup());
+// showOnStartup.addSelectionListener(new SelectionAdapter() {
+//
+// @Override
+// public void widgetSelected(SelectionEvent e) {
+// IEclipsePreferences preferences = JBossCentralActivator.getDefault().getPreferences();
+// boolean showOnStartup = preferences.getBoolean(JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP, JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP_DEFAULT_VALUE);
+// preferences.putBoolean(JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP, !showOnStartup);
+// JBossCentralActivator.getDefault().savePreferences();
+// }
+//
+// });
- @Override
- public void widgetSelected(SelectionEvent e) {
- IEclipsePreferences preferences = JBossCentralActivator.getDefault().getPreferences();
- boolean showOnStartup = preferences.getBoolean(JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP, JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP_DEFAULT_VALUE);
- preferences.putBoolean(JBossCentralActivator.SHOW_JBOSS_CENTRAL_ON_STARTUP, !showOnStartup);
- JBossCentralActivator.getDefault().savePreferences();
- }
-
- });
-
Composite searchComposite = getToolkit().createComposite(headerComposite);
- GridData gd = new GridData(SWT.END, SWT.FILL, true, true);
+ GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, true, true);
gd.widthHint = 200;
searchComposite.setLayoutData(gd);
searchComposite.setBackground(null);
@@ -308,6 +306,7 @@
});
form.getForm().setHeadClient(headerComposite);
+ //form.getForm().setToolBarVerticalAlignment(SWT.BOTTOM);
IToolBarManager toolbar = form.getToolBarManager();
CommandContributionItem item = JBossCentralActivator.createContributionItem(getSite(), "org.jboss.tools.central.openJBossToolsHome");
Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-10-14 18:53:24 UTC (rev 35675)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/model/NewsEntry.java 2011-10-14 18:56:11 UTC (rev 35676)
@@ -3,6 +3,7 @@
import java.util.Date;
import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.lang.StringUtils;
import org.jboss.tools.central.JBossCentralActivator;
import com.ocpsoft.pretty.time.PrettyTime;
@@ -74,7 +75,7 @@
buffer.append("<a href=\"");
buffer.append(link);
buffer.append("\">");
- buffer.append(title);
+ buffer.append(StringEscapeUtils.unescapeXml(title));
buffer.append("</a>");
} else {
buffer.append(title);
More information about the jbosstools-commits
mailing list