Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 209597 Details for
Bug 368778
Empty Servers View Default Message (Patch included)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
v1.0
365278patch.txt (text/plain), 6.55 KB, created by
Elson Yuen
on 2012-01-16 16:43:08 EST
(
hide
)
Description:
v1.0
Filename:
MIME Type:
Creator:
Elson Yuen
Created:
2012-01-16 16:43:08 EST
Size:
6.55 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.wst.server.ui >Index: serverui/org/eclipse/wst/server/ui/internal/Messages.properties >=================================================================== >RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.properties,v >retrieving revision 1.95.2.1 >diff -u -r1.95.2.1 Messages.properties >--- serverui/org/eclipse/wst/server/ui/internal/Messages.properties 16 Aug 2011 21:04:03 -0000 1.95.2.1 >+++ serverui/org/eclipse/wst/server/ui/internal/Messages.properties 28 Dec 2011 18:56:24 -0000 >@@ -510,3 +510,4 @@ > errorStartingMonitor=Could not start the server monitor: {0} > > internalWebBrowserName=Internal Web Browser >+ServersView2_noServers=No servers available. Define a new server from the <a>new server wizard</a>... >Index: serverui/org/eclipse/wst/server/ui/internal/Messages.java >=================================================================== >RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/Messages.java,v >retrieving revision 1.67.2.1 >diff -u -r1.67.2.1 Messages.java >--- serverui/org/eclipse/wst/server/ui/internal/Messages.java 16 Aug 2011 21:04:03 -0000 1.67.2.1 >+++ serverui/org/eclipse/wst/server/ui/internal/Messages.java 28 Dec 2011 18:56:24 -0000 >@@ -363,6 +363,8 @@ > > public static String internalWebBrowserName; > >+ public static String ServersView2_noServers; >+ > static { > NLS.initializeMessages(ServerUIPlugin.PLUGIN_ID + ".internal.Messages", Messages.class); > } >Index: serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java >=================================================================== >RCS file: /cvsroot/webtools/servertools/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java,v >retrieving revision 1.7.2.5 >diff -u -r1.7.2.5 ServersView2.java >--- serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java 14 Sep 2011 19:37:24 -0000 1.7.2.5 >+++ serverui/org/eclipse/wst/server/ui/internal/cnf/ServersView2.java 28 Dec 2011 18:56:24 -0000 >@@ -20,12 +20,21 @@ > import org.eclipse.core.runtime.jobs.Job; > import org.eclipse.core.runtime.jobs.JobChangeAdapter; > import org.eclipse.jface.viewers.StructuredSelection; >+import org.eclipse.jface.window.Window; >+import org.eclipse.jface.wizard.WizardDialog; >+import org.eclipse.swt.SWT; >+import org.eclipse.swt.events.SelectionAdapter; >+import org.eclipse.swt.events.SelectionEvent; > import org.eclipse.swt.graphics.Point; >-import org.eclipse.swt.widgets.Composite; >-import org.eclipse.swt.widgets.Display; >+import org.eclipse.swt.layout.GridData; >+import org.eclipse.swt.layout.GridLayout; >+import org.eclipse.swt.widgets.*; > import org.eclipse.ui.contexts.IContextService; >+import org.eclipse.ui.forms.widgets.Form; >+import org.eclipse.ui.forms.widgets.FormToolkit; > import org.eclipse.ui.navigator.CommonNavigator; > import org.eclipse.ui.navigator.CommonViewer; >+import org.eclipse.ui.part.PageBook; > import org.eclipse.wst.server.core.*; > import org.eclipse.wst.server.core.internal.Server; > import org.eclipse.wst.server.core.internal.UpdateServerJob; >@@ -33,6 +42,7 @@ > import org.eclipse.wst.server.ui.internal.Messages; > import org.eclipse.wst.server.ui.internal.ServerToolTip; > import org.eclipse.wst.server.ui.internal.Trace; >+import org.eclipse.wst.server.ui.internal.wizard.NewServerWizard; > /** > * A view of servers, their modules, and status. > */ >@@ -40,6 +50,9 @@ > private static final String SERVERS_VIEW_CONTEXT = "org.eclipse.ui.serverViewScope"; > > protected CommonViewer tableViewer; >+ private Control mainPage; >+ private Control noServersPage; >+ PageBook book; > > protected IServerLifecycleListener serverResourceListener; > protected IPublishListener publishListener; >@@ -60,14 +73,63 @@ > > @Override > public void createPartControl(Composite parent) { >- super.createPartControl(parent); >+ // Add PageBook as parent composite >+ FormToolkit toolkit = new FormToolkit(parent.getDisplay()); >+ book = new PageBook(parent, SWT.NONE); >+ super.createPartControl(book); >+ // Main page for the Servers tableViewer >+ mainPage = getCommonViewer().getControl(); >+ // Page prompting to define a new server >+ noServersPage = createDefaultPage(toolkit); >+ book.showPage(mainPage); > > IContextService contextSupport = (IContextService)getSite().getService(IContextService.class); > contextSupport.activateContext(SERVERS_VIEW_CONTEXT); >- > deferInitialization(); > } > >+ /** >+ * Creates a page displayed when there are no servers defined. >+ * >+ * @param kit >+ * @return Control >+ */ >+ private Control createDefaultPage(FormToolkit kit){ >+ Form form = kit.createForm(book); >+ Composite body = form.getBody(); >+ GridLayout layout = new GridLayout(2, false); >+ body.setLayout(layout); >+ >+ Link hlink = new Link(body, SWT.NONE); >+ hlink.setText(Messages.ServersView2_noServers); >+ hlink.setBackground(book.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND)); >+ GridData gd = new GridData(SWT.LEFT, SWT.FILL, true, false); >+ hlink.setLayoutData(gd); >+ hlink.addSelectionListener(new SelectionAdapter() { >+ public void widgetSelected(SelectionEvent e) { >+ NewServerWizard wizard = new NewServerWizard(); >+ WizardDialog wd = new WizardDialog(book.getShell(), wizard); >+ if( wd.open() == Window.OK){ >+ toggleDefultPage(); >+ } >+ } >+ }); >+ >+ return form; >+ } >+ >+ /** >+ * Switch between the servers and default/empty page. >+ * >+ */ >+ void toggleDefultPage(){ >+ if(tableViewer.getTree().getItemCount() < 1){ >+ book.showPage(noServersPage); >+ } else{ >+ book.showPage(mainPage); >+ } >+ } >+ > private void deferInitialization() { > // TODO Angel Says: Need to do a final check on this line below. I don't think there is anything else > // that we need from to port from the old Servers View >@@ -121,6 +183,8 @@ > if (tableViewer.getTree().getItemCount() > 0) { > Object obj = tableViewer.getTree().getItem(0).getData(); > tableViewer.setSelection(new StructuredSelection(obj)); >+ } else{ >+ toggleDefultPage(); > } > } > }); >@@ -267,6 +331,7 @@ > Display.getDefault().asyncExec(new Runnable() { > public void run() { > tableViewer.add(tableViewer.getInput(), server); >+ toggleDefultPage(); > } > }); > } >@@ -275,6 +340,7 @@ > Display.getDefault().asyncExec(new Runnable() { > public void run() { > tableViewer.remove(server); >+ toggleDefultPage(); > } > }); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 368778
: 209597