git://git.phpeclipse.com / phpeclipse.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
added class const identifiers to outline
[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPUnitEditor.java
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
index 4a9d12d..4c62baf 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java
@@ -1,6 +1,5 @@
 package net.sourceforge.phpeclipse.phpeditor;
 
-import java.lang.reflect.InvocationTargetException;
 import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -29,7 +28,6 @@ import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -37,17 +35,12 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Preferences;
-
-import net.sourceforge.phpdt.internal.ui.text.java.IJavaReconcilingListener;
-
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.dialogs.IMessageProvider;
 import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.BadLocationException;
@@ -62,7 +55,6 @@ import org.eclipse.jface.text.ITypedRegion;
 import org.eclipse.jface.text.IWidgetTokenKeeper;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.jface.text.source.IOverviewRuler;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.IVerticalRuler;
@@ -83,7 +75,6 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.actions.ActionContext;
 import org.eclipse.ui.actions.ActionGroup;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SaveAsDialog;
 import org.eclipse.ui.editors.text.IStorageDocumentProvider;
 import org.eclipse.ui.help.WorkbenchHelp;
@@ -104,7 +95,8 @@ import org.eclipse.ui.texteditor.TextOperationAction;
 /**
  * PHP specific text editor.
  */
-public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListener {
+public class PHPUnitEditor extends PHPEditor { //implements
+                                                                                          // IJavaReconcilingListener {
        interface ITextConverter {
                void customizeDocumentCommand(IDocument document,
                                DocumentCommand command);
@@ -384,15 +376,19 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
                private List fTextConverters;
                private boolean fIgnoreTextConverters = false;
                //                      private JavaCorrectionAssistant fCorrectionAssistant;
-               public AdaptedSourceViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler, boolean showAnnotationsOverview, int styles, IPreferenceStore store) {
-                       super(parent, verticalRuler, overviewRuler, showAnnotationsOverview, styles, store);
-               }
-//             public AdaptedSourceViewer(Composite parent,
-//                             IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
-//                             boolean showAnnotationsOverview, int styles) {
-//                     super(parent, verticalRuler, overviewRuler,
-//                                     showAnnotationsOverview, styles);
-//             }
+               public AdaptedSourceViewer(Composite parent,
+                               IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
+                               boolean showAnnotationsOverview, int styles,
+                               IPreferenceStore store) {
+                       super(parent, verticalRuler, overviewRuler,
+                                       showAnnotationsOverview, styles, store);
+               }
+               //              public AdaptedSourceViewer(Composite parent,
+               //                              IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
+               //                              boolean showAnnotationsOverview, int styles) {
+               //                      super(parent, verticalRuler, overviewRuler,
+               //                                      showAnnotationsOverview, styles);
+               //              }
                public IContentAssistant getContentAssistant() {
                        return fContentAssistant;
                }
@@ -1650,12 +1646,16 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
        //      }
        //    }
        //  }
-
        /*
-        * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#createJavaSourceViewer(org.eclipse.swt.widgets.Composite, org.eclipse.jface.text.source.IVerticalRuler, org.eclipse.jface.text.source.IOverviewRuler, boolean, int)
+        * @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#createJavaSourceViewer(org.eclipse.swt.widgets.Composite,
+        *      org.eclipse.jface.text.source.IVerticalRuler,
+        *      org.eclipse.jface.text.source.IOverviewRuler, boolean, int)
         */
-       protected ISourceViewer createJavaSourceViewer(Composite parent, IVerticalRuler verticalRuler, IOverviewRuler overviewRuler, boolean isOverviewRulerVisible, int styles, IPreferenceStore store) {
-               return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler, isOverviewRulerVisible, styles, store);
+       protected ISourceViewer createJavaSourceViewer(Composite parent,
+                       IVerticalRuler verticalRuler, IOverviewRuler overviewRuler,
+                       boolean isOverviewRulerVisible, int styles, IPreferenceStore store) {
+               return new AdaptedSourceViewer(parent, verticalRuler, overviewRuler,
+                               isOverviewRulerVisible, styles, store);
        }
        //  protected ISourceViewer createJavaSourceViewer(Composite parent,
        // IVerticalRuler ruler, int styles) {
@@ -1779,8 +1779,10 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
 
                        setStatusLineErrorMessage(null);
 
-                       IWorkingCopyManager manager = PHPeclipsePlugin.getDefault()
-                                       .getWorkingCopyManager();
+                       updateState(getEditorInput());
+                       validateState(getEditorInput());
+                       
+                       IWorkingCopyManager manager = PHPeclipsePlugin.getDefault().getWorkingCopyManager();
                        ICompilationUnit unit = manager.getWorkingCopy(getEditorInput());
 
                        if (unit != null) {
@@ -1790,6 +1792,10 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
                        } else
                                performSave(false, progressMonitor);
                }
+               ShowExternalPreviewAction a = ShowExternalPreviewAction.getInstance();
+               if (a != null) {
+                       a.refresh();
+               }
        }
 
        public boolean isSaveAsAllowed() {
@@ -1971,8 +1977,7 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
         * @see org.eclipse.ui.texteditor.AbstractTextEditor#performSave(boolean,
         *      org.eclipse.core.runtime.IProgressMonitor)
         */
-       protected void performSave(boolean overwrite,
-                       IProgressMonitor progressMonitor) {
+       protected void performSave(boolean overwrite, IProgressMonitor progressMonitor) {
                IDocumentProvider p = getDocumentProvider();
                if (p instanceof PHPDocumentProvider) {
                        PHPDocumentProvider cp = (PHPDocumentProvider) p;
@@ -2130,46 +2135,52 @@ public class PHPUnitEditor extends PHPEditor{ //implements IJavaReconcilingListe
                        fRememberedElementOffset = -1;
                }
        }
-       
-//     /*
-//      * @see org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#aboutToBeReconciled()
-//      * @since 3.0
-//      */
-//     public void aboutToBeReconciled() {
-//
-//             // Notify AST provider
-//             PHPeclipsePlugin.getDefault().getASTProvider().aboutToBeReconciled(getInputJavaElement());
-//             
-//             // Notify listeners
-//             Object[] listeners = fReconcilingListeners.getListeners();
-//             for (int i = 0, length= listeners.length; i < length; ++i)
-//                     ((IJavaReconcilingListener)listeners[i]).aboutToBeReconciled();
-//     }
-//     
-//     /*
-//      * @see org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#reconciled(CompilationUnit, boolean, IProgressMonitor)
-//      * @since 3.0
-//      */
-//     public void reconciled(net.sourceforge.phpdt.core.dom.CompilationUnit ast, boolean forced, IProgressMonitor progressMonitor) {
-//
-//             // Always notify AST provider
-//             PHPeclipsePlugin.getDefault().getASTProvider().reconciled(ast, getInputJavaElement());
-//             
-//             // Notify listeners
-//             Object[] listeners = fReconcilingListeners.getListeners();
-//             for (int i = 0, length= listeners.length; i < length; ++i)
-//                     ((IJavaReconcilingListener)listeners[i]).reconciled(ast, forced, progressMonitor);
-//
-//             // Update Java Outline page selection
-//             if (!forced && !progressMonitor.isCanceled()) {
-//                     Shell shell= getSite().getShell();
-//                     if (shell != null && !shell.isDisposed()) {
-//                             shell.getDisplay().asyncExec(new Runnable() {
-//                                     public void run() {
-//                                             selectionChanged();
-//                                     }
-//                             });
-//                     }
-//             }
-//     }
+
+       //      /*
+       //       * @see
+       // org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#aboutToBeReconciled()
+       //       * @since 3.0
+       //       */
+       //      public void aboutToBeReconciled() {
+       //
+       //              // Notify AST provider
+       //              PHPeclipsePlugin.getDefault().getASTProvider().aboutToBeReconciled(getInputJavaElement());
+       //              
+       //              // Notify listeners
+       //              Object[] listeners = fReconcilingListeners.getListeners();
+       //              for (int i = 0, length= listeners.length; i < length; ++i)
+       //                      ((IJavaReconcilingListener)listeners[i]).aboutToBeReconciled();
+       //      }
+       //      
+       //      /*
+       //       * @see
+       // org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener#reconciled(CompilationUnit,
+       // boolean, IProgressMonitor)
+       //       * @since 3.0
+       //       */
+       //      public void reconciled(net.sourceforge.phpdt.core.dom.CompilationUnit
+       // ast, boolean forced, IProgressMonitor progressMonitor) {
+       //
+       //              // Always notify AST provider
+       //              PHPeclipsePlugin.getDefault().getASTProvider().reconciled(ast,
+       // getInputJavaElement());
+       //              
+       //              // Notify listeners
+       //              Object[] listeners = fReconcilingListeners.getListeners();
+       //              for (int i = 0, length= listeners.length; i < length; ++i)
+       //                      ((IJavaReconcilingListener)listeners[i]).reconciled(ast, forced,
+       // progressMonitor);
+       //
+       //              // Update Java Outline page selection
+       //              if (!forced && !progressMonitor.isCanceled()) {
+       //                      Shell shell= getSite().getShell();
+       //                      if (shell != null && !shell.isDisposed()) {
+       //                              shell.getDisplay().asyncExec(new Runnable() {
+       //                                      public void run() {
+       //                                              selectionChanged();
+       //                                      }
+       //                              });
+       //                      }
+       //              }
+       //      }
 }
\ No newline at end of file
PHPEclipse IDE project