Index: .classpath =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/.classpath,v retrieving revision 1.3 diff -u -r1.3 .classpath --- .classpath 5 Jun 2003 03:02:40 -0000 1.3 +++ .classpath 10 Jun 2003 03:42:02 -0000 @@ -9,41 +9,16 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + Index: .project =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/.project,v retrieving revision 1.1 diff -u -r1.1 .project --- .project 13 Dec 2002 15:33:02 -0000 1.1 +++ .project 10 Jun 2003 03:42:02 -0000 @@ -1,8 +1,17 @@ - org.apache.xindice.tools.ui.eclipse + ui-eclipse + net.sf.solareclipse.ui + net.sf.solareclipse.xml.ui + nox.logger + org.apache.xerces + org.eclipse.core.boot + org.eclipse.core.resources + org.eclipse.core.runtime + org.eclipse.swt + org.eclipse.ui Index: plugin.xml =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/plugin.xml,v retrieving revision 1.3 diff -u -r1.3 plugin.xml --- plugin.xml 5 Jun 2003 03:02:40 -0000 1.3 +++ plugin.xml 10 Jun 2003 03:42:02 -0000 @@ -9,6 +9,7 @@ + Index: src/org/apache/xindice/tools/ui/eclipse/EclipsePlugin.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/EclipsePlugin.java,v retrieving revision 1.3 diff -u -r1.3 EclipsePlugin.java --- src/org/apache/xindice/tools/ui/eclipse/EclipsePlugin.java 5 Jun 2003 03:02:42 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/EclipsePlugin.java 10 Jun 2003 03:42:03 -0000 @@ -46,7 +46,7 @@ /** * The ID of the main perspective */ - private static final String PERSPECTIVE_MANAGING = "org.apache.xindice.ui.eclipse.xindiceperspective"; + private static final String PERSPECTIVE_MANAGING = "org.apache.xindice.tools.ui.eclipse.xindiceperspective"; /** * The shared plugin instance. @@ -212,7 +212,7 @@ window = wb.openWorkbenchWindow(PERSPECTIVE_MANAGING, root); window.getActivePage(); } - else if (perspectiveSetting.equals(IWorkbenchPreferenceConstants.OPEN_PERSPECTIVE_PAGE)) { + else if (perspectiveSetting.equals(IWorkbenchPreferenceConstants.OPEN_NEW_PERSPECTIVE)) { // in new page window.openPage(PERSPECTIVE_MANAGING, root); } Index: src/org/apache/xindice/tools/ui/eclipse/GeneralMessages.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/GeneralMessages.java,v retrieving revision 1.3 diff -u -r1.3 GeneralMessages.java --- src/org/apache/xindice/tools/ui/eclipse/GeneralMessages.java 5 Jun 2003 03:02:42 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/GeneralMessages.java 10 Jun 2003 03:42:03 -0000 @@ -27,7 +27,7 @@ /** * The location of the .properties file corresponding to the ResourceBundle */ - private static final String RESOURCE_BUNDLE = "org.apache.xindice.ui.eclipse.messages"; + private static final String RESOURCE_BUNDLE = "org.apache.xindice.tools.ui.eclipse.messages"; /** * The ResourceBundle that this class is managing Index: src/org/apache/xindice/tools/ui/eclipse/XindicePerspectiveFactory.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/XindicePerspectiveFactory.java,v retrieving revision 1.3 diff -u -r1.3 XindicePerspectiveFactory.java --- src/org/apache/xindice/tools/ui/eclipse/XindicePerspectiveFactory.java 5 Jun 2003 03:02:42 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/XindicePerspectiveFactory.java 10 Jun 2003 03:42:03 -0000 @@ -24,7 +24,7 @@ /** * The perspective's unique ID */ - public static final String PERSPECTIVE_ID = "org.apache.xindice.ui.eclipse.xindiceperspective"; + public static final String PERSPECTIVE_ID = "org.apache.xindice.tools.ui.eclipse.xindiceperspective"; /** * The default constructor does nothing. Index: src/org/apache/xindice/tools/ui/eclipse/actions/DeleteAction.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/actions/DeleteAction.java,v retrieving revision 1.3 diff -u -r1.3 DeleteAction.java --- src/org/apache/xindice/tools/ui/eclipse/actions/DeleteAction.java 5 Jun 2003 03:02:41 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/actions/DeleteAction.java 10 Jun 2003 03:42:03 -0000 @@ -23,6 +23,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; @@ -123,15 +124,15 @@ * * @return HashMap the map associating each document path to the corresponding editor */ - private HashMap findEditedDocuments(IEditorPart [] editors) { + private HashMap findEditedDocuments(IEditorReference [] editorRefs) { HashMap map = new HashMap(); // Find all active editors and their associated documents - for (int i = 0; i < editors.length; i++) { - IEditorPart editor = editors[i]; + for (int i = 0; i < editorRefs.length; i++) { + IEditorPart editor = editorRefs[i].getEditor(false); DocumentParcel edited_dp = theLiaison.getDocumentParcel(((IFileEditorInput) editor.getEditorInput()).getFile()); String edited_path = edited_dp.getFullPath(); - map.put(edited_path, editor); + map.put(edited_path, editorRefs ); } return map; @@ -170,7 +171,7 @@ } IWorkbenchPage page = EclipsePlugin.getActivePage(); - IEditorPart [] editors = page.getEditors(); + IEditorReference [] editors = page.getEditorReferences(); HashMap paths2editors = findEditedDocuments(editors); // Loop through all selections, discover which is a Collection and which is a Document and Index: src/org/apache/xindice/tools/ui/eclipse/actions/RemoveLocationAction.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/actions/RemoveLocationAction.java,v retrieving revision 1.4 diff -u -r1.4 RemoveLocationAction.java --- src/org/apache/xindice/tools/ui/eclipse/actions/RemoveLocationAction.java 5 Jun 2003 03:02:41 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/actions/RemoveLocationAction.java 10 Jun 2003 03:42:03 -0000 @@ -18,6 +18,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; @@ -76,10 +77,10 @@ private IStatus removeServer(Element server) { // logger.debug("In removeServer()"); IWorkbenchPage page = EclipsePlugin.getActivePage(); - IEditorPart [] editors = page.getEditors(); + IEditorReference [] editorRefs = page.getEditorReferences(); - for (int i = 0; i < editors.length; i++) { - IEditorPart editor = editors[i]; + for (int i = 0; i < editorRefs.length; i++) { + IEditorPart editor = editorRefs[i].getEditor(false); DocumentParcel dp = theLiaison.getDocumentParcel(((IFileEditorInput) editor.getEditorInput()).getFile()); String server_name_for_document = dp.getServerName(); Index: src/org/apache/xindice/tools/ui/eclipse/editors/DocumentEditor.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/editors/DocumentEditor.java,v retrieving revision 1.4 diff -u -r1.4 DocumentEditor.java --- src/org/apache/xindice/tools/ui/eclipse/editors/DocumentEditor.java 5 Jun 2003 03:02:41 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/editors/DocumentEditor.java 10 Jun 2003 03:42:03 -0000 @@ -1,10 +1,6 @@ package org.apache.xindice.tools.ui.eclipse.editors; -/* - * (c) Copyright Etish Limited 2002. - * All Rights Reserved. - */ -import net.sourceforge.solareclipse.web.internal.ui.xml.XMLEditor; +import net.sf.solareclipse.xml.internal.ui.text.XMLEditor; import nox.logger.Logger; import org.dom4j.Element; import org.eclipse.core.resources.IFile; @@ -15,6 +11,7 @@ import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.texteditor.IDocumentProvider; import org.apache.xindice.tools.ui.eclipse.GeneralMessages; import org.apache.xindice.tools.ui.eclipse.internuncio.DocumentParcel; import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; @@ -34,7 +31,7 @@ */ public class DocumentEditor extends XMLEditor { - public static final String EDITOR_ID = "org.apache.xindice.ui.eclipse.documenteditor"; + public static final String EDITOR_ID = "org.apache.xindice.tools.ui.eclipse.documenteditor"; private static final Logger logger = Logger.Instance(NewDocumentAction.class); private static final ServerLiaison theLiaison = ServerLiaison.getInstance(); @@ -92,7 +89,7 @@ */ protected void initializeEditor() { super.initializeEditor(); - setDocumentProvider(new DocumentProvider()); + setDocumentProvider((IDocumentProvider) new DocumentProvider()); } /** Index: src/org/apache/xindice/tools/ui/eclipse/editors/DocumentProvider.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/editors/DocumentProvider.java,v retrieving revision 1.4 diff -u -r1.4 DocumentProvider.java --- src/org/apache/xindice/tools/ui/eclipse/editors/DocumentProvider.java 5 Jun 2003 03:02:41 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/editors/DocumentProvider.java 10 Jun 2003 03:42:03 -0000 @@ -5,7 +5,7 @@ * All Rights Reserved. */ -import net.sourceforge.solareclipse.web.internal.ui.xml.XMLDocumentProvider; +import net.sf.solareclipse.xml.internal.ui.text.XMLDocumentProvider; import nox.logger.Logger; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; Index: src/org/apache/xindice/tools/ui/eclipse/internuncio/Scribe.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/internuncio/Scribe.java,v retrieving revision 1.4 diff -u -r1.4 Scribe.java --- src/org/apache/xindice/tools/ui/eclipse/internuncio/Scribe.java 5 Jun 2003 03:02:42 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/internuncio/Scribe.java 10 Jun 2003 03:42:03 -0000 @@ -93,6 +93,8 @@ logger.debug("6"); logger.info("Registering servers."); + + logger.debug(serversExposedToUI); ServerLiaison.registerServers(serversExposedToUI); Index: src/org/apache/xindice/tools/ui/eclipse/model/ServerLiaison.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/model/ServerLiaison.java,v retrieving revision 1.3 diff -u -r1.3 ServerLiaison.java --- src/org/apache/xindice/tools/ui/eclipse/model/ServerLiaison.java 5 Jun 2003 03:02:40 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/model/ServerLiaison.java 10 Jun 2003 03:42:04 -0000 @@ -254,7 +254,7 @@ * @return MultiStatus */ private static MultiStatus createMultiStatus() { - return new MultiStatus("org.apache.xindice.ui.eclipse", 0, "", null); + return new MultiStatus("org.apache.xindice.tools.ui.eclipse", 0, "", null); } /** @@ -409,19 +409,19 @@ if (dialog != null && target.exists()) { String result = dialog.queryOverwrite(target.getCanonicalPath()); - if (result.equals(dialog.CANCEL)) { + if (result.equals(IOverwriteQuery.CANCEL)) { ms.add(OKAY_STATUS); return false; } - else if (result.equals(dialog.ALL)) { + else if (result.equals(IOverwriteQuery.ALL)) { dialog = null; // drop through } - else if (result.equals(dialog.NO)) { + else if (result.equals(IOverwriteQuery.NO)) { ms.add(OKAY_STATUS); return true; } - else if (result.equals(dialog.YES)) { + else if (result.equals(IOverwriteQuery.YES)) { // drop through } else { @@ -924,20 +924,20 @@ // the document already exists String result = dialog.queryOverwrite(dp.getFullPath()); - if (result.equals(dialog.CANCEL)) { + if (result.equals(IOverwriteQuery.CANCEL)) { ms.add(OKAY_STATUS); return ms; } - else if (result.equals(dialog.ALL)) { + else if (result.equals(IOverwriteQuery.ALL)) { dialog = null; overwrite = true; // drop through } - else if (result.equals(dialog.NO)) { + else if (result.equals(IOverwriteQuery.NO)) { ms.add(OKAY_STATUS); continue; } - else if (result.equals(dialog.YES)) { + else if (result.equals(IOverwriteQuery.YES)) { overwrite = true; // drop through } Index: src/org/apache/xindice/tools/ui/eclipse/navigator/NavigatorView.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/navigator/NavigatorView.java,v retrieving revision 1.4 diff -u -r1.4 NavigatorView.java --- src/org/apache/xindice/tools/ui/eclipse/navigator/NavigatorView.java 5 Jun 2003 03:02:41 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/navigator/NavigatorView.java 10 Jun 2003 03:42:04 -0000 @@ -124,7 +124,7 @@ private Shell shell = null; private IViewSite site = null; - public static final String VIEW_ID = "org.apache.xindice.ui.eclipse.xindicenavigatorview"; + public static final String VIEW_ID = "org.apache.xindice.tools.ui.eclipse.xindicenavigatorview"; private TreeViewer viewer = null; private IWorkbench workbench = null; @@ -248,7 +248,7 @@ viewer.setContentProvider(contentProvider = new DbTreeContentProvider()); viewer.setLabelProvider(labelProvider = new DbTreeLabelProvider(viewer)); - viewer.setInput(theLiaison.getServers()); + viewer.setInput(ServerLiaison.getServers()); // Register the viewer as a selection provider for our site getSite().setSelectionProvider(viewer); @@ -435,7 +435,7 @@ case IModelChangedEvent.REMOVED : viewer.refresh(); - selected_elements.add(theLiaison.getServers().elementIterator().next()); + selected_elements.add(ServerLiaison.getServers().elementIterator().next()); viewer.setSelection(new StructuredSelection(selected_elements.toArray()), true); break; @@ -472,7 +472,7 @@ } if (selected_elements.size() == 0) { - selected_elements.add(theLiaison.getServers().elementIterator().next()); + selected_elements.add(ServerLiaison.getServers().elementIterator().next()); } viewer.setSelection(new StructuredSelection(selected_elements.toArray()), true); Index: src/org/apache/xindice/tools/ui/eclipse/widgets/ContainerSelector.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/widgets/ContainerSelector.java,v retrieving revision 1.4 diff -u -r1.4 ContainerSelector.java --- src/org/apache/xindice/tools/ui/eclipse/widgets/ContainerSelector.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/widgets/ContainerSelector.java 10 Jun 2003 03:42:04 -0000 @@ -197,7 +197,7 @@ treeViewer.addFilter(viewerFilter); } - treeViewer.setInput(theLiaison.getServers()); + treeViewer.setInput(ServerLiaison.getServers()); treeViewer.addSelectionChangedListener(new ISelectionChangedListener() { public void selectionChanged(SelectionChangedEvent e) { Index: src/org/apache/xindice/tools/ui/eclipse/widgets/DrillDownAdapter.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/widgets/DrillDownAdapter.java,v retrieving revision 1.3 diff -u -r1.3 DrillDownAdapter.java --- src/org/apache/xindice/tools/ui/eclipse/widgets/DrillDownAdapter.java 5 Jun 2003 03:02:39 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/widgets/DrillDownAdapter.java 10 Jun 2003 03:42:05 -0000 @@ -176,7 +176,7 @@ }; backAction.setToolTipText(GeneralMessages.getString("Action.goBack.toolTip")); - image = WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_CTOOL_BACKWARD_NAV); + image = WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_CTOOL_PREVIOUS_NAV); backAction.setImageDescriptor(image); backAction.setHoverImageDescriptor(image); @@ -188,7 +188,7 @@ }; forwardAction.setToolTipText(GeneralMessages.getString("Action.goInto.toolTip")); - image = WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_CTOOL_FORWARD_NAV); + image = WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_CTOOL_NEXT_NAV); forwardAction.setImageDescriptor(image); forwardAction.setHoverImageDescriptor(image); Index: src/org/apache/xindice/tools/ui/eclipse/widgets/ResourceTreeAndListGroup.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/widgets/ResourceTreeAndListGroup.java,v retrieving revision 1.4 diff -u -r1.4 ResourceTreeAndListGroup.java --- src/org/apache/xindice/tools/ui/eclipse/widgets/ResourceTreeAndListGroup.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/widgets/ResourceTreeAndListGroup.java 10 Jun 2003 03:42:06 -0000 @@ -221,7 +221,7 @@ * Create this group's list viewer. */ protected void createListViewer(Composite parent, int width, int height) { - listViewer = new CheckboxTableViewer(parent, SWT.BORDER); + listViewer = CheckboxTableViewer.newCheckList(parent, SWT.BORDER ); GridData data = new GridData(GridData.FILL_BOTH); data.widthHint = width; data.heightHint = height; Index: src/org/apache/xindice/tools/ui/eclipse/wizards/DataTransferMainPage.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/DataTransferMainPage.java,v retrieving revision 1.4 diff -u -r1.4 DataTransferMainPage.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/DataTransferMainPage.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/DataTransferMainPage.java 10 Jun 2003 03:42:06 -0000 @@ -23,6 +23,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; +import org.eclipse.ui.dialogs.IOverwriteQuery; import org.apache.xindice.tools.ui.eclipse.dialogs.ContainerSelectionDialog; /** Index: src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemExportWizard.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemExportWizard.java,v retrieving revision 1.3 diff -u -r1.3 FileSystemExportWizard.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemExportWizard.java 5 Jun 2003 03:02:39 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemExportWizard.java 10 Jun 2003 03:42:06 -0000 @@ -130,7 +130,7 @@ } if (selectionXpaths.isEmpty()) { - CollectionDescriptor cd = new CollectionDescriptor((Element) theLiaison.getServers().elementIterator().next()); + CollectionDescriptor cd = new CollectionDescriptor((Element) ServerLiaison.getServers().elementIterator().next()); selectionXpaths.add(cd.getXpath()); } } Index: src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemImportWizard.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemImportWizard.java,v retrieving revision 1.4 diff -u -r1.4 FileSystemImportWizard.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemImportWizard.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/FileSystemImportWizard.java 10 Jun 2003 03:42:06 -0000 @@ -147,7 +147,7 @@ } if (selectionXpaths.isEmpty()) { - CollectionDescriptor cd = new CollectionDescriptor((Element) theLiaison.getServers().elementIterator().next()); + CollectionDescriptor cd = new CollectionDescriptor((Element) ServerLiaison.getServers().elementIterator().next()); selectionXpaths.add(cd.getXpath()); } } Index: src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionMainPage.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionMainPage.java,v retrieving revision 1.4 diff -u -r1.4 NewCollectionMainPage.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionMainPage.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionMainPage.java 10 Jun 2003 03:42:07 -0000 @@ -229,8 +229,8 @@ int problem_type = resourceDefiner.getProblemType(); // if blank name then fail silently - if (problem_type == resourceDefiner.PROBLEM_RESOURCE_EMPTY - || problem_type == resourceDefiner.PROBLEM_CONTAINER_EMPTY) { + if (problem_type == ResourceAndContainerDefiner.PROBLEM_RESOURCE_EMPTY + || problem_type == ResourceAndContainerDefiner.PROBLEM_CONTAINER_EMPTY) { setMessage(resourceDefiner.getProblemMessage()); setErrorMessage(null); } Index: src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionWizard.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionWizard.java,v retrieving revision 1.4 diff -u -r1.4 NewCollectionWizard.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionWizard.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/NewCollectionWizard.java 10 Jun 2003 03:42:07 -0000 @@ -13,6 +13,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbench; import org.apache.xindice.tools.ui.eclipse.internuncio.CollectionDescriptor; +import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; import org.apache.xindice.tools.ui.eclipse.util.ImageCurator; /* @@ -74,7 +75,10 @@ } if (initiallySelectedContainer == null) { - initiallySelectedContainer = (Element) theLiaison.getServers().elementIterator().next(); + Iterator serverIterator = ServerLiaison.getServers().elementIterator(); + if ( serverIterator.hasNext() ) { + initiallySelectedContainer = (Element) serverIterator.next(); + } } CollectionDescriptor cd = new CollectionDescriptor(initiallySelectedContainer); Index: src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentMainPage.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentMainPage.java,v retrieving revision 1.4 diff -u -r1.4 NewDocumentMainPage.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentMainPage.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentMainPage.java 10 Jun 2003 03:42:07 -0000 @@ -242,9 +242,9 @@ int problem_type = resourceDefiner.getProblemType(); // if blank name then fail silently - if (problem_type == resourceDefiner.PROBLEM_RESOURCE_EMPTY - || problem_type == resourceDefiner.PROBLEM_CONTAINER_EMPTY - || problem_type == resourceDefiner.PROBLEM_ROOT_ELEMENT_EMPTY) { + if (problem_type == ResourceAndContainerDefiner.PROBLEM_RESOURCE_EMPTY + || problem_type == ResourceAndContainerDefiner.PROBLEM_CONTAINER_EMPTY + || problem_type == ResourceAndContainerDefiner.PROBLEM_ROOT_ELEMENT_EMPTY) { setMessage(resourceDefiner.getProblemMessage()); setErrorMessage(null); } Index: src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentWizard.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentWizard.java,v retrieving revision 1.4 diff -u -r1.4 NewDocumentWizard.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentWizard.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/NewDocumentWizard.java 10 Jun 2003 03:42:07 -0000 @@ -14,6 +14,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbench; import org.apache.xindice.tools.ui.eclipse.internuncio.CollectionDescriptor; +import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; import org.apache.xindice.tools.ui.eclipse.util.ImageCurator; /* @@ -75,7 +76,7 @@ } if (initiallySelectedContainer == null) { - Element first_server = (Element) theLiaison.getServers().elementIterator().next(); + Element first_server = (Element) ServerLiaison.getServers().elementIterator().next(); List elements = first_server.elements(); if (elements.size() == 0) { Index: src/org/apache/xindice/tools/ui/eclipse/wizards/NewServerWizard.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/NewServerWizard.java,v retrieving revision 1.3 diff -u -r1.3 NewServerWizard.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/NewServerWizard.java 5 Jun 2003 03:02:39 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/NewServerWizard.java 10 Jun 2003 03:42:07 -0000 @@ -97,6 +97,7 @@ * true, the wizard will close; otherwise, it will stay active. */ public boolean performFinish() { + logger.debug("in performFinish"); final boolean[] result = new boolean[] { false }; try { Index: src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceExportMainPage.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceExportMainPage.java,v retrieving revision 1.3 diff -u -r1.3 ResourceExportMainPage.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceExportMainPage.java 5 Jun 2003 03:02:39 -0000 1.3 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceExportMainPage.java 10 Jun 2003 03:42:07 -0000 @@ -13,6 +13,13 @@ import java.util.Map; import nox.logger.Logger; + +import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; +import org.apache.xindice.tools.ui.eclipse.navigator.DbTreeContentProvider; +import org.apache.xindice.tools.ui.eclipse.navigator.DbTreeLabelProvider; +import org.apache.xindice.tools.ui.eclipse.widgets.FilterForCollections; +import org.apache.xindice.tools.ui.eclipse.widgets.FilterForDocuments; +import org.apache.xindice.tools.ui.eclipse.widgets.ResourceTreeAndListGroup; import org.dom4j.Element; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IResource; @@ -34,14 +41,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Widget; +import org.eclipse.ui.dialogs.TypeFilteringDialog; import org.eclipse.ui.internal.WorkbenchPlugin; -import org.eclipse.ui.internal.dialogs.TypeFilteringDialog; -import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; -import org.apache.xindice.tools.ui.eclipse.navigator.DbTreeContentProvider; -import org.apache.xindice.tools.ui.eclipse.navigator.DbTreeLabelProvider; -import org.apache.xindice.tools.ui.eclipse.widgets.FilterForCollections; -import org.apache.xindice.tools.ui.eclipse.widgets.FilterForDocuments; -import org.apache.xindice.tools.ui.eclipse.widgets.ResourceTreeAndListGroup; /** * Abstract superclass for a typical export wizard's main page. @@ -443,7 +444,7 @@ */ protected final void createResourcesGroup(Composite parent) { // Create the input element - dataInput = theLiaison.getServers(); + dataInput = ServerLiaison.getServers(); DbTreeContentProvider tree_content_provider = new DbTreeContentProvider(); FilterForCollections tree_filter = new FilterForCollections(); FilterForDocuments list_filter = new FilterForDocuments(); Index: src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceImportMainPage.java =================================================================== RCS file: /home/cvspublic/xml-xindice/java/scratchpad/ui-eclipse/src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceImportMainPage.java,v retrieving revision 1.4 diff -u -r1.4 ResourceImportMainPage.java --- src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceImportMainPage.java 5 Jun 2003 03:02:39 -0000 1.4 +++ src/org/apache/xindice/tools/ui/eclipse/wizards/ResourceImportMainPage.java 10 Jun 2003 03:42:08 -0000 @@ -11,6 +11,9 @@ import java.util.Map; import nox.logger.Logger; + +import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; +import org.apache.xindice.tools.ui.eclipse.widgets.ResourceTreeAndListGroup; import org.dom4j.Element; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; @@ -28,11 +31,8 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.dialogs.FileSystemElement; -import org.eclipse.ui.internal.dialogs.TypeFilteringDialog; import org.eclipse.ui.model.WorkbenchLabelProvider; import org.eclipse.ui.model.WorkbenchViewerSorter; -import org.apache.xindice.tools.ui.eclipse.model.ServerLiaison; -import org.apache.xindice.tools.ui.eclipse.widgets.ResourceTreeAndListGroup; /** * The abstract superclass for a typical import wizard's main page. @@ -326,7 +326,7 @@ * in the receivers types-to-export field */ protected void handleTypesEditButtonPressed() { - TypeFilteringDialog dialog = new TypeFilteringDialog(getContainer().getShell(), getTypesToImport()); + org.eclipse.ui.dialogs.TypeFilteringDialog dialog = new org.eclipse.ui.dialogs.TypeFilteringDialog(getContainer().getShell(), getTypesToImport()); dialog.open(); Object[] newSelectedTypes = dialog.getResult();