Organized imports
authorstefanbjarni <stefanbjarni>
Fri, 6 May 2005 00:58:28 +0000 (00:58 +0000)
committerstefanbjarni <stefanbjarni>
Fri, 6 May 2005 00:58:28 +0000 (00:58 +0000)
Changed one instance reference to a static method to a static reference

279 files changed:
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/model/JSElement.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSParser.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSPartitionScanner.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSReferenceDetector.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSScanner.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSStringScanner.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSSyntaxModelFactory.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/JSSyntaxScanner.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/NonRuleBasedDamagerRepairer.java
archive/net.sourceforge.phpeclipse.js.core/src/net/sourceforge/phpeclipse/js/core/parser/PredicateWordRule.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/AcceptThread.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/DefaultThread.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/IMemento.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/Monitor.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/MonitorManager.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/MonitorPlugin.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/MonitorWorkingCopy.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/XMLMemento.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/http/HTTPConnection.java
archive/net.sourceforge.phpeclipse.monitor.core/src/net/sourceforge/phpdt/monitor/core/internal/http/HTTPThread.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorComposite.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorContentProvider.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorDialog.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorPreferencePage.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorTableLabelProvider.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/MonitorUIPlugin.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/view/MonitorTreeContentProvider.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/view/MonitorView.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/view/TreeLabelProvider.java
archive/net.sourceforge.phpeclipse.monitor.ui/src/net/sourceforge/phpdt/monitor/ui/internal/viewers/XMLViewer.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/debug/core/PHPDebugModel.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGInterface.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGPacket.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDBGProxy.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDebugCorePlugin.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/PHPDegugCorePluginImages.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPBreakpoint.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/breakpoints/PHPLineBreakpoint.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/EventDetailsDialog.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/logview/LogView.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/IPHPDebugTarget.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPDBGEvalString.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPDebugTarget.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPStackFrame.java
net.sourceforge.phpeclipse.debug.core/src/net/sourceforge/phpdt/internal/debug/core/model/PHPValue.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/debug/ui/PHPDebugUiImages.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPDebugModelPresentation.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/PHPSourceLocator.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/PHPManageBreakpointRulerAction.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/RetargettableActionAdapterFactory.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/actions/ToggleBreakpointAdapter.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/LoadPathEntryLabelProvider.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPApplicationTabGroup.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/launcher/PHPEnvironmentTab2.java
net.sourceforge.phpeclipse.debug.ui/src/net/sourceforge/phpdt/internal/debug/ui/preferences/EditPathMapDialog.java
net.sourceforge.phpeclipse.launching/src/net/sourceforge/phpdt/internal/launching/PHPLaunchConfigurationDelegate.java
net.sourceforge.phpeclipse.phphelp/src/net/sourceforge/phpdt/phphelp/PHPHelpPlugin.java
net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/PHPUnitView.java
net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/TestPoolContentProvider.java
net.sourceforge.phpeclipse.phpunit/src/net/sourceforge/phpeclipse/phpunit/preferences/PHPUnitPreferencePage.java
net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/editor/ShowExternalPreviewAction.java
net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/IMiscProjectPreferences.java
net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpeclipse/ui/preferences/PHPMiscProjectPreferences.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/IWebBrowserEditorInput.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/OpenBrowserAction.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/OpenBrowserWorkbenchAction.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowser.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/WebBrowserEditorInput.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserContentProvider.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserSearcher.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserTableComposite.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BrowserTableLabelProvider.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/BusyIndicator.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/ImageResource.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternalBrowserDialog.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/InternetPreferencePage.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OpenWithBrowserActionDelegate.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/OrganizeFavoritesDialog.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/SwitchBrowserWorkbenchAction.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/TextAction.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowser.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditor.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserEditorActionBarContributor.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserPreference.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserPreferencePage.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUIPlugin.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/internal/WebBrowserUtil.java
net.sourceforge.phpeclipse.webbrowser/src/net/sourceforge/phpeclipse/webbrowser/views/BrowserView.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/DTDMergeViewer.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/DTDEditor.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLDocumentProvider.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/editor/XMLDocumentSetupParticipant.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/outline/XMLOutlineContentProvider.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/outline/XMLOutlineLabelProvider.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/outline/XMLOutlinePage.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/preferences/XMLSyntaxPreferencePage.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/AbstractDocumentProvider.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/AttValueDoubleClickStrategy.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/DTDConfiguration.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/DTDDocumentProvider.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/DeclScanner.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/SimpleDoubleClickStrategy.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/TagDoubleClickStrategy.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/TextScanner.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLCDATAScanner.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLReconcilingStrategy.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/text/XMLTagScanner.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/DTDTextTools.java
net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/XMLTextTools.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ClasspathVariableInitializer.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/CompletionProposal.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICodeFormatter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICompilationUnit.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IMember.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IOpenable.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/IType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/JavaConventions.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/internal/model/VariableContextManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsMainTab.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/launchConfigurations/ExternalToolsUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/externaltools/model/ToolUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/Compiler.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/DocumentElementParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ISourceElementRequestor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/batch/FileSystem.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/env/ISourceType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/ExceptionHandlingFlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/FlowContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/UnconditionalFlowInfo.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/impl/CompilerOptions.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/BlockScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/MethodScope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/Scope.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ClasspathEntry.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitProblemFinder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitStructureRequestor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CreateElementInCUOperation.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CreatePackageDeclarationOperation.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ImportDeclaration.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/InternalNamingConventions.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/LocalVariable.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Member.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/ModelUpdater.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/Openable.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceMethod.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/SourceType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/IncrementalImageBuilder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/CompilationUnit.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/jdom/SimpleDOMBuilder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/ASTNodeFinder.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/util/CommentRecorderParser.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/codemanipulation/GetterSetterUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/codemanipulation/StubUtility.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/refactoring/util/ResourceUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CodeTemplateContextType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/CompilationUnitContextType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/HTMLUnitContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/JavaDocContext.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/JavaDocContextType.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/JavaFormatter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/template/php/TemplateSet.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/corext/util/JdtFlags.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/JavaElementProperties.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/ResourceAdapterFactory.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/BlockCommentAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/FoldingActionGroup.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/FoldingExpandAllRulerAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/FoldingToggleRulerAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/actions/RemoveBlockCommentAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/dnd/BasicSelectionTransferDragAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/dnd/DelegatingDragAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/dnd/DelegatingDropAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/dnd/JdtViewerDragAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/dnd/JdtViewerDropAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/ClassFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/ClosedProjectFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/CustomFiltersDialog.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/ImportDeclarationFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/InterfaceFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/JavaFileFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/NamePatternFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/NonJavaElementFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/NonJavaProjectsFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/NonPublicTypeFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/filters/NonSharedProjectFilter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CodeAssistConfigurationBlock.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/ColorEditor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/CompilerPropertyPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/JavaPreferencesSettings.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/MembersOrderPreferenceCache.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/OverlayPreferenceStore.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/SpellingConfigurationBlock.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TodoTaskConfigurationBlock.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TodoTaskInputDialog.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TodoTaskPropertyPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/CompositeReconcilingStrategy.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/FastJavaPartitionScanner.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/HTMLPrinter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PreferencesAdapter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/SmartBackspaceManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/TypingRunDetector.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/EmptyJavaFoldingPreferenceBlock.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/folding/JavaFoldingStructureProviderDescriptor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/IJavaReconcilingListener.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaInformationProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/JavaTypeHover.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/link/ProposalPosition.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/spelling/SpellReconcileStrategy.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/MultiVariableGuess.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/PositionBasedCompletionProposal.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/contentassist/TemplateInformationControlCreator.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/util/SWTUtil.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/FilterUpdater.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ImageImageDescriptor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaElementImageProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/JavaUILabelProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemMarkerManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ProblemTreeViewer.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/ResourceToItemsMapper.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/viewsupport/StorageLabelProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/CodeGeneration.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/ITypeHierarchyViewPart.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/IWorkingCopyManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/IWorkingCopyManagerExtension.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaElementImageDescriptor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/JavaUI.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/OverrideIndicatorLabelDecorator.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/StandardJavaElementContentProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenEditorActionGroup.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/actions/OpenPHPPerspectiveAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/folding/IJavaFoldingStructureProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/java/hover/IJavaEditorTextHover.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewContainerWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/wizards/NewTypeWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/IPreferenceConstants.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/PHPeclipsePlugin.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPDocumentorAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPEclipseShowAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/actions/PHPExternalParserAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/FalseLiteral.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/JavadocReturnStatement.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/QualifiedNameReference.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/Reference.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SingleNameReference.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/SingleTypeReference.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TrueLiteral.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/TypeDeclaration.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/obfuscator/ObfuscatorIgnoreSet.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/GotoAnnotationAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/ICompilationUnitDocumentProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/WorkingCopyManager.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLCodeScanner.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/HTMLPartitionScanner.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPConstant.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartition_delete_it.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/Partition.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PartitionStack.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/preferences/PHPEclipseParserPreferencePage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/HTMLFileWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/PHPFileWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/ElementWriter.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/FormElementWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/InsertHTMLElementAction.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/ListElementWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/NewElementWizardPage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/NumVerifyListener.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/SomeItemInputDialog.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/TableElementCellModifier.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/TableElementContentProvider.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/wizards/html/TableElementLabelProvider.java

index 034b2e3..f5fd110 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:39  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.2  2004/02/27 18:28:10  cell
  * Make model elements platform objects so they are automatically adapted
  *
@@ -32,8 +35,8 @@
 
 package net.sourceforge.phpeclipse.js.core.model;
 
-import java.util.List;
 import java.util.LinkedList;
+import java.util.List;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.PlatformObject;
index 28ea672..7db271f 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2005/04/06 18:29:29  axelcl
+ * Avoid NullPointerException
+ *
  * Revision 1.1  2004/09/02 18:14:38  jsurfer
  * intial source from ttp://www.sf.net/projects/wdte
  *
@@ -53,7 +56,14 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
-import net.sourceforge.phpeclipse.js.core.model.*;
+import net.sourceforge.phpeclipse.js.core.model.JSClassElement;
+import net.sourceforge.phpeclipse.js.core.model.JSClassMethodElement;
+import net.sourceforge.phpeclipse.js.core.model.JSClassVariableElement;
+import net.sourceforge.phpeclipse.js.core.model.JSElement;
+import net.sourceforge.phpeclipse.js.core.model.JSFunctionElement;
+import net.sourceforge.phpeclipse.js.core.model.JSGlobalVariableElement;
+import net.sourceforge.phpeclipse.js.core.model.JSInstanceMethodElement;
+import net.sourceforge.phpeclipse.js.core.model.JSInstanceVariableElement;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.text.BadLocationException;
index a2a8b8d..ce1f7d4 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.2  2004/11/02 19:51:53  axelcl
+ * delete finally
+ *
  * Revision 1.2  2004/09/15 06:52:15  agfitzp
  * added finally keyword... finally
  *
@@ -37,15 +40,20 @@ package net.sourceforge.phpeclipse.js.core.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-//import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.rules.*;
+
+import org.eclipse.jface.text.rules.IPredicateRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
 
 /**
  * 
  *
- * @author $Author: axelcl $, $Date: 2004-11-02 19:51:53 $
+ * @author $Author: stefanbjarni $, $Date: 2005-05-06 00:58:28 $
  *
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 public class JSPartitionScanner extends RuleBasedPartitionScanner {
        public final static String JS_DEFAULT = "__js_default";
index d8be925..65cd2b7 100644 (file)
@@ -4,6 +4,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
@@ -20,6 +23,8 @@
  */
 package net.sourceforge.phpeclipse.js.core.parser;
 
+import org.eclipse.jface.text.rules.IWordDetector;
+
 /**
  * @author fitzpata
  */
index 7fbb3e6..e119b16 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
 
 package net.sourceforge.phpeclipse.js.core.parser;
 
-import java.util.*;
-import org.eclipse.jface.text.rules.*;
-import org.eclipse.jface.text.*;
+import java.util.ArrayList;
+import java.util.List;
 
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.swt.graphics.Color;
 
 /**
  * 
  *
- * @author $Author: jsurfer $, $Date: 2004-09-02 18:14:38 $
+ * @author $Author: stefanbjarni $, $Date: 2005-05-06 00:58:28 $
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class JSScanner extends RuleBasedScanner
 {
index b9cbaf4..f60a19b 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
 
 package net.sourceforge.phpeclipse.js.core.parser;
 
-import org.eclipse.jface.text.*;
-import java.util.*;
-import org.eclipse.jface.text.rules.*;
+import java.util.Vector;
 
+import org.eclipse.jface.text.TextAttribute;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
 import org.eclipse.swt.graphics.Color;
 
 
 /**
  * 
  *
- * @author $Author: jsurfer $, $Date: 2004-09-02 18:14:38 $
+ * @author $Author: stefanbjarni $, $Date: 2005-05-06 00:58:28 $
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class JSStringScanner extends RuleBasedScanner
 {
index 2d4b149..33d07d0 100644 (file)
@@ -7,6 +7,9 @@
  * Modifications history
  * ========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.2  2004/02/27 17:25:25  cell
  * Fix NPE for files without an extension
  *
@@ -34,6 +37,8 @@ package net.sourceforge.phpeclipse.js.core.parser;
 import java.util.LinkedList;
 import java.util.List;
 
+import net.sourceforge.phpeclipse.js.core.model.JSElementList;
+
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -42,8 +47,6 @@ import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
 
-import net.sourceforge.phpeclipse.js.core.model.*;
-
 /**
  * @author Addi
  */
index 544e96f..e1502ad 100644 (file)
@@ -4,6 +4,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
@@ -22,7 +25,15 @@ package net.sourceforge.phpeclipse.js.core.parser;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.eclipse.jface.text.rules.*;
+
+import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
+import org.eclipse.jface.text.rules.IRule;
+import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.MultiLineRule;
+import org.eclipse.jface.text.rules.SingleLineRule;
+import org.eclipse.jface.text.rules.Token;
+import org.eclipse.jface.text.rules.WhitespaceRule;
+import org.eclipse.jface.text.rules.WordRule;
 
 /**
  * Scanner for detecting syntactic elements: comments, strings, classes, functions
index 0f99bfd..4ad8c14 100644 (file)
@@ -9,6 +9,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
@@ -36,16 +39,15 @@ import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.TextPresentation;
 import org.eclipse.jface.text.presentation.IPresentationDamager;
 import org.eclipse.jface.text.presentation.IPresentationRepairer;
-//import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.custom.StyleRange;
 
 
 /**
  * 
  *
- * @author $Author: jsurfer $, $Date: 2004-09-02 18:14:38 $
+ * @author $Author: stefanbjarni $, $Date: 2005-05-06 00:58:28 $
  *
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class NonRuleBasedDamagerRepairer implements IPresentationDamager, IPresentationRepairer
 {
index d59d81c..517aac6 100644 (file)
@@ -4,6 +4,9 @@
  * Modifications history
  *========================================================================
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/02 18:14:38  jsurfer
+ * intial source from ttp://www.sf.net/projects/wdte
+ *
  * Revision 1.1  2004/02/26 02:25:42  agfitzp
  * renamed packages to match xml & css
  *
@@ -23,9 +26,9 @@ package net.sourceforge.phpeclipse.js.core.parser;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IPredicateRule;
 import org.eclipse.jface.text.rules.IToken;
+import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.jface.text.rules.IWordDetector;
 
 /**
  * @author fitzpata
index 0b2d08d..9ccc8ac 100644 (file)
@@ -11,7 +11,9 @@
 package net.sourceforge.phpdt.monitor.core.internal;
 
 import java.io.InterruptedIOException;
-import java.net.*;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
 
 import net.sourceforge.phpdt.monitor.core.IMonitor;
 /**
index bd8c2a3..f9cbb2e 100644 (file)
@@ -10,7 +10,9 @@
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 /**
  * Monitor server I/O thread.
  */
index 25f0e77..10426d8 100644 (file)
@@ -11,6 +11,9 @@
 package net.sourceforge.phpdt.monitor.core.internal;
 
 import java.util.List;
+
+import org.eclipse.ui.IElementFactory;
+import org.eclipse.ui.IPersistableElement;
 /**
  * Interface to a memento used for saving the important state of an object
  * in a form that can be persisted in the file system.
index 4271d1c..4e820fe 100644 (file)
@@ -10,7 +10,9 @@
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal;
 
-import net.sourceforge.phpdt.monitor.core.*;
+import net.sourceforge.phpdt.monitor.core.IMonitor;
+import net.sourceforge.phpdt.monitor.core.IMonitorWorkingCopy;
+import net.sourceforge.phpdt.monitor.core.IProtocolAdapter;
 /**
  * 
  */
index f846947..4255866 100644 (file)
@@ -17,7 +17,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import net.sourceforge.phpdt.monitor.core.*;
+import net.sourceforge.phpdt.monitor.core.IMonitor;
+import net.sourceforge.phpdt.monitor.core.IMonitorListener;
+import net.sourceforge.phpdt.monitor.core.IMonitorWorkingCopy;
+import net.sourceforge.phpdt.monitor.core.IRequest;
+import net.sourceforge.phpdt.monitor.core.IRequestListener;
 
 import org.eclipse.core.runtime.Preferences;
 /**
index d62498b..fb0a082 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 import net.sourceforge.phpdt.monitor.core.IContentFilter;
 import net.sourceforge.phpdt.monitor.core.IProtocolAdapter;
 import net.sourceforge.phpdt.monitor.core.IRequestListener;
 
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
 /**
  * The monitor core plugin.
  */
index ecca3dc..16fc9c3 100644 (file)
@@ -10,7 +10,9 @@
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal;
 
-import net.sourceforge.phpdt.monitor.core.*;
+import net.sourceforge.phpdt.monitor.core.IMonitor;
+import net.sourceforge.phpdt.monitor.core.IMonitorWorkingCopy;
+import net.sourceforge.phpdt.monitor.core.IProtocolAdapter;
 /**
  * 
  */
index bd4f98d..4b65ef3 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal;
 
-import java.io.*;
-import java.util.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
 import java.net.URL;
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import java.util.ArrayList;
+import java.util.List;
 
-import javax.xml.parsers.*;
-import javax.xml.transform.*;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
+
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
 /**
  * A Memento is a class independent container for persistence
  * info.  It is a reflection of 3 storage requirements.
index f6ab4c3..7cb9983 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal.http;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import net.sourceforge.phpdt.monitor.core.IMonitor;
 import net.sourceforge.phpdt.monitor.core.IRequest;
 import net.sourceforge.phpdt.monitor.core.internal.Request;
 import net.sourceforge.phpdt.monitor.core.internal.Trace;
-
-
-import java.util.List;
-import java.util.ArrayList;
 /**
  * Manages a monitor server connection between two hosts. This
  * connection may spawn one or more TCP/IP pairs to be displayed
index 1530d89..df0a10c 100644 (file)
@@ -10,7 +10,9 @@
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.core.internal.http;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 import net.sourceforge.phpdt.monitor.core.IRequest;
 import net.sourceforge.phpdt.monitor.core.internal.Connection;
index ec1d9a6..1d437f7 100644 (file)
@@ -12,7 +12,7 @@ package net.sourceforge.phpdt.monitor.ui.internal;
 
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List; 
+import java.util.List;
 
 import net.sourceforge.phpdt.monitor.core.IMonitor;
 import net.sourceforge.phpdt.monitor.core.IMonitorWorkingCopy;
@@ -20,7 +20,14 @@ import net.sourceforge.phpdt.monitor.core.MonitorCore;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
index aa08b4f..c1459f8 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.ui.internal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import net.sourceforge.phpdt.monitor.core.IMonitor;
 import net.sourceforge.phpdt.monitor.core.MonitorCore;
 
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
 /**
  * Monitor content provider.
  */
index 9ef6c99..6434ec1 100644 (file)
@@ -19,7 +19,10 @@ import net.sourceforge.phpdt.monitor.core.MonitorCore;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
index 86ba1aa..02b2848 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.ui.internal;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+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.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.help.WorkbenchHelp;
index 0832a84..6e32e21 100644 (file)
@@ -13,9 +13,8 @@ package net.sourceforge.phpdt.monitor.ui.internal;
 import net.sourceforge.phpdt.monitor.core.IMonitor;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
-
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.swt.graphics.Image;
 /**
  * Monitor table label provider.
  */
index 0f9f5f3..6d3f6b3 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.ui.internal;
 
-import java.util.*;
 import java.net.URL;
 import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
 
-import org.eclipse.swt.graphics.Image;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.core.runtime.*;
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 /**
index b73ed65..8ea1926 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.ui.internal.view;
 
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 import net.sourceforge.phpdt.monitor.core.IRequest;
 import net.sourceforge.phpdt.monitor.core.MonitorCore;
 
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
 /**
  * Content provider for the monitor server view.
  */
index 1fe3a56..10f3499 100644 (file)
@@ -14,8 +14,14 @@ import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
 
-import net.sourceforge.phpdt.monitor.core.*;
-import net.sourceforge.phpdt.monitor.ui.internal.*;
+import net.sourceforge.phpdt.monitor.core.IContentFilter;
+import net.sourceforge.phpdt.monitor.core.IRequest;
+import net.sourceforge.phpdt.monitor.core.IRequestListener;
+import net.sourceforge.phpdt.monitor.core.MonitorCore;
+import net.sourceforge.phpdt.monitor.ui.internal.ContextIds;
+import net.sourceforge.phpdt.monitor.ui.internal.MonitorPrefrencesDialog;
+import net.sourceforge.phpdt.monitor.ui.internal.MonitorUIPlugin;
+import net.sourceforge.phpdt.monitor.ui.internal.Trace;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.jface.action.Action;
@@ -30,7 +36,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
-
 import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
index 1a8cdb7..defe232 100644 (file)
@@ -11,7 +11,7 @@
 package net.sourceforge.phpdt.monitor.ui.internal.view;
 
 import net.sourceforge.phpdt.monitor.core.IRequest;
-import net.sourceforge.phpdt.monitor.ui.internal.*;
+import net.sourceforge.phpdt.monitor.ui.internal.MonitorUIPlugin;
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
index a8a0a40..fc9d4ea 100644 (file)
@@ -10,7 +10,9 @@
  **********************************************************************/
 package net.sourceforge.phpdt.monitor.ui.internal.viewers;
  
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -29,7 +31,6 @@ import net.sourceforge.phpdt.monitor.ui.IContentViewer;
 import net.sourceforge.phpdt.monitor.ui.internal.ContextIds;
 
 import org.eclipse.jface.resource.JFaceResources;
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StackLayout;
 import org.eclipse.swt.layout.GridData;
@@ -38,10 +39,8 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.help.WorkbenchHelp;
-
-
-import org.w3c.dom.*;
-import org.xml.sax.*;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
 /**
  * XML Viewer.
  */
index 45455ff..63231ae 100644 (file)
@@ -16,7 +16,7 @@ import java.util.Map;
 
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
-//import net.sourceforge.phpdt.internal.debug.core.breakpoints.IPHPLineBreakpoint;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Preferences;
index 5433b6b..ef96492 100644 (file)
@@ -11,19 +11,19 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.debug.core;
 
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Vector;
 
+import net.sourceforge.phpdt.internal.debug.core.model.PHPDBGEvalString;
+import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
+import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable;
+
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugException;
 
-import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
-import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable;
-import net.sourceforge.phpdt.internal.debug.core.model.PHPDBGEvalString;
-
 public class PHPDBGInterface {
 
        // Public
index 03d3350..9c1c322 100644 (file)
@@ -10,9 +10,9 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.debug.core;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Vector;
-import java.io.IOException;
 public class PHPDBGPacket {
 
        private static final int PACKET_HEADER_SIZE= 16;
index 0ba0723..197fa7f 100644 (file)
@@ -17,7 +17,6 @@ import java.net.SocketTimeoutException;
 import java.util.Map;
 
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
-import net.sourceforge.phpdt.internal.debug.core.logview.LogView;
 import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget;
 import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
 import net.sourceforge.phpdt.internal.debug.core.model.PHPThread;
@@ -29,8 +28,6 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
 
 public class PHPDBGProxy {
 
index 6fd64ee..4efdb76 100644 (file)
@@ -3,15 +3,12 @@ package net.sourceforge.phpdt.internal.debug.core;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
-import net.sourceforge.phpdt.internal.debug.core.logview.LogView;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
index 7e48417..a49505e 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.debug.core;
 
-import java.net.*;
+import java.net.MalformedURLException;
+import java.net.URL;
 
-import org.eclipse.jface.resource.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
 
 public class PHPDegugCorePluginImages {
index 6d021af..4541160 100644 (file)
@@ -12,14 +12,15 @@ Contributors:
 package net.sourceforge.phpdt.internal.debug.core.breakpoints;
 
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
-import org.eclipse.core.resources.IWorkspaceRunnable;
+
 import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IWorkspaceRunnable;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.DebugException;
-import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.Breakpoint;
+import org.eclipse.debug.core.model.IBreakpoint;
 
 /**
  * A breakpoint is capable of suspending the execution of a
index 804b2d8..a9712ec 100644 (file)
@@ -12,10 +12,10 @@ package net.sourceforge.phpdt.internal.debug.core.breakpoints;
 
 import java.util.Map;
 
-import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRunnable;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.model.IBreakpoint;
index 8736c10..ea7ab86 100644 (file)
@@ -20,8 +20,8 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 
-import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages;
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
+import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.dialogs.Dialog;
index c31a2f4..2d13d5c 100644 (file)
@@ -27,8 +27,8 @@ import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Date;
 
-import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages;
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
+import net.sourceforge.phpdt.internal.debug.core.PHPDegugCorePluginImages;
 
 import org.eclipse.core.runtime.ILogListener;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -91,7 +91,6 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.IMemento;
 import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IViewSite;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
index e51c63f..6bcd61c 100644 (file)
@@ -11,9 +11,10 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.debug.core.model;
 
-import org.eclipse.debug.core.model.IDebugTarget;
 import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy;
 
+import org.eclipse.debug.core.model.IDebugTarget;
+
 public interface IPHPDebugTarget extends IDebugTarget {
 
        public final static String MODEL_IDENTIFIER = "net.sourceforge.phpdt.debug.core";
index 8a15874..4225702 100644 (file)
@@ -15,9 +15,10 @@ package net.sourceforge.phpdt.internal.debug.core.model;
 
 import java.util.Vector;
 
-import org.eclipse.debug.core.DebugException;
 import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
+
 import org.eclipse.core.runtime.Status;
+import org.eclipse.debug.core.DebugException;
 
 
 public class PHPDBGEvalString {
index c86f72b..3471fd4 100644 (file)
@@ -11,6 +11,9 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.debug.core.model;
 
+import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy;
+import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
+
 import org.eclipse.core.resources.IMarkerDelta;
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
@@ -19,15 +22,12 @@ import org.eclipse.debug.core.IBreakpointManager;
 import org.eclipse.debug.core.IDebugEventSetListener;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchListener;
-import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IBreakpoint;
+import org.eclipse.debug.core.model.IDebugTarget;
 import org.eclipse.debug.core.model.IMemoryBlock;
 import org.eclipse.debug.core.model.IProcess;
 import org.eclipse.debug.core.model.IThread;
 
-import net.sourceforge.phpdt.internal.debug.core.PHPDebugCorePlugin;
-import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy;
-
 /**
  * Debug target for PHP debug model.
  */
index 2e1d71f..af564eb 100644 (file)
@@ -11,6 +11,8 @@ Contributors:
 **********************************************************************/
 package net.sourceforge.phpdt.internal.debug.core.model;
 
+import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy;
+
 import org.eclipse.debug.core.DebugEvent;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
@@ -20,8 +22,6 @@ import org.eclipse.debug.core.model.IRegisterGroup;
 import org.eclipse.debug.core.model.IStackFrame;
 import org.eclipse.debug.core.model.IThread;
 import org.eclipse.debug.core.model.IVariable;
-import net.sourceforge.phpdt.internal.debug.core.PHPDBGProxy;
-import net.sourceforge.phpdt.internal.debug.core.model.PHPDebugTarget;
 
 public class PHPStackFrame implements IStackFrame {
 
index ba349af..caecb89 100644 (file)
@@ -15,6 +15,7 @@ package net.sourceforge.phpdt.internal.debug.core.model;
 
 import java.util.Iterator;
 import java.util.Vector;
+
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.model.IDebugTarget;
index 77a48a9..1cd7a0b 100644 (file)
@@ -3,14 +3,12 @@ package net.sourceforge.phpdt.debug.ui;
 import java.net.MalformedURLException;
 import java.net.URL;
 
-// import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
+import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 
-//import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.swt.graphics.Image;
-import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 
 public class PHPDebugUiImages {
 
index c7ff6ee..0e447a3 100644 (file)
@@ -13,23 +13,23 @@ package net.sourceforge.phpdt.internal.debug.ui;
 
 import java.util.HashMap;
 
-import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
 import net.sourceforge.phpdt.internal.debug.core.model.IPHPDebugTarget;
 import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
 import net.sourceforge.phpdt.internal.debug.core.model.PHPThread;
-import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable;
 import net.sourceforge.phpdt.internal.debug.core.model.PHPValue;
+import net.sourceforge.phpdt.internal.debug.core.model.PHPVariable;
+
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.core.model.IBreakpoint;
-import org.eclipse.debug.ui.IDebugModelPresentation;
-import org.eclipse.debug.ui.IValueDetailListener;
+import org.eclipse.debug.core.model.IValue;
 import org.eclipse.debug.ui.DebugUITools;
+import org.eclipse.debug.ui.IDebugModelPresentation;
 import org.eclipse.debug.ui.IDebugUIConstants;
+import org.eclipse.debug.ui.IValueDetailListener;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorDescriptor;
index aaba834..8dfbfdd 100644 (file)
@@ -1,7 +1,7 @@
 package net.sourceforge.phpdt.internal.debug.ui;
 
-import java.util.Map;
 import java.util.Iterator;
+import java.util.Map;
 
 import net.sourceforge.phpdt.internal.debug.core.model.PHPStackFrame;
 import net.sourceforge.phpdt.internal.launching.PHPLaunchConfigurationAttribute;
@@ -19,9 +19,7 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.model.IPersistableSourceLocator;
 import org.eclipse.debug.core.model.IStackFrame;
 import org.eclipse.debug.ui.ISourcePresentation;
-//import org.eclipse.ui.IEditorDescriptor;
 import org.eclipse.ui.IEditorInput;
-//import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
index 5504625..5b1c7ef 100644 (file)
@@ -17,12 +17,13 @@ import java.util.List;
 
 import net.sourceforge.phpdt.debug.core.PHPDebugModel;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
+
+import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.debug.core.DebugException;
 import org.eclipse.debug.core.DebugPlugin;
index 6fa47db..1c2c288 100644 (file)
@@ -25,6 +25,7 @@ import net.sourceforge.phpdt.debug.core.PHPDebugModel;
 import net.sourceforge.phpdt.internal.debug.core.breakpoints.PHPLineBreakpoint;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
index 647329c..6784d49 100644 (file)
@@ -3,6 +3,7 @@ package net.sourceforge.phpdt.internal.debug.ui.launcher;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiPlugin;
 import net.sourceforge.phpeclipse.LoadPathEntry;
 
+import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.swt.graphics.Image;
index 1e7b47d..f4e47f6 100644 (file)
@@ -4,6 +4,7 @@ import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
 import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;
+import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
 
 public class PHPApplicationTabGroup
        extends AbstractLaunchConfigurationTabGroup {
index 7a8ba78..9681d2c 100644 (file)
@@ -13,8 +13,6 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
-//import net.sourceforge.phpdt.internal.debug.core.Environment;
-
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
 
 import org.eclipse.core.runtime.CoreException;
@@ -33,9 +31,6 @@ import org.eclipse.debug.internal.ui.launchConfigurations.EnvironmentVariable;
 import org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsMessages;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
 import org.eclipse.debug.ui.IDebugUIConstants;
-//import org.eclipse.debug.ui.EnvironmentTab.EnvironmentVariableContentProvider;
-//import org.eclipse.debug.ui.EnvironmentTab.EnvironmentVariableLabelProvider;
-//import org.eclipse.debug.ui.EnvironmentTab.NativeEnvironmentDialog;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogSettings;
 import org.eclipse.jface.dialogs.MessageDialog;
index 7fe69d4..c6e88e8 100644 (file)
@@ -6,8 +6,8 @@
  */
 package net.sourceforge.phpdt.internal.debug.ui.preferences;
 
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
 import net.sourceforge.phpdt.internal.debug.ui.PHPDebugUiMessages;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.DirectoryDialog;
-//import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
index e9db3d1..434dd50 100644 (file)
@@ -14,11 +14,6 @@ package net.sourceforge.phpdt.internal.launching;
 //import java.io.OutputStream;
 
 
-import net.sourceforge.phpdt.internal.core.JavaProject;
-import net.sourceforge.phpeclipse.ui.editor.BrowserUtil;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -26,6 +21,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchConfiguration;
+import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 import org.eclipse.debug.core.model.LaunchConfigurationDelegate;
 //import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
 
index d6fc392..0790305 100644 (file)
@@ -13,10 +13,8 @@ package net.sourceforge.phpdt.phphelp;
 
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IPluginDescriptor;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.preference.IPreferenceStore;
index 7ceff39..46a1f82 100644 (file)
@@ -16,7 +16,8 @@ import java.io.FileWriter;
 import java.io.IOException;
 
 import net.sourceforge.phpeclipse.phpunit.preferences.PHPUnitPreferencePage;
-import net.sourceforge.phpeclipse.phpunit.reporthandling.*;
+import net.sourceforge.phpeclipse.phpunit.reporthandling.ConnectionListener;
+import net.sourceforge.phpeclipse.phpunit.reporthandling.XMLReportHandler;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestPool;
 import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
index a255012..b099ef6 100644 (file)
@@ -11,7 +11,8 @@ package net.sourceforge.phpeclipse.phpunit;
 
 import java.util.Vector;
 
-import net.sourceforge.phpeclipse.phpunit.testpool.*;
+import net.sourceforge.phpeclipse.phpunit.testpool.TestCase;
+import net.sourceforge.phpeclipse.phpunit.testpool.TestSuite;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
index 63027fd..c00c15b 100644 (file)
@@ -9,11 +9,13 @@
 
 package net.sourceforge.phpeclipse.phpunit.preferences;
 
-import org.eclipse.jface.preference.*;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.IWorkbench;
 import net.sourceforge.phpeclipse.phpunit.PHPUnitPlugin;
+
+import org.eclipse.jface.preference.DirectoryFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
 
 /**
  * This class represents a preference page that
index 7b6dd8e..8ba89aa 100644 (file)
@@ -64,7 +64,7 @@ public class ShowExternalPreviewAction extends TextEditorAction {
         IPreferenceConstants.PHP_BRING_TO_TOP_PREVIEW_DEFAULT);
 
     if (autoPreview) {
-      IWorkbenchPage page = WebUI.getDefault().getActivePage();
+      IWorkbenchPage page = WebUI.getActivePage();
       try {
         IViewPart part = page.findView(BrowserView.ID_BROWSER);
         if (part == null) {
index c0073b1..480245a 100644 (file)
@@ -6,9 +6,6 @@ import net.sourceforge.phpeclipse.ui.overlaypages.FieldEditorOverlayPage;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PathEditor;
 import org.eclipse.jface.preference.StringFieldEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
index 8b09411..67bc2c7 100644 (file)
@@ -10,9 +10,6 @@
  */
 package net.sourceforge.phpeclipse.webbrowser;
 
-import net.sourceforge.phpeclipse.webbrowser.WebBrowser;
-import net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput;
-
 import org.eclipse.jface.action.Action;
 /**
  * Action to open the Web browser.
index 6041214..966d2e3 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser;
 
-import net.sourceforge.phpeclipse.webbrowser.WebBrowser;
-import net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput;
-
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.*;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 /**
  * Action to open the Web broswer.
  */
index e348805..9016046 100644 (file)
@@ -13,7 +13,12 @@ package net.sourceforge.phpeclipse.webbrowser;
 import java.net.URL;
 import java.util.List;
 
-import net.sourceforge.phpeclipse.webbrowser.internal.*;
+import net.sourceforge.phpeclipse.webbrowser.internal.BrowserManager;
+import net.sourceforge.phpeclipse.webbrowser.internal.ExternalWebBrowserWorkingCopy;
+import net.sourceforge.phpeclipse.webbrowser.internal.Trace;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserEditor;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin;
+import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
 
 import org.eclipse.swt.widgets.Display;
 /**
index fd5e16a..aeec7e4 100644 (file)
@@ -17,9 +17,11 @@ import net.sourceforge.phpeclipse.webbrowser.internal.Trace;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserPreference;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUIPlugin;
 
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.*;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IElementFactory;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.IPersistableElement;
 /**
  * The editor input for the integrated web browser.
  */
index bbbdafc..fd2696f 100644 (file)
  **********************************************************************/
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 
-import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
 
 /**
  * Monitor content provider.
index 4c67268..7884159 100644 (file)
@@ -18,11 +18,11 @@ import java.util.List;
 
 import net.sourceforge.phpeclipse.webbrowser.IExternalWebBrowserWorkingCopy;
 
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.swt.widgets.DirectoryDialog;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.core.runtime.IProgressMonitor;
 /**
  * 
  */
index 4bbd1a8..aca9922 100644 (file)
@@ -18,18 +18,28 @@ import net.sourceforge.phpeclipse.webbrowser.IInternalWebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.IInternalWebBrowserWorkingCopy;
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.CheckStateChangedEvent;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ICheckStateListener;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableLayout;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableColumn;
+import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.jface.viewers.CheckStateChangedEvent;
-import org.eclipse.jface.viewers.CheckboxTableViewer;
-import org.eclipse.jface.viewers.ICheckStateListener;
 /**
  * 
  */
index 789387e..bdbc77c 100644 (file)
@@ -15,9 +15,8 @@ import net.sourceforge.phpeclipse.webbrowser.IInternalWebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
-
-import org.eclipse.swt.graphics.Image;
 import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.swt.graphics.Image;
 /**
  * Web browser table label provider.
  */
index baadaeb..1b4caa2 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.graphics.*;
+import org.eclipse.swt.events.PaintEvent;
+import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.graphics.GC;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.widgets.Canvas;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 /**
  * An animated image to show busy status of the Web browser.
  */
index aaa2c4c..5548430 100644 (file)
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
 import java.net.URL;
-import java.util.Map;
 import java.util.HashMap;
-import org.eclipse.swt.graphics.Image;
+import java.util.Map;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.swt.graphics.Image;
 /**
  * Utility class to handle image resources.
  */
index 11cb860..7f09e03 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
 import net.sourceforge.phpeclipse.webbrowser.IInternalWebBrowserWorkingCopy;
-import net.sourceforge.phpeclipse.webbrowser.internal.SWTUtil;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.swt.SWT;
index cc403d8..2628bf2 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.help.WorkbenchHelp;
index c82da80..7445daf 100644 (file)
@@ -15,13 +15,12 @@ import java.util.Iterator;
 
 import net.sourceforge.phpeclipse.webbrowser.WebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput;
-import net.sourceforge.phpeclipse.webbrowser.internal.Trace;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.*;
-import org.eclipse.core.resources.IResource;
+import org.eclipse.ui.IActionDelegate;
 /**
  * Action to open the Web broswer on a resource.
  */
index 5623946..3c74e02 100644 (file)
@@ -13,7 +13,18 @@ import java.util.List;
 
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.ICellModifier;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TableLayout;
+import org.eclipse.jface.viewers.TableViewer;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
index 7b93cea..829bf49 100644 (file)
@@ -14,15 +14,16 @@ import java.util.Iterator;
 
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 
-import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.action.ActionContributionItem;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.events.MenuAdapter;
 import org.eclipse.swt.events.MenuEvent;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.*;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.IWorkbenchWindowPulldownDelegate2;
 /**
  * Action to open the Web broswer.
  */
index fa8c0b6..54cf481 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowser;
-
+import org.eclipse.jface.action.Action;
 import org.eclipse.swt.SWTError;
+import org.eclipse.swt.SWTException;
+import org.eclipse.swt.dnd.TextTransfer;
+import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.dnd.*;
-import org.eclipse.jface.action.Action;
 /**
  * Text actions (cut, copy, paste) for the Web browser.
  */
index 0a27dfd..5a74d4a 100644 (file)
@@ -8,21 +8,44 @@
 //TODO 2. Support printing: waiting on eclipse bug 47937/44823.
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import java.util.*;
+import java.util.Iterator;
 
 import net.sourceforge.phpeclipse.webbrowser.IURLMap;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.browser.CloseWindowListener;
+import org.eclipse.swt.browser.LocationEvent;
+import org.eclipse.swt.browser.LocationListener;
+import org.eclipse.swt.browser.OpenWindowListener;
+import org.eclipse.swt.browser.ProgressEvent;
+import org.eclipse.swt.browser.ProgressListener;
+import org.eclipse.swt.browser.StatusTextEvent;
+import org.eclipse.swt.browser.StatusTextListener;
+import org.eclipse.swt.browser.TitleEvent;
+import org.eclipse.swt.browser.TitleListener;
+import org.eclipse.swt.browser.WindowEvent;
 import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.ProgressBar;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
 import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.swt.browser.*;
 
 public class WebBrowser extends Composite {
   protected Composite toolbarComp;
index cb6fbcf..c55f9d4 100644 (file)
@@ -12,19 +12,33 @@ package net.sourceforge.phpeclipse.webbrowser.internal;
 
 import java.net.URL;
 
-import net.sourceforge.phpeclipse.webbrowser.*;
+import net.sourceforge.phpeclipse.webbrowser.IWebBrowserEditorInput;
+import net.sourceforge.phpeclipse.webbrowser.WebBrowserEditorInput;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceChangeEvent;
+import org.eclipse.core.resources.IResourceChangeListener;
+import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.core.resources.IResourceDeltaVisitor;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.resources.*;
-import org.eclipse.ui.*;
-import org.eclipse.ui.part.*;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorReference;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.part.EditorPart;
 /**
  * An integrated Web browser, defined as an editor to make
  * better use of the desktop.
index 7cb171a..4c9d702 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import org.eclipse.ui.*;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorActionBarContributor;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.actions.ActionFactory;
 /**
  * ActionBarContributor for the Web browser.
index 2198585..6ce17c2 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import java.util.*;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.preference.IPreferenceStore;
 /**
index 7d01c2e..7559114 100644 (file)
  */
 package net.sourceforge.phpeclipse.webbrowser.internal;
 
-import org.eclipse.swt.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.help.WorkbenchHelp;
index 179e0b4..89927d4 100644 (file)
@@ -12,7 +12,7 @@ package net.sourceforge.phpeclipse.webbrowser.internal;
 
 import java.text.MessageFormat;
 
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 /**
index 8c9c278..865f645 100644 (file)
@@ -23,14 +23,18 @@ import net.sourceforge.phpeclipse.webbrowser.IExternalWebBrowserWorkingCopy;
 import net.sourceforge.phpeclipse.webbrowser.IURLMap;
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.XMLMemento;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.browser.Browser;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.XMLMemento;
 /**
  * Utility class for the Web browser tooling.
  */
index d9a386e..dbb7ca7 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpeclipse.webbrowser.views;
 
-import net.sourceforge.phpeclipse.webbrowser.internal.BrowserManager;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
 
index d20f85a..ac2567d 100644 (file)
@@ -8,11 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDMergeViewer.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: DTDMergeViewer.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
+
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -27,10 +31,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
-
 /**
  * @author Igor Malinin
  */
index 6d817c3..f4f309c 100644 (file)
@@ -8,11 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLMergeViewer.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLMergeViewer.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
+
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -27,10 +31,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
-
 /**
  * @author Igor Malinin
  */
index e5de102..953cdbf 100644 (file)
@@ -8,22 +8,22 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDEditor.java,v 1.1 2004-09-02 18:28:04 jsurfer Exp $
+ * $Id: DTDEditor.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.editor;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDDocumentProvider;
+import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
+
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.texteditor.ContentAssistAction;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.DTDDocumentProvider;
-import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
-
 
 /**
  * DTD Editor.
index 73c9c3f..5d751b7 100644 (file)
@@ -8,21 +8,21 @@
  * Contributors:
  *     Christopher Lenz - initial API and implementation
  * 
- * $Id: XMLDocumentProvider.java,v 1.1 2004-09-02 18:28:04 jsurfer Exp $
+ * $Id: XMLDocumentProvider.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.editor;
 
 import java.net.MalformedURLException;
 
+import net.sourceforge.phpeclipse.xml.core.internal.model.XMLDocument;
+import net.sourceforge.phpeclipse.xml.core.model.IXMLDocument;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentListener;
 import org.eclipse.ui.editors.text.TextFileDocumentProvider;
 
-import net.sourceforge.phpeclipse.xml.core.internal.model.XMLDocument;
-import net.sourceforge.phpeclipse.xml.core.model.IXMLDocument;
-
 
 /**
  * Document provider for XML files.
index c7cac74..3da7597 100644 (file)
@@ -8,18 +8,18 @@
  * Contributors:
  *     Christopher Lenz - initial implementation
  * 
- * $Id: XMLDocumentSetupParticipant.java,v 1.1 2004-09-02 18:28:04 jsurfer Exp $
+ * $Id: XMLDocumentSetupParticipant.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.editor;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
+
 import org.eclipse.core.filebuffers.IDocumentSetupParticipant;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
-
 /**
  * Document setup participant that sets up the CSS specific partitioning.
  */
index 9096ce6..a42a47d 100644 (file)
@@ -8,17 +8,17 @@
  * Contributors:
  *     Christopher Lenz - initial API and implementation
  * 
- * $Id: XMLOutlineContentProvider.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLOutlineContentProvider.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.outline;
 
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-
 import net.sourceforge.phpeclipse.xml.core.model.IXMLDocument;
 import net.sourceforge.phpeclipse.xml.core.model.IXMLElement;
 
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
 /**
  * Content provider for the XML outline page.
  */
index 29c3d7a..e895ce3 100644 (file)
@@ -8,17 +8,17 @@
  * Contributors:
  *     Christopher Lenz - initial API and implementation
  * 
- * $Id: XMLOutlineLabelProvider.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLOutlineLabelProvider.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.outline;
 
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-
 import net.sourceforge.phpeclipse.xml.core.model.IXMLElement;
 import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
 
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
+
 /**
  * Label provider for the XML outline page.
  */
index a07f25a..e1da92e 100644 (file)
@@ -8,13 +8,19 @@
  * Contributors:
  *     Christopher Lenz - initial API and implementation
  * 
- * $Id: XMLOutlinePage.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLOutlinePage.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.outline;
 
 import java.util.List;
 
+import net.sourceforge.phpeclipse.core.model.ISourceReference;
+import net.sourceforge.phpeclipse.ui.views.outline.ProblemsLabelDecorator;
+import net.sourceforge.phpeclipse.xml.core.model.IXMLDocument;
+import net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLDocumentProvider;
+import net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditor;
+
 import org.eclipse.jface.viewers.DecoratingLabelProvider;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -25,12 +31,6 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
 
-import net.sourceforge.phpeclipse.core.model.ISourceReference;
-import net.sourceforge.phpeclipse.ui.views.outline.ProblemsLabelDecorator;
-import net.sourceforge.phpeclipse.xml.core.model.IXMLDocument;
-import net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLDocumentProvider;
-import net.sourceforge.phpeclipse.xml.ui.internal.editor.XMLEditor;
-
 /**
  * Implements the outline page associated with the XML editor.
  */
index d55505a..a0f8a5b 100644 (file)
@@ -9,7 +9,7 @@
  *     Roberto Gonzalez Rocha - Initial version
  *     Igor Malinin - refactoring, minor changes
  *
- * $Id: XMLSyntaxPreferencePage.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: XMLSyntaxPreferencePage.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.preferences;
@@ -18,6 +18,15 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import net.sourceforge.phpeclipse.ui.ColorEditor;
+import net.sourceforge.phpeclipse.ui.preferences.ITextStylePreferences;
+import net.sourceforge.phpeclipse.ui.preferences.OverlayPreferenceStore;
+import net.sourceforge.phpeclipse.ui.preferences.PreferenceDescriptor;
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
+
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.preference.PreferencePage;
@@ -49,15 +58,6 @@ import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-import net.sourceforge.phpeclipse.ui.ColorEditor;
-import net.sourceforge.phpeclipse.ui.preferences.ITextStylePreferences;
-import net.sourceforge.phpeclipse.ui.preferences.OverlayPreferenceStore;
-import net.sourceforge.phpeclipse.ui.preferences.PreferenceDescriptor;
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
-import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
-
 /**
  * The XMLSyntaxPreferencePage is a preference page that handles setting the colors used by the XML editors.
  */
index 1b3a58c..67489c2 100644 (file)
@@ -8,7 +8,7 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: AbstractDocumentProvider.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: AbstractDocumentProvider.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
@@ -17,10 +17,10 @@ import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.eclipse.jface.text.rules.IWhitespaceDetector;
-
 import net.sourceforge.phpeclipse.ui.editor.I18NDocumentProvider;
 
+import org.eclipse.jface.text.rules.IWhitespaceDetector;
+
 
 /**
  * 
index c995f9a..37a0d0f 100644 (file)
@@ -8,18 +8,18 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: AttValueDoubleClickStrategy.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: AttValueDoubleClickStrategy.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
+import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.ITypedRegion;
 
-import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
-
 
 /**
  * 
index 32bf38f..1728c8b 100644 (file)
@@ -8,11 +8,14 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDConfiguration.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: DTDConfiguration.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
+import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
+import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
+
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextDoubleClickStrategy;
 import org.eclipse.jface.text.presentation.IPresentationReconciler;
@@ -21,9 +24,6 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
 
-import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
-import net.sourceforge.phpeclipse.xml.ui.text.DTDTextTools;
-
 
 /**
  * DTD editor configuration.
index d03d456..0b352a1 100644 (file)
@@ -8,17 +8,17 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDDocumentProvider.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: DTDDocumentProvider.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-
 
 /**
  * DTD document provider.
index e48c100..55b129e 100644 (file)
@@ -8,13 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DeclScanner.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: DeclScanner.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
 import java.util.Map;
 
+import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
+
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
@@ -22,8 +24,6 @@ import org.eclipse.jface.text.rules.MultiLineRule;
 import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.text.rules.WordRule;
 
-import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
-
 /**
  * @author Igor Malinin
  */
index d57691b..d61fb9e 100644 (file)
@@ -8,18 +8,18 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: SimpleDoubleClickStrategy.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: SimpleDoubleClickStrategy.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
+import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.ITypedRegion;
 
-import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
-
 
 /**
  * 
index a4d093a..696b909 100644 (file)
@@ -8,18 +8,18 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: TagDoubleClickStrategy.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: TagDoubleClickStrategy.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
+import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.ITypedRegion;
 
-import net.sourceforge.phpeclipse.ui.text.TextDoubleClickStrategy;
-
 
 /**
  * 
index 60b35af..6eb0912 100644 (file)
@@ -8,20 +8,20 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: TextScanner.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: TextScanner.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
 import java.util.Map;
 
+import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
+
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
 
-import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
-
 /**
  * @author Igor Malinin
  */
index e99172a..958049e 100644 (file)
@@ -8,21 +8,21 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLCDATAScanner.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: XMLCDATAScanner.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
 import java.util.Map;
 
+import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.ITokenScanner;
 import org.eclipse.jface.text.rules.Token;
 
-import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
-
 /**
  * @author Igor Malinin
  */
index 95639d0..9ee1eba 100644 (file)
@@ -8,7 +8,7 @@
  * Contributors:
  *     Christopher Lenz - initial API and implementation
  * 
- * $Id: XMLReconcilingStrategy.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: XMLReconcilingStrategy.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
@@ -16,6 +16,8 @@ package net.sourceforge.phpeclipse.xml.ui.internal.text;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Iterator;
 
+import net.sourceforge.phpeclipse.ui.text.IReconcilingParticipant;
+
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.text.IDocument;
@@ -32,8 +34,6 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.texteditor.ITextEditor;
 
-import net.sourceforge.phpeclipse.ui.text.IReconcilingParticipant;
-
 /**
  * Reconciling strategy for XML document. This class is responsible for keeping
  * the parsed model in sync with the text.
index 6466d72..991212e 100644 (file)
@@ -8,21 +8,21 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLTagScanner.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: XMLTagScanner.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.text;
 
 import java.util.Map;
 
+import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
+
 import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
 import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.text.rules.WordRule;
 
-import net.sourceforge.phpeclipse.xml.ui.text.IXMLSyntaxConstants;
-
 /**
  * @author Igor Malinin
  */
index e787c54..032b700 100644 (file)
@@ -8,25 +8,25 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDTextTools.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: DTDTextTools.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.text;
 
 import java.util.Map;
 
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-
 import net.sourceforge.phpeclipse.ui.text.AbstractTextTools;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.DeclScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.SingleTokenScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.TextScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.DefaultPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+
 
 /**
  * 
index ba74a9f..81ce13f 100644 (file)
@@ -8,20 +8,13 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLTextTools.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: XMLTextTools.java,v 1.2 2005-05-06 00:55:41 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.text;
 
 import java.util.Map;
 
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.ITokenScanner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-
 import net.sourceforge.phpeclipse.ui.text.AbstractTextTools;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.DeclScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.SingleTokenScanner;
@@ -30,6 +23,13 @@ import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLCDATAScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLTagScanner;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocumentPartitioner;
+import org.eclipse.jface.text.rules.DefaultPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+import org.eclipse.jface.text.rules.ITokenScanner;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
+
 
 /**
  * 
index 54792db..38a8934 100644 (file)
@@ -11,6 +11,9 @@
 
 package net.sourceforge.phpdt.core;
 
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+
 /**
  * Abstract base implementation of all classpath variable initializers.
  * Classpath variable initializers are used in conjunction with the
index dbaf2d9..400dae5 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
-import org.eclipse.core.runtime.IProgressMonitor;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+
 /**
  * Completion proposal.
  * <p>
index 478d867..d960dc3 100644 (file)
@@ -10,6 +10,8 @@
  ******************************************************************************/
 package net.sourceforge.phpdt.core;
 
+import java.util.Map;
+
 /**
  * Specification for a generic source code formatter. Client plug-ins can contribute
  * an implementation for an ICodeFormatter, through the extension point "org.phpeclipse.phpdt.core.codeFormatter".
index dd57c8f..df9ee27 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
-import java.util.HashMap;
-
-import net.sourceforge.phpdt.internal.core.ImportContainer;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 
 
index 8365ab6..f1d5d47 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
-import net.sourceforge.phpdt.core.IType;
 
 /**
  * Common protocol for Java elements that can be members of types.
index b0cd469..9424f3a 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpdt.core;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-import net.sourceforge.phpdt.core.JavaModelException;
 
 
 /**
index 264c13c..ee57a1f 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-import net.sourceforge.phpdt.core.ITypeHierarchy;
-import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.core.WorkingCopyOwner;
 
 
 /**
index 3e6575f..603da89 100644 (file)
@@ -12,19 +12,20 @@ package net.sourceforge.phpdt.core;
 
 import java.util.StringTokenizer;
 
+import net.sourceforge.phpdt.core.compiler.CharOperation;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
+import net.sourceforge.phpdt.internal.core.ClasspathEntry;
+import net.sourceforge.phpdt.internal.core.JavaModelStatus;
+import net.sourceforge.phpdt.internal.core.util.Util;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
-import net.sourceforge.phpdt.core.compiler.*;
-import net.sourceforge.phpdt.core.compiler.InvalidInputException;
-import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
-import net.sourceforge.phpdt.internal.compiler.util.SuffixConstants;
-import net.sourceforge.phpdt.internal.core.*;
-import net.sourceforge.phpdt.internal.core.JavaModelStatus;
-import net.sourceforge.phpdt.internal.core.util.Util;
 
 /**
  * Provides methods for checking Java-specific conventions such as name syntax.
index db8de13..686413e 100644 (file)
@@ -7,11 +7,14 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/cpl-v10.html
 **********************************************************************/
 
+import java.util.Map;
+
 import net.sourceforge.phpdt.externaltools.variable.ExpandVariableContext;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IEditorInput;
@@ -24,6 +27,7 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.externaltools.internal.model.ExternalToolBuilder;
 
 /**
  * Maintains the context used to expand variables. The context is based on
index f3bdfab..2aa0933 100644 (file)
@@ -26,6 +26,7 @@ import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTab;
+import org.eclipse.debug.ui.ILaunchConfigurationTab;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.preference.IPreferenceStore;
index 937347d..576c6f4 100644 (file)
@@ -13,8 +13,8 @@ import java.io.File;
 import java.text.MessageFormat;
 import java.util.Map;
 
-import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.externaltools.internal.model.VariableContextManager;
 import net.sourceforge.phpdt.externaltools.internal.registry.ExternalToolMigration;
 import net.sourceforge.phpdt.externaltools.internal.registry.RefreshScopeVariable;
index c61833e..01f505a 100644 (file)
@@ -11,8 +11,8 @@ Contributors:
 
 import java.util.ArrayList;
 
-import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsModelMessages;
+import net.sourceforge.phpdt.externaltools.internal.model.ExternalToolsPlugin;
 import net.sourceforge.phpdt.externaltools.internal.registry.ArgumentVariable;
 import net.sourceforge.phpdt.externaltools.internal.registry.ArgumentVariableRegistry;
 import net.sourceforge.phpdt.externaltools.internal.registry.PathLocationVariable;
index 14bded4..f4bc83e 100644 (file)
@@ -31,8 +31,6 @@ import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
-import org.eclipse.core.resources.IResource;
-
 public class Compiler implements ITypeRequestor, ProblemSeverities {
   public UnitParser parser;
   public ICompilerRequestor requestor;
index 509ac89..488e618 100644 (file)
@@ -15,8 +15,6 @@ import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
-import org.eclipse.core.resources.IResource;
-
 /*
  * A document element parser extracts structural information from a piece of source, providing detailed source positions info.
  * 
index ddf5ff8..58c2541 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler;
 
-import java.util.HashMap;
-
 import net.sourceforge.phpdt.core.compiler.IProblem;
 
 /*
index fc27be9..d1087b2 100644 (file)
@@ -32,7 +32,6 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
 import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
-import net.sourceforge.phpeclipse.internal.compiler.ast.MemberTypeDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.NameReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpression;
index 30ec35a..a1f60ab 100644 (file)
@@ -11,8 +11,6 @@
 package net.sourceforge.phpdt.internal.compiler.batch;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.zip.ZipFile;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.env.INameEnvironment;
index 6d25398..e51b731 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.env;
 
-import net.sourceforge.phpdt.internal.compiler.env.ISourceImport;
 
 public interface ISourceType extends IGenericType {
 /**
index 9348747..5a2b072 100644 (file)
@@ -14,14 +14,10 @@ import java.util.ArrayList;
 
 import net.sourceforge.phpdt.internal.compiler.codegen.ObjectCache;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
-import net.sourceforge.phpdt.internal.compiler.lookup.CompilerModifiers;
-import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
 
 /**
  * Reflects the context of code analysis, keeping track of enclosing
index 11624b5..5cefb30 100644 (file)
@@ -18,8 +18,8 @@ import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
 import net.sourceforge.phpdt.internal.compiler.lookup.VariableBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
+import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.Reference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TryStatement;
 
index 4579ea7..9aa6a34 100644 (file)
 package net.sourceforge.phpdt.internal.compiler.flow;
 
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
-import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
-import net.sourceforge.phpeclipse.internal.compiler.ast.Statement;
 
 /**
  * Record initialization status during definite assignment analysis
index 09a1623..d09ca41 100644 (file)
@@ -17,7 +17,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.compiler.Compiler;
 import net.sourceforge.phpdt.internal.compiler.env.IConstants;
 import net.sourceforge.phpdt.internal.compiler.lookup.ProblemReasons;
index a3b1d92..6ae9a68 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
-import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
-
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
index e246740..a34e3f1 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
-import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
-
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
 import net.sourceforge.phpdt.internal.compiler.flow.UnconditionalFlowInfo;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
index 7cc8aeb..9ad53e7 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.lookup;
 
-import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
-import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
-import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding;
-import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
-import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
-import net.sourceforge.phpdt.internal.compiler.lookup.SourceTypeBinding;
-
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
index 0b0ae25..50dc61f 100644 (file)
@@ -10,7 +10,6 @@ package net.sourceforge.phpdt.internal.compiler.parser;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Stack;
 
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
index 02cf244..9785834 100644 (file)
@@ -7,7 +7,6 @@ import net.sourceforge.phpdt.internal.compiler.CompilationResult;
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
-import net.sourceforge.phpdt.internal.core.BasicCompilationUnit;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
index 576be8a..d1a5444 100644 (file)
@@ -41,7 +41,6 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayAllocationExpressio
 import net.sourceforge.phpeclipse.internal.compiler.ast.ArrayReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.Assignment;
 import net.sourceforge.phpeclipse.internal.compiler.ast.BinaryExpression;
-import net.sourceforge.phpeclipse.internal.compiler.ast.BranchStatement;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CaseStatement;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CastExpression;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
index 6ca5c30..8599066 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
 
@@ -22,13 +21,11 @@ import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.core.util.Util;
 import net.sourceforge.phpdt.internal.corext.Assert;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
index 145a0d1..9e1482f 100644 (file)
@@ -37,7 +37,6 @@ import net.sourceforge.phpdt.internal.compiler.parser.SourceTypeConverter;
 import net.sourceforge.phpdt.internal.compiler.parser.UnitParser;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.DefaultProblemFactory;
-import net.sourceforge.phpdt.internal.compiler.problem.ProblemHandler;
 import net.sourceforge.phpdt.internal.core.util.Util;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
index a09a6c6..162e83d 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Stack;
 
-import net.sourceforge.phpdt.internal.core.ImportContainer;
-import net.sourceforge.phpdt.internal.core.ImportDeclaration;
-import net.sourceforge.phpdt.internal.core.ImportDeclarationElementInfo;
-import net.sourceforge.phpdt.internal.core.JavaElement;
-import net.sourceforge.phpdt.internal.core.JavaElementInfo;
-
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IField;
index 28f0900..3952555 100644 (file)
@@ -15,6 +15,7 @@ import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatus;
 import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
+import net.sourceforge.phpdt.core.JavaConventions;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.jdom.DOMFactory;
 import net.sourceforge.phpdt.core.jdom.IDOMCompilationUnit;
index 9270628..edb31a1 100644 (file)
@@ -15,6 +15,7 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatus;
 import net.sourceforge.phpdt.core.IPackageDeclaration;
 import net.sourceforge.phpdt.core.IType;
+import net.sourceforge.phpdt.core.JavaConventions;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.jdom.DOMFactory;
 import net.sourceforge.phpdt.core.jdom.IDOMNode;
index 7b15656..0ae4f78 100644 (file)
@@ -10,9 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import net.sourceforge.phpdt.internal.core.Assert;
-import net.sourceforge.phpdt.internal.core.JavaElement;
-
 import net.sourceforge.phpdt.core.IImportDeclaration;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.JavaModelException;
index 419223e..55ede66 100644 (file)
@@ -16,7 +16,6 @@ import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.JavaConventions;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
-import net.sourceforge.phpdt.core.compiler.InvalidInputException;
 import net.sourceforge.phpdt.internal.codeassist.impl.AssistOptions;
 import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
 import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
index 834c112..63312b5 100644 (file)
@@ -12,16 +12,22 @@ package net.sourceforge.phpdt.internal.core;
 
 import java.util.HashMap;
 
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import net.sourceforge.phpdt.core.*;
+import net.sourceforge.phpdt.core.IBuffer;
 import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.ILocalVariable;
+import net.sourceforge.phpdt.core.IOpenable;
+import net.sourceforge.phpdt.core.ISourceRange;
+import net.sourceforge.phpdt.core.ISourceReference;
 import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.Signature;
 import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.internal.core.util.MementoTokenizer;
 import net.sourceforge.phpdt.internal.core.util.Util;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+
 
 public class LocalVariable extends JavaElement implements ILocalVariable {
 
index 63576cf..e98ed5b 100644 (file)
@@ -12,8 +12,6 @@ package net.sourceforge.phpdt.internal.core;
 
 import java.util.ArrayList;
 
-import net.sourceforge.phpdt.internal.core.SourceType;
-
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMember;
index f6eb8f3..83f09e9 100644 (file)
@@ -14,7 +14,11 @@ package net.sourceforge.phpdt.internal.core;
 import java.util.HashSet;
 import java.util.Iterator;
 
-import net.sourceforge.phpdt.core.*;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IJavaElementDelta;
+import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.core.IPackageFragmentRoot;
+import net.sourceforge.phpdt.core.JavaModelException;
 
 /**
  * This class is used by <code>JavaModelManager</code> to update the JavaModel
index 2c9a3c5..63b87b8 100644 (file)
@@ -20,6 +20,7 @@ import net.sourceforge.phpdt.core.BufferChangedEvent;
 import net.sourceforge.phpdt.core.IBuffer;
 import net.sourceforge.phpdt.core.IBufferChangedListener;
 import net.sourceforge.phpdt.core.IBufferFactory;
+import net.sourceforge.phpdt.core.ICodeAssist;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaModelStatusConstants;
 import net.sourceforge.phpdt.core.IOpenable;
index 91f17a5..231d4f6 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import java.util.HashMap;
-
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMethod;
index 4088fad..4a339bb 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IField;
 import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IMember;
 import net.sourceforge.phpdt.core.IMethod;
 import net.sourceforge.phpdt.core.IPackageFragment;
@@ -25,7 +23,6 @@ import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.ITypeHierarchy;
 import net.sourceforge.phpdt.core.IWorkingCopy;
 import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.core.WorkingCopyOwner;
 import net.sourceforge.phpdt.core.jdom.IDOMNode;
 import net.sourceforge.phpdt.internal.core.util.Util;
 import net.sourceforge.phpdt.internal.corext.Assert;
index 6365697..fb7a43a 100644 (file)
@@ -19,7 +19,6 @@ import net.sourceforge.phpdt.internal.core.util.SimpleLookupTable;
 import net.sourceforge.phpdt.internal.core.util.Util;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceDelta;
index 4f85502..d372be1 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core.jdom;
 
-import org.eclipse.core.resources.IResource;
-
 import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 
+import org.eclipse.core.resources.IResource;
+
 /**
  * Implements a very simple version of the ICompilationUnit.
  * 
index 37414d2..a308317 100644 (file)
@@ -10,7 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.core.jdom;
 
-import java.util.HashMap;
 import java.util.Map;
 
 import net.sourceforge.phpdt.core.JavaCore;
index 40f0d2a..5acdf98 100644 (file)
@@ -20,8 +20,6 @@ import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
-import net.sourceforge.phpdt.internal.core.SourceType;
-import net.sourceforge.phpeclipse.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.Argument;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
index 9133d69..bd4e0cc 100644 (file)
@@ -16,8 +16,6 @@ import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 
-import org.eclipse.core.resources.IResource;
-
 /**
  * Internal parser used for parsing source to create DOM AST nodes.
  * 
index 2866303..f2dc5db 100644 (file)
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.corext.codemanipulation;
 
-import org.eclipse.core.runtime.CoreException;
-
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IField;
 import net.sourceforge.phpdt.core.IJavaProject;
@@ -20,12 +18,12 @@ import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.NamingConventions;
 import net.sourceforge.phpdt.core.Signature;
-
+import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
+import net.sourceforge.phpdt.internal.corext.util.JdtFlags;
 import net.sourceforge.phpdt.ui.CodeGeneration;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 
-import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
-import net.sourceforge.phpdt.internal.corext.util.JdtFlags;
+import org.eclipse.core.runtime.CoreException;
 
 public class GetterSetterUtil {
        
index b0ae2b9..4e0f8f8 100644 (file)
@@ -4,12 +4,10 @@
  */
 package net.sourceforge.phpdt.internal.corext.codemanipulation;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
 import java.util.StringTokenizer;
-import java.util.jar.Attributes.Name;
 
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IBuffer;
index 673326c..fec6cc2 100644 (file)
@@ -13,16 +13,15 @@ package net.sourceforge.phpdt.internal.corext.refactoring.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMember;
 import net.sourceforge.phpdt.core.IOpenable;
-
 import net.sourceforge.phpdt.internal.corext.Assert;
 
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IResource;
+
 public class ResourceUtil {
        
        private ResourceUtil(){
index e9e4621..6d3d3a6 100644 (file)
@@ -14,7 +14,6 @@ import java.util.Iterator;
 
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaProject;
-import net.sourceforge.phpdt.internal.corext.Assert;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.jface.text.BadLocationException;
index 6c8ee5e..cc9be0e 100644 (file)
@@ -12,21 +12,20 @@ package net.sourceforge.phpdt.internal.corext.template.php;
 
 import java.util.ArrayList;
 
-import org.eclipse.jface.text.templates.TemplateContextType;
+import net.sourceforge.phpdt.core.ToolFactory;
+import net.sourceforge.phpdt.core.compiler.IScanner;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
+
 import org.eclipse.jface.text.templates.ContextTypeRegistry;
 import org.eclipse.jface.text.templates.GlobalTemplateVariables;
 import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.TemplateException;
 import org.eclipse.jface.text.templates.TemplateVariable;
 import org.eclipse.jface.text.templates.TemplateVariableResolver;
 
-import net.sourceforge.phpdt.core.ToolFactory;
-import net.sourceforge.phpdt.core.compiler.IScanner;
-import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
-import net.sourceforge.phpdt.core.compiler.InvalidInputException;
-
-import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
-
 /**
   */
 public class CodeTemplateContextType extends TemplateContextType {
index d19bf3f..d06498d 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.corext.template.php;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IMethod;
+import net.sourceforge.phpdt.core.JavaModelException;
+import net.sourceforge.phpdt.core.Signature;
+
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.GlobalTemplateVariables;
 import org.eclipse.jface.text.templates.TemplateContext;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.TemplateException;
 import org.eclipse.jface.text.templates.TemplateVariable;
 import org.eclipse.jface.text.templates.TemplateVariableResolver;
 
-import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IMethod;
-import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.core.Signature;
-
 
 /**
  * Compilation unit context type.
index e83cc10..6e94d4c 100644 (file)
@@ -1,15 +1,15 @@
 package net.sourceforge.phpdt.internal.corext.template.php;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateBuffer;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.TemplateException;
 import org.eclipse.jface.text.templates.TemplateTranslator;
 
-import net.sourceforge.phpdt.core.ICompilationUnit;
-
 /**
  * A context for javadoc.
  */
index f31b7af..5f07c83 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.corext.template.php;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.Template;
 import org.eclipse.jface.text.templates.TemplateBuffer;
+import org.eclipse.jface.text.templates.TemplateContextType;
 import org.eclipse.jface.text.templates.TemplateException;
 import org.eclipse.jface.text.templates.TemplateTranslator;
 
-import net.sourceforge.phpdt.core.ICompilationUnit;
-
 
 /**
  * A context for javadoc.
index 4882d95..a09574e 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.corext.template.php;
 
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.templates.*;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
 
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.templates.GlobalTemplateVariables;
+
 
 /**
  * A context type for javadoc.
index 5a9666d..936cf14 100644 (file)
@@ -13,12 +13,9 @@ package net.sourceforge.phpdt.internal.corext.template.php;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
-import net.sourceforge.phpdt.core.JavaCore;
 import net.sourceforge.phpdt.internal.corext.util.CodeFormatterUtil;
 import net.sourceforge.phpdt.internal.corext.util.Strings;
-import net.sourceforge.phpdt.internal.formatter.CodeFormatter;
 import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.JavaHeuristicScanner;
 import net.sourceforge.phpdt.internal.ui.text.JavaIndenter;
index 74353e0..3476386 100644 (file)
@@ -32,25 +32,22 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.text.templates.ContextTypeRegistry;
+import org.eclipse.jface.text.templates.Template;
+import org.eclipse.jface.text.templates.TemplateContextType;
+import org.eclipse.jface.text.templates.TemplateException;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
-
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateException;
-
 /**
  * <code>TemplateSet</code> manages a collection of templates and makes them
  * persistent.
index 9b70220..6e753e7 100644 (file)
@@ -18,7 +18,6 @@ import net.sourceforge.phpdt.core.IMember;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.internal.corext.Assert;
-import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 public class JdtFlags {
        private JdtFlags(){
index 5efda42..bbb86bd 100644 (file)
 package net.sourceforge.phpdt.internal.ui;
 
 
-import org.eclipse.jface.viewers.IBasicPropertyConstants;
+import net.sourceforge.phpdt.core.IJavaElement;
 
+import org.eclipse.jface.viewers.IBasicPropertyConstants;
 import org.eclipse.ui.views.properties.IPropertyDescriptor;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.eclipse.ui.views.properties.PropertyDescriptor;
 
-import net.sourceforge.phpdt.core.IJavaElement;
-
 public class JavaElementProperties implements IPropertySource {
        
        private IJavaElement fSource;
index 1257af9..661aea3 100644 (file)
 package net.sourceforge.phpdt.internal.ui;
 
 
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdapterFactory;
-
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.JavaCore;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.IAdapterFactory;
+
 public class ResourceAdapterFactory implements IAdapterFactory {
 
        private static Class[] PROPERTIES= new Class[] {
index 647800f..c3e6bde 100644 (file)
@@ -14,10 +14,20 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 
-import org.eclipse.jface.text.*;
+import org.eclipse.jface.text.Assert;
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.BadPartitioningException;
+import org.eclipse.jface.text.BadPositionCategoryException;
+import org.eclipse.jface.text.DefaultPositionUpdater;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IDocumentExtension3;
+import org.eclipse.jface.text.IPositionUpdater;
+import org.eclipse.jface.text.IRewriteTarget;
+import org.eclipse.jface.text.ITextSelection;
+import org.eclipse.jface.text.Position;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
-
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
index e40f478..836cc53 100644 (file)
 package net.sourceforge.phpdt.internal.ui.actions;
 
 import org.eclipse.jface.action.IMenuManager;
-
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.source.projection.IProjectionListener;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
-
 import org.eclipse.ui.actions.ActionGroup;
 import org.eclipse.ui.editors.text.IFoldingCommandIds;
 import org.eclipse.ui.texteditor.ITextEditor;
index 7619360..e2765ba 100644 (file)
 package net.sourceforge.phpdt.internal.ui.actions;
 
 import org.eclipse.jface.action.IAction;
-
 import org.eclipse.jface.text.source.IVerticalRulerInfo;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
-
 import org.eclipse.ui.editors.text.IFoldingCommandIds;
 import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
 import org.eclipse.ui.texteditor.ITextEditor;
index d22d55f..21f8a1b 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.actions;
 
+import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
+
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
-
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRulerInfo;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
-
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.editors.text.IFoldingCommandIds;
 import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextOperationAction;
 
-import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
-
 
 /**
  * Groups the JDT folding actions.
index c58c0ad..821e4a2 100644 (file)
@@ -14,16 +14,15 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ResourceBundle;
 
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.BadPartitioningException;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.ITypedRegion;
-
 import org.eclipse.ui.texteditor.ITextEditor;
 
-import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
-
 /**
  * Action that removes the enclosing comment marks from a Java block comment.
  * 
index 306796d..e4d4ff9 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.dnd;
 
+import org.eclipse.jface.util.Assert;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.Transfer;
 
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-
 public class BasicSelectionTransferDragAdapter extends DragSourceAdapter implements TransferDragSourceListener {
        
        private ISelectionProvider fProvider;
index 74ace1c..d8fbbde 100644 (file)
@@ -14,14 +14,13 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DragSourceEvent;
 import org.eclipse.swt.dnd.DragSourceListener;
 import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.dnd.TransferData;
 
-import org.eclipse.jface.util.Assert;
-
 /**
  * A delegating drag adapter negotiates between a set of <code>TransferDragSourceListener</code>s
  * On <code>dragStart</code> the adapter determines the listener to be used for any further
index c3ad84a..c3cddac 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.dnd;
 
+import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.DropTargetListener;
 import org.eclipse.swt.dnd.TransferData;
 
-import org.eclipse.jface.util.Assert;
-
 /**
  * A delegating drop adapter negotiates between a set of <code>TransferDropTargetListener</code>s
  * On <code>dragEnter</code> the adapter determines the listener to be used for any further
index 2906be9..20226b0 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.dnd;
 
-import org.eclipse.swt.dnd.DragSourceEvent;
-
 import org.eclipse.jface.util.Assert;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.swt.dnd.DragSourceEvent;
 
 public class JdtViewerDragAdapter extends DelegatingDragAdapter {
 
index 805efb3..99dc11f 100644 (file)
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.dnd;
 
+import org.eclipse.jface.util.Assert;
+import org.eclipse.jface.viewers.StructuredViewer;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.dnd.DropTargetListener;
@@ -19,9 +21,6 @@ import org.eclipse.swt.widgets.Item;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.TreeItem;
 
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.StructuredViewer;
-
 /**
  * A drag and drop adapter to be used together with structured viewers.
  * The adapater delegates the <code>dragEnter</code>, <code>dragOperationChanged
index 93ff9e2..4960bed 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
 
 /**
  * Filters classes
index 80d07cd..dc1becf 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
+import net.sourceforge.phpdt.core.IJavaElement;
 
 import org.eclipse.core.resources.IResource;
-
-import net.sourceforge.phpdt.core.IJavaElement;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
 
 /**
  * Filters closed projects
index 7a3fa53..bef807a 100644 (file)
@@ -19,19 +19,8 @@ import java.util.Set;
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-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.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
+import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
+import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
 
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.util.Assert;
@@ -45,13 +34,22 @@ import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+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.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.SelectionDialog;
 import org.eclipse.ui.help.WorkbenchHelp;
 
-import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
-import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
-
 public class CustomFiltersDialog extends SelectionDialog {
 
        private static final String SEPARATOR= ",";  //$NON-NLS-1$
index 7d65e9d..32c0168 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
 import net.sourceforge.phpdt.core.IImportContainer;
 import net.sourceforge.phpdt.core.IImportDeclaration;
 
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
 
 /**
  * Filters import declarations
index b95bf6c..c222a2b 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
 
 /**
  * Filters interfaces
index bb0cb66..c26c244 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.filters;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.IPackageFragment;
-import net.sourceforge.phpdt.core.JavaModelException;
 
 
 /**
index 3fbb87f..8b7fdfa 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.filters;
 
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.internal.ui.util.StringMatcher;
+
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IAdaptable;
-
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
-import net.sourceforge.phpdt.core.IJavaElement;
-
-import net.sourceforge.phpdt.internal.ui.util.StringMatcher;
-
 /**
  * The NamePatternFilter selects the elements which
  * match the given string patterns.
index e33067b..14abb23 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.filters;
 
+import net.sourceforge.phpdt.core.IJavaElement;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IStorage;
-
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
-import net.sourceforge.phpdt.core.IJavaElement;
-
 
 /**
  * Filters out all non-Java elements.
index d491667..a7eedde 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.core.resources.IProject;
+import net.sourceforge.phpdt.core.IJavaProject;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
 
-import net.sourceforge.phpdt.core.IJavaProject;
-
 /**
  * Filters non-java projects
  */
index 08fe91f..fdfe038 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
 
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+
 
 /**
  * Filters non-public types
index cbeda16..f824df1 100644 (file)
 package net.sourceforge.phpdt.internal.ui.filters;
 
 
-import org.eclipse.core.resources.IProject;
-
-import org.eclipse.team.core.RepositoryProvider;
+import net.sourceforge.phpdt.core.IJavaProject;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
-
-import net.sourceforge.phpdt.core.IJavaProject;
+import org.eclipse.team.core.RepositoryProvider;
 
 /**
  * Filters non-shared projects and Java projects. Non-shared projects are
index 27e0702..f51f0da 100644 (file)
@@ -16,8 +16,15 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.core.runtime.IStatus;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.preference.PreferenceConverter;
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.jface.text.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
@@ -34,17 +41,6 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Text;
 
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.preference.PreferencePage;
-
-import org.eclipse.jface.text.Assert;
-
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
-import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
-
 /**
  * Configures the code assist preferences.
  * 
index c833f53..00b011b 100644 (file)
@@ -10,6 +10,7 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.preferences;
 
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
 import org.eclipse.swt.events.DisposeListener;
@@ -27,8 +28,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
 
-import org.eclipse.jface.resource.JFaceResources;
-
 /**
  * A "button" of a certain color determined by the color picker.
  */
index 40f2f61..032f325 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.preferences;
 
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
 
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.ControlEnableState;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.IPreferenceNode;
@@ -27,22 +30,15 @@ import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.preference.PreferenceManager;
 import org.eclipse.jface.preference.PreferenceNode;
 import org.eclipse.jface.window.Window;
-
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.dialogs.PropertyPage;
 import org.eclipse.ui.help.WorkbenchHelp;
 
-import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaProject;
-
-import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
-import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
-
 /**
  * Property page used to configure project specific compiler settings
  */
index 3ea2cf3..bf26903 100644 (file)
@@ -12,12 +12,11 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 
 import java.util.StringTokenizer;
 
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-
 import net.sourceforge.phpdt.internal.corext.codemanipulation.CodeGenerationSettings;
 import net.sourceforge.phpdt.internal.corext.util.CodeFormatterUtil;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
+
+import org.eclipse.jface.preference.IPreferenceStore;
  
 public class JavaPreferencesSettings  {
        
index 7223502..5dab2f0 100644 (file)
@@ -12,14 +12,13 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 
 import java.util.StringTokenizer;
 
+import net.sourceforge.phpdt.core.Flags;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
+
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
-import net.sourceforge.phpdt.core.Flags;
-
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-
 /**
   */
 public class MembersOrderPreferenceCache implements IPropertyChangeListener {
index a6003a9..acea1f5 100644 (file)
@@ -13,11 +13,10 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceStore;
+import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
-import org.eclipse.jface.text.Assert;
-
 /**
  * An overlaying preference store.
  */
index a48fb80..c1973a8 100644 (file)
@@ -18,8 +18,17 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
-import org.eclipse.core.runtime.IStatus;
+import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.text.spelling.SpellCheckEngine;
+import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
+import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
+import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
+import net.sourceforge.phpdt.ui.PreferenceConstants;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -35,19 +44,6 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
-import org.eclipse.jface.preference.IPreferenceStore;
-
-import net.sourceforge.phpdt.core.IJavaProject;
-
-import net.sourceforge.phpdt.ui.PreferenceConstants;
-
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
-import net.sourceforge.phpdt.internal.ui.text.spelling.SpellCheckEngine;
-import net.sourceforge.phpdt.internal.ui.util.PixelConverter;
-import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
-import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
-
 /**
  * Options configuration block for spell-check related settings.
  * 
index 381482d..8512c55 100644 (file)
@@ -13,22 +13,8 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.window.Window;
-
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.JavaCore;
-
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField;
@@ -37,6 +23,17 @@ import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IListAdapter;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.ListDialogField;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.window.Window;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+
 /** 
   */
 public class TodoTaskConfigurationBlock extends OptionsConfigurationBlock {
index e6aaf30..68477dd 100644 (file)
@@ -13,16 +13,7 @@ package net.sourceforge.phpdt.internal.ui.preferences;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-import org.eclipse.ui.help.WorkbenchHelp;
-
 import net.sourceforge.phpdt.core.JavaCore;
-
 import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusDialog;
 import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
@@ -33,6 +24,13 @@ import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListen
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
 import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.StringDialogField;
 
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.help.WorkbenchHelp;
+
 /**
  * Dialog to enter a na new task tag
  */
index a6ecaab..2de9102 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.preferences;
 
-import org.eclipse.core.runtime.IStatus;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IJavaProject;
+import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
+import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
+import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
+import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
 
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.ControlEnableState;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.preference.IPreferenceNode;
@@ -27,22 +30,15 @@ import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.preference.PreferenceManager;
 import org.eclipse.jface.preference.PreferenceNode;
 import org.eclipse.jface.window.Window;
-
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.BusyIndicator;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.dialogs.PropertyPage;
 import org.eclipse.ui.help.WorkbenchHelp;
 
-import net.sourceforge.phpdt.core.IJavaElement;
-import net.sourceforge.phpdt.core.IJavaProject;
-
-import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusInfo;
-import net.sourceforge.phpdt.internal.ui.dialogs.StatusUtil;
-import net.sourceforge.phpdt.internal.ui.wizards.IStatusChangeListener;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.DialogField;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.LayoutUtil;
-import net.sourceforge.phpdt.internal.ui.wizards.dialogfields.SelectionButtonDialogField;
-
 /**
  * Property page used to configure project specific task tags settings
  */
index defb19c..855290c 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpdt.internal.ui.text;
 
 import org.eclipse.core.runtime.IProgressMonitor;
-
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.reconciler.DirtyRegion;
index ed3302f..ec8321f 100644 (file)
@@ -17,7 +17,6 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.rules.ICharacterScanner;
 import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.RuleBasedPartitionScanner;
 import org.eclipse.jface.text.rules.Token;
 
 /**
index 9ef9836..f17bd7f 100644 (file)
@@ -17,7 +17,6 @@ import java.io.Reader;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
-
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
index 0302dc9..84500dc 100644 (file)
@@ -12,7 +12,6 @@
 package net.sourceforge.phpdt.internal.ui.text;
 
 import org.eclipse.core.runtime.Preferences;
-
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.ListenerList;
index 99484ea..5661707 100644 (file)
@@ -14,13 +14,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.TextEdit;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.VerifyKeyListener;
-import org.eclipse.swt.events.VerifyEvent;
-import org.eclipse.swt.graphics.Point;
+import net.sourceforge.phpdt.internal.ui.text.TypingRun.ChangeType;
 
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
@@ -29,8 +23,12 @@ import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.ITextViewerExtension;
 import org.eclipse.jface.text.TextViewer;
-
-import net.sourceforge.phpdt.internal.ui.text.TypingRun.ChangeType;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.VerifyKeyListener;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.text.edits.MalformedTreeException;
+import org.eclipse.text.edits.TextEdit;
 
 
 
index 61d59e1..c7c5536 100644 (file)
@@ -16,6 +16,13 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import net.sourceforge.phpdt.internal.ui.text.TypingRun.ChangeType;
+
+import org.eclipse.jface.text.Assert;
+import org.eclipse.jface.text.DocumentEvent;
+import org.eclipse.jface.text.ITextListener;
+import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.TextEvent;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.events.FocusEvent;
@@ -25,14 +32,6 @@ import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 
-import org.eclipse.jface.text.Assert;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.ITextListener;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.TextEvent;
-
-import net.sourceforge.phpdt.internal.ui.text.TypingRun.ChangeType;
-
 
 /**
  * When connected to a text viewer, a <code>TypingRunDetector</code> observes
index d51c4b4..cfc11fb 100644 (file)
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.folding;
 
+import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingPreferenceBlock;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -17,8 +19,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 
-import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingPreferenceBlock;
-
 
 /**
  * Empty preference block for extensions to the
index 7377f61..f800cf6 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.folding;
 
+import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingPreferenceBlock;
+import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingStructureProvider;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
-
 import org.eclipse.jface.text.Assert;
 
-import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingPreferenceBlock;
-import net.sourceforge.phpdt.ui.text.folding.IJavaFoldingStructureProvider;
-
 /**
  * Describes a contribution to the folding provider extension point.
  * 
index 6fc5499..dc67cf5 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.java;
 
-import org.eclipse.core.runtime.IProgressMonitor;
-
 import net.sourceforge.phpdt.core.dom.CompilationUnit;
 
+import org.eclipse.core.runtime.IProgressMonitor;
+
 
 /**
  * Interface of an object listening to Java reconciling.
index 098883a..ad98776 100644 (file)
 package net.sourceforge.phpdt.internal.ui.text.java.hover;
 
 
+import net.sourceforge.phpdt.internal.ui.text.JavaWordFinder;
+import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover;
+
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.information.IInformationProvider;
-
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IPartListener;
 import org.eclipse.ui.IPerspectiveDescriptor;
@@ -22,10 +24,6 @@ import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 
-import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover;
-
-import net.sourceforge.phpdt.internal.ui.text.JavaWordFinder;
-
 
 public class JavaInformationProvider implements IInformationProvider {
 
index 288f7c0..a0ca22f 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.java.hover;
 
+import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover;
+
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
-
 import org.eclipse.ui.IEditorPart;
 
-import net.sourceforge.phpdt.ui.text.java.hover.IJavaEditorTextHover;
-
 
 public class JavaTypeHover implements IJavaEditorTextHover {
        
index 13f73c5..6e18440 100644 (file)
@@ -12,7 +12,6 @@ package net.sourceforge.phpdt.internal.ui.text.link;
 
 import java.util.Arrays;
 
-//import net.sourceforge.phpdt.internal.ui.text.java.JavaCompletionProposal;
 import org.eclipse.jface.text.TypedPosition;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 
index 81d4b19..ef18470 100644 (file)
@@ -17,7 +17,6 @@ import java.util.Locale;
 import net.sourceforge.phpdt.core.IProblemRequestor;
 import net.sourceforge.phpdt.core.compiler.IProblem;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
-import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellCheckEngine;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellCheckPreferenceKeys;
 import net.sourceforge.phpdt.internal.ui.text.spelling.engine.ISpellChecker;
index 673e4b9..4e2e4bd 100644 (file)
@@ -14,9 +14,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
@@ -25,6 +22,8 @@ import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
 import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
 
 
 /**
index dd9d5c1..5e87151 100644 (file)
@@ -12,9 +12,6 @@
 package net.sourceforge.phpdt.internal.ui.text.template.contentassist;
 
 
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.DocumentEvent;
@@ -25,6 +22,8 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal;
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension;
 import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
 import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.graphics.Point;
 
 
 /**
index 2a10036..a766686 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.text.template.contentassist;
 
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.widgets.Shell;
+import net.sourceforge.phpdt.internal.ui.text.java.hover.SourceViewerInformationControl;
 
 import org.eclipse.jface.text.IInformationControl;
 import org.eclipse.jface.text.IInformationControlCreator;
 import org.eclipse.jface.text.IInformationControlCreatorExtension;
-
-import net.sourceforge.phpdt.internal.ui.text.java.hover.SourceViewerInformationControl;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
+import org.eclipse.swt.widgets.Shell;
 
 
 final public class TemplateInformationControlCreator implements IInformationControlCreator, IInformationControlCreatorExtension {
index d0f44bf..f45e83c 100644 (file)
@@ -11,6 +11,9 @@
 package net.sourceforge.phpdt.internal.ui.util;
 
 
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.util.Assert;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DragSource;
 import org.eclipse.swt.dnd.DropTarget;
@@ -25,10 +28,6 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Widget;
 
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.util.Assert;
-
 /**
  * Utility class to simplify access to some SWT resources. 
  */
index 0a95480..be7f8fa 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.viewsupport;
 
-import org.eclipse.swt.widgets.Control;
-
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.StructuredViewer;
-
 import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
+import org.eclipse.jface.util.Assert;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.swt.widgets.Control;
 
 
 public class FilterUpdater implements IResourceChangeListener {
index 2dd5a89..bdb770a 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.internal.ui.viewsupport;
 
+import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
 
-import org.eclipse.jface.resource.ImageDescriptor;
-
 /**
   */
 public class ImageImageDescriptor extends ImageDescriptor {
index 1b842ab..61ce116 100644 (file)
@@ -16,12 +16,11 @@ import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IMember;
 import net.sourceforge.phpdt.core.IMethod;
-import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.PHPUIMessages;
+import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.ui.JavaElementImageDescriptor;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
index eac133f..7a76d1d 100644 (file)
@@ -13,12 +13,10 @@ package net.sourceforge.phpdt.internal.ui.viewsupport;
 import java.util.ArrayList;
 
 import org.eclipse.core.resources.IStorage;
-
-import org.eclipse.swt.graphics.Image;
-
 import org.eclipse.jface.viewers.ILabelDecorator;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.swt.graphics.Image;
 
 public class JavaUILabelProvider extends LabelProvider {
        
index 69bbfb9..5ce6d58 100644 (file)
@@ -14,7 +14,6 @@ package net.sourceforge.phpdt.internal.ui.viewsupport;
 import java.util.HashSet;
 
 import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
-//import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.CompilationUnitAnnotationModelEvent;
 
index 6261f4d..d68c3fd 100644 (file)
@@ -13,22 +13,19 @@ package net.sourceforge.phpdt.internal.ui.viewsupport;
 
 import java.util.ArrayList;
 
-import org.eclipse.core.resources.IResource;
+import net.sourceforge.phpdt.core.IMember;
+import net.sourceforge.phpdt.ui.IWorkingCopyProvider;
+import net.sourceforge.phpdt.ui.ProblemsLabelDecorator.ProblemsLabelChangedEvent;
 
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jface.viewers.IBaseLabelProvider;
+import org.eclipse.jface.viewers.LabelProviderChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Item;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.Widget;
 
-import org.eclipse.jface.viewers.IBaseLabelProvider;
-import org.eclipse.jface.viewers.LabelProviderChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-
-import net.sourceforge.phpdt.core.IMember;
-
-import net.sourceforge.phpdt.ui.IWorkingCopyProvider;
-import net.sourceforge.phpdt.ui.ProblemsLabelDecorator.ProblemsLabelChangedEvent;
-
 /**
  * Extends a  TreeViewer to allow more performance when showing error ticks.
  * A <code>ProblemItemMapper</code> is contained that maps all items in
index ee58b89..a28a8ab 100644 (file)
@@ -15,18 +15,16 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Stack;
 
-import org.eclipse.core.resources.IResource;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Item;
+import net.sourceforge.phpdt.core.ICompilationUnit;
+import net.sourceforge.phpdt.core.IJavaElement;
 
+import org.eclipse.core.resources.IResource;
 import org.eclipse.jface.viewers.ContentViewer;
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.jface.viewers.IViewerLabelProvider;
 import org.eclipse.jface.viewers.ViewerLabel;
-
-import net.sourceforge.phpdt.core.ICompilationUnit;
-import net.sourceforge.phpdt.core.IJavaElement;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Item;
 
 /**
  * Helper class for updating error markers and other decorators that work on resources.
index 7ba4287..069bd37 100644 (file)
@@ -17,12 +17,9 @@ import java.util.Map;
 
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.IPath;
-
-import org.eclipse.swt.graphics.Image;
-
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.LabelProvider;
-
+import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.IEditorRegistry;
 import org.eclipse.ui.IFileEditorMapping;
 import org.eclipse.ui.PlatformUI;
index a6d10fc..b5f67d3 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.ui;
 
-import org.eclipse.core.runtime.CoreException;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IMethod;
-//import net.sourceforge.phpdt.core.dom.IMethodBinding;
-//import net.sourceforge.phpdt.core.dom.MethodDeclaration;
-
 import net.sourceforge.phpdt.internal.corext.codemanipulation.StubUtility;
 
+import org.eclipse.core.runtime.CoreException;
+
 /**
  * Class that offers access to the templates contained in the 'code templates' preference page.
  * 
index d1c1084..d8a0837 100644 (file)
 package net.sourceforge.phpdt.ui;
 
 
-import org.eclipse.ui.IViewPart;
-
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IType;
 
+import org.eclipse.ui.IViewPart;
+
 /**
  * The standard type hierarchy view presents a type hierarchy for a given input class
  * or interface. Visually, this view consists of a pair of viewers, one showing the type
index bab2691..c5538bc 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpdt.ui;
 
-import org.eclipse.core.runtime.CoreException;
+import net.sourceforge.phpdt.core.ICompilationUnit;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.ui.IEditorInput;
 
-import net.sourceforge.phpdt.core.ICompilationUnit;
-
 /**
  * Interface for accessing working copies of <code>ICompilationUnit</code>
  * objects. The original compilation unit is only given indirectly by means
index 541f630..3bca478 100644 (file)
 
 package net.sourceforge.phpdt.ui;
 
-import org.eclipse.ui.IEditorInput;
-
 import net.sourceforge.phpdt.core.ICompilationUnit;
 
+import org.eclipse.ui.IEditorInput;
+
 /**
  * Extension interface for <code>IWorkingCopyManager</code>.
  * @since 2.1
index 4cf8183..c34e2bc 100644 (file)
 package net.sourceforge.phpdt.ui;
 
 
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
+import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 
 import org.eclipse.jface.resource.CompositeImageDescriptor;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.util.Assert;
-
-import net.sourceforge.phpdt.internal.ui.PHPUiImages;
+import org.eclipse.swt.graphics.ImageData;
+import org.eclipse.swt.graphics.Point;
 
 /**
  * A JavaImageDescriptor consists of a base image and several adornments. The adornments
index db03eaa..9d306a6 100644 (file)
@@ -13,8 +13,8 @@ package net.sourceforge.phpdt.ui;
 import net.sourceforge.phpdt.core.IBufferFactory;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IWorkingCopy;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.EditorUtility;
 
index 895ee73..90e0f65 100644 (file)
@@ -14,7 +14,6 @@ import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.IMethod;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.JavaModelException;
-import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ImageDescriptorRegistry;
 import net.sourceforge.phpdt.internal.ui.viewsupport.ImageImageDescriptor;
index 1495209..31c8017 100644 (file)
@@ -22,8 +22,8 @@ import net.sourceforge.phpdt.core.IPackageFragment;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.IParent;
 import net.sourceforge.phpdt.core.ISourceReference;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.internal.corext.util.JavaModelUtil;
 
 import org.eclipse.core.resources.IFile;
index 067a9f1..108ca77 100644 (file)
@@ -13,7 +13,6 @@ package net.sourceforge.phpdt.ui.actions;
 import net.sourceforge.phpdt.internal.ui.actions.ActionMessages;
 import net.sourceforge.phpdt.ui.IContextMenuConstants;
 import net.sourceforge.phpeclipse.actions.PHPOpenDeclarationAction;
-import net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction;
 import net.sourceforge.phpeclipse.phpeditor.PHPEditor;
 
 import org.eclipse.core.resources.IFile;
index 3da1363..238f7a9 100644 (file)
@@ -12,7 +12,6 @@ package net.sourceforge.phpdt.ui.actions;
 
 import net.sourceforge.phpdt.internal.ui.actions.ActionMessages;
 import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler;
-import net.sourceforge.phpdt.ui.JavaUI;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.ResourcesPlugin;
index e4710b0..91283c2 100644 (file)
@@ -10,15 +10,13 @@ import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
 import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCodeScanner;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.php.HTMLPartitionScanner;
+import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPDocumentPartitioner;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.SmartyCodeScanner;
 import net.sourceforge.phpeclipse.phpeditor.php.SmartyDocCodeScanner;
 import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.SingleTokenScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
 import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
 
@@ -28,9 +26,7 @@ import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentExtension3;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 import org.eclipse.jface.text.rules.RuleBasedScanner;
-import org.eclipse.jface.text.rules.Token;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 
index 735c2a7..4460b0b 100644 (file)
@@ -13,8 +13,8 @@ package net.sourceforge.phpdt.ui.wizards;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IJavaProject;
 import net.sourceforge.phpdt.core.IPackageFragmentRoot;
-import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.externaltools.internal.ui.StatusInfo;
 import net.sourceforge.phpdt.internal.ui.viewsupport.IViewPartInputProvider;
 import net.sourceforge.phpdt.internal.ui.wizards.NewWizardMessages;
index 8105380..eda96b3 100644 (file)
@@ -18,7 +18,6 @@ import net.sourceforge.phpdt.core.IBuffer;
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IPackageFragment;
-import net.sourceforge.phpdt.core.IPackageFragmentRoot;
 import net.sourceforge.phpdt.core.ISourceRange;
 import net.sourceforge.phpdt.core.IType;
 import net.sourceforge.phpdt.core.ToolFactory;
index 30bbe4f..7706c8c 100644 (file)
@@ -11,7 +11,6 @@
  **********************************************************************/
 package net.sourceforge.phpeclipse;
 
-import net.sourceforge.phpdt.internal.ui.JavaElementAdapterFactory;
 
 /**
  * Predefined prference constants
index 0e23c77..92cf76f 100644 (file)
@@ -11,7 +11,6 @@ package net.sourceforge.phpeclipse;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Enumeration;
index e29b34d..420c23a 100644 (file)
@@ -23,6 +23,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
index bfda727..fff0369 100644 (file)
@@ -8,10 +8,8 @@
  **********************************************************************************************************************************/
 package net.sourceforge.phpeclipse.actions;
 
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.text.MessageFormat;
 import java.util.Iterator;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
@@ -20,8 +18,6 @@ import net.sourceforge.phpeclipse.ui.editor.ShowExternalPreviewAction;
 import net.sourceforge.phpeclipse.ui.overlaypages.ProjectPrefUtil;
 import net.sourceforge.phpeclipse.webbrowser.IWebBrowser;
 import net.sourceforge.phpeclipse.webbrowser.internal.BrowserManager;
-import net.sourceforge.phpeclipse.webbrowser.internal.WebBrowserUtil;
-import net.sourceforge.phpeclipse.webbrowser.views.BrowserView;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -34,8 +30,6 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
 
 
index fd1cb21..ff9ef33 100644 (file)
@@ -19,6 +19,7 @@ import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IActionDelegate;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
 
index c36e53d..277a54f 100644 (file)
@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
index 84ecabe..893529e 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpeclipse.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
index 5d941d0..25e92e6 100644 (file)
 package net.sourceforge.phpeclipse.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
-import net.sourceforge.phpdt.internal.compiler.lookup.*;
+import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding;
+import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 
 public class JavadocReturnStatement extends ReturnStatement {
index 94a6180..da5359a 100644 (file)
@@ -20,7 +20,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.LocalVariableBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ProblemFieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.ProblemReferenceBinding;
-import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.SourceTypeBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.SyntheticAccessMethodBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
index c999c1d..cc3c4a0 100644 (file)
@@ -14,7 +14,6 @@ import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
 import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding;
-import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding;
 
 public abstract class Reference extends Expression  {
 /**
index 9f4d8eb..07b21c3 100644 (file)
@@ -21,7 +21,6 @@ import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ProblemFieldBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.ProblemReferenceBinding;
-import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.SourceTypeBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.VariableBinding;
index 0965c8e..b1f41b2 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpeclipse.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
-import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
index 3740dbe..9aa700f 100644 (file)
@@ -11,7 +11,6 @@
 package net.sourceforge.phpeclipse.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.codegen.Label;
 import net.sourceforge.phpdt.internal.compiler.impl.Constant;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
index 6bf3530..7d566d3 100644 (file)
@@ -7,8 +7,6 @@
  **********************************************************************************************************************************/
 package net.sourceforge.phpeclipse.internal.compiler.ast;
 
-import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
-
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.ASTVisitor;
 import net.sourceforge.phpdt.internal.compiler.CompilationResult;
index 0fa8413..eef0d1b 100644 (file)
@@ -25,7 +25,6 @@ import javax.xml.transform.stream.StreamResult;
 
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
-
 import org.eclipse.core.runtime.CoreException;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
index f3bf5cb..194a237 100644 (file)
 
 package net.sourceforge.phpeclipse.phpeditor;
 
+import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
+
 import org.eclipse.ui.help.WorkbenchHelp;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextEditorAction;
 
-import net.sourceforge.phpdt.internal.ui.IJavaHelpContextIds;
-
 
 public class GotoAnnotationAction extends TextEditorAction {
                
index ad7ff42..ec74b34 100644 (file)
  *******************************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.ILineTracker;
 import org.eclipse.jface.text.source.IAnnotationModelListener;
-
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.IDocumentProviderExtension2;
 import org.eclipse.ui.texteditor.IDocumentProviderExtension3;
 
-import net.sourceforge.phpdt.core.ICompilationUnit;
-
 /**
  * @since 3.0
  */
index ca09dc9..33bd236 100644 (file)
@@ -20,7 +20,6 @@ import net.sourceforge.phpdt.ui.IWorkingCopyManager;
 import net.sourceforge.phpdt.ui.IWorkingCopyManagerExtension;
 
 import org.eclipse.core.runtime.CoreException;
-import net.sourceforge.phpeclipse.phpeditor.ICompilationUnitDocumentProvider;
 import org.eclipse.jface.text.Assert;
 import org.eclipse.ui.IEditorInput;
 
index 5cc6fa6..242f759 100644 (file)
@@ -15,7 +15,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.sourceforge.phpdt.internal.ui.text.AbstractJavaScanner;
-import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
 import net.sourceforge.phpdt.ui.text.IColorManager;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
 import net.sourceforge.phpeclipse.phpeditor.util.HTMLWordDetector;
@@ -25,7 +24,6 @@ import net.sourceforge.phpeclipse.phpeditor.util.PHPWhitespaceDetector;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.TextAttribute;
 import org.eclipse.jface.text.rules.ICharacterScanner;
-import org.eclipse.jface.text.rules.IRule;
 import org.eclipse.jface.text.rules.IToken;
 import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.text.rules.SingleLineRule;
index 26a0bcf..e56ac83 100644 (file)
@@ -6,7 +6,7 @@
  * Created on 05.03.2003
  *
  * @author Stefan Langer (musk)
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 package net.sourceforge.phpeclipse.phpeditor.php;
 
@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sourceforge.phpdt.internal.ui.text.*;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
index 69bc1d5..4b163e0 100644 (file)
@@ -8,7 +8,7 @@
  Contributors:
  Igor Malinin - initial contribution
 
- $Id: PHPPartitionScanner.java,v 1.26 2005-05-05 14:06:38 axelcl Exp $
+ $Id: PHPPartitionScanner.java,v 1.27 2005-05-06 00:57:28 stefanbjarni Exp $
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
@@ -17,7 +17,6 @@ import java.util.Map;
 
 import net.sourceforge.phpeclipse.ui.text.rules.AbstractPartitioner;
 
-import org.eclipse.core.internal.indexing.AbstractPagePolicy;
 import org.eclipse.jface.text.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
index 3938769..541079a 100644 (file)
@@ -4,13 +4,13 @@
  */
 package net.sourceforge.phpeclipse.phpeditor.php;
 
-import net.sourceforge.phpdt.internal.ui.text.*;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 
 import org.eclipse.jface.text.IDocument;
 
 /**
  * @author slanger
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
  */
 public class PHPPartition_delete_it extends Partition
 {
index b682bc6..4c260bf 100644 (file)
@@ -4,7 +4,7 @@
  */
 package net.sourceforge.phpeclipse.phpeditor.php;
 
-import net.sourceforge.phpdt.internal.ui.text.*;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -18,7 +18,7 @@ import org.eclipse.jface.text.rules.Token;
  * partitions contained within other partitions.
  * 
  * @author Stefan Langer
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 public abstract class Partition
 {
index 85b9774..cb7bf66 100644 (file)
@@ -6,7 +6,7 @@ package net.sourceforge.phpeclipse.phpeditor.php;
 
 import java.util.ArrayList;
 
-import net.sourceforge.phpdt.internal.ui.text.*;
+import net.sourceforge.phpdt.internal.ui.text.IPHPPartitions;
 
 import org.eclipse.jface.text.IDocument;
 
@@ -15,7 +15,7 @@ import org.eclipse.jface.text.IDocument;
  * contain other partitions.
  * 
  * @author Stefan Langer
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
  */
 public class PartitionStack
 {
index 1c5a98f..43a1175 100644 (file)
@@ -5,7 +5,6 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.preference.RadioGroupFieldEditor;
 import org.eclipse.jface.preference.StringFieldEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
index 09b49a9..7d0ad1b 100644 (file)
@@ -35,7 +35,6 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
 
 /**
  * The "New" wizard page allows setting the container for the new file as well
index d2d5d1e..1b64440 100644 (file)
@@ -12,8 +12,6 @@ package net.sourceforge.phpeclipse.wizards;
  www.phpeclipse.de
  **********************************************************************/
 
-import net.sourceforge.phpdt.internal.ui.util.PHPFileUtil;
-
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
index 8163410..25573cf 100644 (file)
@@ -1,13 +1,19 @@
 /*
- * $Id: ElementWriter.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: ElementWriter.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.util.HashMap;
 
-import org.w3c.dom.*;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
 
 /**
  * ElementWriter provides destribute xml code.
index a355959..8e9bdf1 100644 (file)
@@ -1,12 +1,15 @@
 /*
- * $Id: FormElementWizardPage.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: FormElementWizardPage.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Text;
 
 /**
  * 
index ac5303d..137b8dc 100644 (file)
@@ -1,16 +1,15 @@
 /*
- * $Id: InsertHTMLElementAction.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: InsertHTMLElementAction.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
-import net.sourceforge.phpeclipse.wizards.html.EditElementWizard;
-
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
-import org.eclipse.ui.*;
+import org.eclipse.ui.IEditorActionDelegate;
+import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 
index e67d461..b736cff 100644 (file)
@@ -1,13 +1,17 @@
 /*
- * $Id: ListElementWizardPage.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: ListElementWizardPage.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
 
 /**
  * 
index 4b39fa9..909fb3b 100644 (file)
@@ -1,14 +1,18 @@
 /*
- * $Id: NewElementWizardPage.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: NewElementWizardPage.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
 import org.eclipse.jface.wizard.IWizardPage;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 
 
 /**
index 4773702..ff35f2c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: NumVerifyListener.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: NumVerifyListener.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
@@ -7,7 +7,8 @@ package net.sourceforge.phpeclipse.wizards.html;
 import java.util.regex.Pattern;
 
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.VerifyEvent;
+import org.eclipse.swt.events.VerifyListener;
 
 public class NumVerifyListener implements VerifyListener {
        
index 19a7d32..653bb1f 100644 (file)
@@ -1,16 +1,24 @@
 /*
- * $Id: SomeItemInputDialog.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: SomeItemInputDialog.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
-import org.eclipse.jface.dialogs.*;
 import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IInputValidator;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.*;
-import org.eclipse.swt.widgets.*;
+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.Control;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 
 /**
  * 
index b6b06bb..36efe07 100644 (file)
@@ -1,15 +1,20 @@
 /*
- * $Id: TableElementCellModifier.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: TableElementCellModifier.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.eclipse.jface.util.*;
+import org.eclipse.jface.util.IPropertyChangeListener;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.swt.widgets.Item;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Text;
 
 /**
  * 
index 23cd731..7ef6546 100644 (file)
@@ -1,10 +1,11 @@
 /*
- * $Id: TableElementContentProvider.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: TableElementContentProvider.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.Viewer;
 
 /**
  * 
index 7a161b3..aaf54c8 100644 (file)
@@ -1,10 +1,11 @@
 /*
- * $Id: TableElementLabelProvider.java,v 1.1 2004-10-05 20:51:57 jsurfer Exp $
+ * $Id: TableElementLabelProvider.java,v 1.2 2005-05-06 00:57:33 stefanbjarni Exp $
  * Copyright Narushima Hironori. All rights reserved.
  */
 package net.sourceforge.phpeclipse.wizards.html;
 
-import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.graphics.Image;
 import org.w3c.dom.Element;