Author: fmancinelli Date: 2007-11-13 14:02:30 +0100 (Tue, 13 Nov 2007) New Revision: 5844
Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/ui/XWikiBrowserPartUI.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/ManageWorkingSetsDialog.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/OpenPageDialog.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/ConnectHandler.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/DisconnectHandler.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/utils/XWikiEclipseUtil.java xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java Log: * Code reformatting * Fixed a bug in editor synchronization when connecting/disconnecting * Show page space information in Open page dialog Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/ui/XWikiBrowserPartUI.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/ui/XWikiBrowserPartUI.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/plugins/eclipse/editors/ui/XWikiBrowserPartUI.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -34,7 +34,6 @@ import org.eclipse.swt.widgets.Shell; import org.xwiki.plugins.eclipse.XWikiEclipsePlugin; import org.xwiki.plugins.eclipse.editors.XWikiEditor; -import org.xwiki.plugins.eclipse.util.GuiUtils; import org.xwiki.plugins.eclipse.util.XWikiConstants; /** Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/ManageWorkingSetsDialog.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/ManageWorkingSetsDialog.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/ManageWorkingSetsDialog.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -27,7 +27,6 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.ListViewer; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.wizard.WizardDialog; Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/OpenPageDialog.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/OpenPageDialog.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/dialogs/OpenPageDialog.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -30,6 +30,7 @@ import org.eclipse.jface.viewers.IDecorationContext; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelDecorator; +import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -44,7 +45,6 @@ { private static class SelectionLabelDecorator extends LabelDecorator { - @Override public Image decorateImage(Image image, Object element, IDecorationContext context) { @@ -109,11 +109,38 @@ } + private static class OpenPageLabelProvider extends LabelProvider + { + WorkbenchLabelProvider workbenchLabelProvider; + + public OpenPageLabelProvider(WorkbenchLabelProvider workbenchLabelProvider) + { + this.workbenchLabelProvider = workbenchLabelProvider; + } + + @Override + public String getText(Object element) + { + if (element instanceof IXWikiPage) { + IXWikiPage xwikiPage = (IXWikiPage) element; + return String.format("%s (%s)", xwikiPage.getTitle(), xwikiPage.getSpaceKey()); + } + + return super.getText(element); + } + + @Override + public Image getImage(Object element) + { + return workbenchLabelProvider.getImage(element); + } + } + public OpenPageDialog(Shell shell) { super(shell); setTitle("Open page"); - setListLabelProvider(new WorkbenchLabelProvider()); + setListLabelProvider(new OpenPageLabelProvider(new WorkbenchLabelProvider())); setListSelectionLabelDecorator(new SelectionLabelDecorator()); setDetailsLabelProvider(new WorkbenchLabelProvider()); } Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/ConnectHandler.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/ConnectHandler.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/ConnectHandler.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -30,7 +30,6 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.handlers.HandlerUtil; import org.xwiki.xeclipse.XWikiConnectionManager; import org.xwiki.xeclipse.model.IXWikiConnection; Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/DisconnectHandler.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/DisconnectHandler.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/DisconnectHandler.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -49,6 +49,9 @@ e.printStackTrace(); } + XWikiEclipseUtil.closeReopenEditorsForConnection(HandlerUtil.getActiveWorkbenchWindow(event).getActivePage(), + xwikiConnection); + /* * Re-set the current selection in order to force the re-evaluation of the expressions * associated to the other handlers that might depend on the changed state of the Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/handlers/OpenPageHandler.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -24,7 +24,6 @@ import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.handlers.HandlerUtil; import org.xwiki.xeclipse.dialogs.OpenPageDialog; Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/utils/XWikiEclipseUtil.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/utils/XWikiEclipseUtil.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/utils/XWikiEclipseUtil.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -28,9 +28,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchPartReference; import org.eclipse.ui.PartInitException; -import org.eclipse.ui.handlers.HandlerUtil; import org.xwiki.xeclipse.editors.XWikiPageEditor; import org.xwiki.xeclipse.editors.XWikiPageEditorInput; import org.xwiki.xeclipse.model.IXWikiConnection; Modified: xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java =================================================================== --- xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java 2007-11-13 12:47:41 UTC (rev 5843) +++ xwiki-extensions/xwiki-eclipse/trunk/plugins/org.xwiki.eclipse/src/main/java/org/xwiki/xeclipse/views/XWikiExplorerView.java 2007-11-13 13:02:30 UTC (rev 5844) @@ -43,9 +43,6 @@ import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; _______________________________________________ notifications mailing list notifications@xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications