improved color settings through Preference page
authorkhartlage <khartlage>
Sun, 27 Apr 2003 12:32:17 +0000 (12:32 +0000)
committerkhartlage <khartlage>
Sun, 27 Apr 2003 12:32:17 +0000 (12:32 +0000)
net.sourceforge.phpeclipse/.classpath
net.sourceforge.phpeclipse/plugin.properties
net.sourceforge.phpeclipse/plugin.xml
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/PHPEditorPreferencePage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/preferences/TemplatePreferencePage.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/OverviewRuler.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditor.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java [deleted file]
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPUnitEditor.java

index 63d1517..719c648 100644 (file)
     <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.7/xmlParserAPIs.jar"/>
     <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.xerces_4.0.7/xercesImpl.jar"/>
     <classpathentry kind="var"
-        path="ECLIPSE_HOME/plugins/org.junit_3.8.1/junit.jar" sourcepath="ORG_ECLIPSE_JDT_SOURCE_SRC/org.junit_3.8.1/junitsrc.zip"/>
-    <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.update.ui_2.1.0/updateui.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.update.ui_2.1.0/updateuisrc.zip"/>
     <classpathentry kind="var"
+        path="ECLIPSE_HOME/plugins/org.eclipse.update.ui.win32_2.1.0/updateui32.jar" sourcepath="ORG_ECLIPSE_PLATFORM_WIN32_SOURCE_SRC/org.eclipse.update.ui.win32_2.1.0/updateui32src.zip"/>
+    <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.core.runtime_2.1.0/runtime.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.runtime_2.1.0/runtimesrc.zip"/>
     <classpathentry kind="var"
         path="ECLIPSE_HOME/plugins/org.eclipse.core.boot_2.1.0/boot.jar" sourcepath="ORG_ECLIPSE_PLATFORM_SOURCE_SRC/org.eclipse.core.boot_2.1.0/bootsrc.zip"/>
index 4cddf37..535b7c6 100644 (file)
@@ -54,14 +54,90 @@ CommentAction.label= Co&mment@Ctrl+/
 
 UncommentAction.label= &Uncomment@Ctrl+\\
 
+ShiftRightAction.label= Sh&ift Right
+
+ShiftLeftAction.label= S&hift Left
+
 FormatAction.label= F&ormat@Ctrl+Shift+F
+
+AddImportAction.label= A&dd Import@Ctrl+Shift+M
+
+OrganizeImportsAction.label= Or&ganize Imports@Ctrl+Shift+O
+
+SurroundWithTryCatchAction.label= Surround with &try/catch block
+
+OverrideMethodsAction.label= O&verride/Implement Methods...
+
+GenerateGetterSetterAction.label= Gene&rate Getter and Setter...
+
+AddConstructorFromSuperclassAction.label= Add &Constructor from Superclass
+
+AddJavaDocCommentAction.label= Add &PHPdoc Comment
+
+FindStringsToExternalizeAction.label= &Find Strings to Externalize...
+
+ExternalizeStringsAction.label= &Externalize Strings...
+
+ConvertLineDelimitersActions.label= Co&nvert Line Delimiters
+ConvertLineDelimitersToWindowsAction.label= To &Windows
+ConvertLineDelimitersToUNIXAction.label= To &UNIX
+ConvertLineDelimitersToMacAction.label= To &Mac
+
+##########################################################################
+# Javadoc Support
+##########################################################################
+PHPDocWizard.name= PHPDoc
+PHPDocWizard.description=Generate PHPDoc
+PHPDoc.preferencePageName= PHPDoc
+CreatePHPDocAction.label= Run PHPDoc &Wizard...
+CreatePHPDocAction.tooltip= Run PHPDoc Wizard
+
+##########################################################################
+# PHP Working Set Support
+##########################################################################
+PHPWorkingSetPage.name= PHP
+
+
 ##########################################################################
 # Action Definitions
 ##########################################################################
 #--- Edit menu
+ActionDefinition.show.outline.name= Show Outline
+ActionDefinition.show.outline.description= Open the outline for the editor input
+
+ActionDefinition.open.structure.name= Open Structure
+ActionDefinition.open.structure.description= Show the structure of the selected element
+
+ActionDefinition.gotoNextMember.name= Go to Next Member
+ActionDefinition.gotoNextMember.description= Move the caret to the next member of the compilation unit
+
+ActionDefinition.gotoPreviousMember.name= Go to Previous Member
+ActionDefinition.gotoPreviousMember.description= Move the caret to the previous member of the compilation unit
+
+ActionDefinition.selectEnclosing.name= Select Enclosing Element
+ActionDefinition.selectEnclosing.description= Expand selection to include enclosing element
+
+ActionDefinition.selectNext.name= Select Next Element
+ActionDefinition.selectNext.description= Expand selection to include next sibling
+
+ActionDefinition.selectPrevious.name= Select Previous Element
+ActionDefinition.selectPrevious.description= Expand selection to include previous sibling
+
+ActionDefinition.selectLast.name= Restore Last Selection
+ActionDefinition.selectLast.description= Restore last selection
+
 ActionDefinition.contentAssistProposals.name= Content Assist
 ActionDefinition.contentAssistProposals.description= Content Assist
 
+ActionDefinition.contentAssistContextInformation.name= Parameter Hints
+ActionDefinition.contentAssistContextInformation.description= Show Method Parameter Hints
+
+ActionDefinition.correctionAssistProposals.name= Quick Fix
+ActionDefinition.correctionAssistProposals.description= Quick Fix
+
+ActionDefinition.showJavadoc.name= Show Tooltip Description
+ActionDefinition.showJavadoc.description= Shows the tooltip description for the element at the cursor
+
 #--- Source menu
 ActionDefinition.comment.name= Comment
 ActionDefinition.comment.description= Turn the selected lines into PHP comments
@@ -70,4 +146,146 @@ ActionDefinition.uncomment.name= Uncomment
 ActionDefinition.uncomment.description= Uncomment the selected PHP comment lines
 
 ActionDefinition.format.name= Format
-ActionDefinition.format.description= Format the source code
\ No newline at end of file
+ActionDefinition.format.description= Format the selected text
+
+ActionDefinition.addImport.name= Add Import
+ActionDefinition.addImport.description= Create import statement on selection
+
+ActionDefinition.organizeImports.name= Organize Imports
+ActionDefinition.organizeImports.description= Evaluate all required imports and replace the current imports
+
+ActionDefinition.surroundWith.tryCatch.name= Surround with try/catch block
+ActionDefinition.surroundWith.tryCatch.description= Surround the selected text with a try/catch block
+
+ActionDefinition.overrideMethods.name= Override/Implement Methods
+ActionDefinition.overrideMethods.description= Override or implement methods from super types
+
+ActionDefinition.addUnimplementedConstructors.name= Add Constructors from Superclass
+ActionDefinition.addUnimplementedConstructors.description= Evaluate and add constructors from superclass
+
+ActionDefinition.findStringsToExternalize.name= Find Strings to Externalize
+ActionDefinition.findStringsToExternalize.description= Find strings that are not externalized
+
+ActionDefinition.externalizeStrings.name= Externalize Strings
+ActionDefinition.externalizeStrings.description= Find all string that are not externalized and puts them into a separate property file
+
+ActionDefinition.nextProblem.name= Go to Next Problem
+ActionDefinition.nextProblem.description= Go to next problem
+
+ActionDefinition.previousProblem.name= Go to Previous Problem
+ActionDefinition.previousProblem.description= Go to previous problem
+
+#--- Refactor menu
+ActionDefinition.refactorRedo.name= Redo
+ActionDefinition.refactorRedo.description= Redo the last refactoring
+
+ActionDefinition.refactorUndo.name= Undo
+ActionDefinition.refactorUndo.description= Undo the last refactoring
+
+ActionDefinition.pullUp.name= Pull Up
+ActionDefinition.pullUp.description= Move members to a superclass
+
+ActionDefinition.renameElement.name= Rename
+ActionDefinition.renameElement.description= Rename the selected element
+
+ActionDefinition.modifyMethodParameters.name= Change Method Signature
+ActionDefinition.modifyMethodParameters.description= Change method signature include parameter names and parameter order
+
+ActionDefinition.moveElement.name= Move
+ActionDefinition.moveElement.description= Move the selected element to a new location
+
+ActionDefinition.extractLocalVariable.name= Extract Local Variable
+ActionDefinition.extractLocalVariable.description= Extract an expression into a new local variable and uses the local instead
+
+ActionDefinition.extractConstant.name= Extract Constant
+ActionDefinition.extractConstant.description= Extract a constant into a new static field and uses the field instead
+
+ActionDefinition.inline.name= Inline
+ActionDefinition.inline.description= Inline a constant, local variable or method
+
+ActionDefinition.selfEncapsulateField.name= Self Encapsulate Field
+ActionDefinition.selfEncapsulateField.description= Create getting and setting methods for the field and use only those to access the field
+
+ActionDefinition.extractMethod.name= Extract Method
+ActionDefinition.extractMethod.description= Extract a set of statements or an expression into a new method and use the method instead
+
+ActionDefinition.extractInterface.name= Extract Interface
+ActionDefinition.extractInterface.description= Extract a set of members into a new interface and tries to use that interface instead
+
+ActionDefinition.moveInnerToTopLevel.name= Move to Top Level
+ActionDefinition.moveInnerToTopLevel.description= Convert an inner class to a top level class
+
+ActionDefinition.useSupertype.name= Use Supertype Where Possible
+ActionDefinition.useSupertype.description= Try to re-route the access via a supertype where possible
+
+ActionDefinition.promoteLocalVariable.name= Promote Local Variable to Field
+ActionDefinition.promoteLocalVariable.description= Convert a local variable into a field
+
+ActionDefinition.convertAnonymousToNested.name= Convert Anonymous to Nested
+ActionDefinition.convertAnonymousToNested.description= Convert an anonymous class to a nest class
+
+#--- Navigate menu
+ActionDefinition.openEditor.name= Open
+ActionDefinition.openEditor.description= Open an editor on the selected element
+
+ActionDefinition.openSuperImplementation.name= Open Super Implementation
+ActionDefinition.openSuperImplementation.description= Open the Implementation in the Super Type
+
+ActionDefinition.openExternalJavadoc.name= Open E&xternal PHPdoc
+ActionDefinition.openExternalJavadoc.description= Open the PHPdoc of the selected element in an external browser
+
+ActionDefinition.openTypeHierarchy.name= Open Type Hierarchy
+ActionDefinition.openTypeHierarchy.description= Open a type hierarchy on the selected element
+
+ActionDefinition.showInPackageView.name= Show in Package Explorer
+ActionDefinition.showInPackageView.description= Show the selected element in Package Explorer
+
+ActionDefinition.showInNavigatorView.name= Show in &Navigator View
+ActionDefinition.showInNavigatorView.description= Show the selected element in the Resource Navigator
+
+#--- Search menu
+ActionDefinition.referencesInWorkspace.name= Search References in Workspace
+ActionDefinition.referencesInWorkspace.description= Search for References to the Selected Element in the Workspace
+
+ActionDefinition.referencesInHierarchy.name= Search References in Hierarchy
+ActionDefinition.referencesInHierarchy.description= Search for References of the Selected Element in its Hierarchy
+
+ActionDefinition.referencesInWorkingSet.name= Search References in Working Set
+ActionDefinition.referencesInWorkingSet.description= Search for References to the Selected Element in a Working Set
+
+ActionDefinition.readAccessInworkspace.name= Search Read Access in Workspace
+ActionDefinition.readAccessInWorkspace.description= Search for Read References to the Selected Element in the Workspace
+
+ActionDefinition.readAccessInHierarchy.name= Search Read Access in Hierarchy
+ActionDefinition.readAccessInHierarchy.description= Search for Read References of the Selected Element in its Hierarchy
+
+ActionDefinition.readAccessInWorkingSet.name= Search Read Access in Working Set
+ActionDefinition.readAccessInWorkingSet.description= Search for Read References to the Selected Element in a Working Set
+
+ActionDefinition.writeAccessInWorkspace.name=Search Write Access in Workspace
+ActionDefinition.writeAccessInWorkspace.description= Search for Write References to the Selected Element in the Workspace
+
+ActionDefinition.writeAccessInHierarchy.name= Search Write Access in Hierarchy
+ActionDefinition.writeAccessInHierarchy.description= Search for Write References of the Selected Element in its Hierarchy
+
+ActionDefinition.writeAccessInWorkingSet.name= Search Write Access in Working Set
+ActionDefinition.writeAccessInWorkingSet.description= Search for Write References to the Selected Element in a Working Set
+
+ActionDefinition.declarationsInWorkspace.name= Search Declaration in Workspace
+ActionDefinition.declarationsInWorkspace.description= Search for Declarations of the Selected Element in the Workspace
+
+ActionDefinition.declarationsInHierarchy.name= Search Declaration in Hierarchy
+ActionDefinition.declarationsInHierarchy.description= Search for Declarations of the Selected Element in its Hierarchy
+
+ActionDefinition.declarationsInWorkingSet.name= Search Declaration in Working Set
+ActionDefinition.declarationsInWorkingSet.description= Search for Declarations of the Selected Element in a Working Set
+
+ActionDefinition.implementorsInWorkspace.name= Search Implementors in Workspace
+ActionDefinition.implementorsInWorkspace.description= Search for Implementors of the Selected Interface
+
+ActionDefinition.implementorsInWorkingSet.name= Search Implementors in Working Set
+ActionDefinition.implementorsInWorkingSet.description= Search for Implementors of the Selected Interface in a Working Set
+
+#---  miscellaenous
+ActionDefinition.togglePresentation.name= Show Source of Selected Element Only
+ActionDefinition.togglePresentation.description= Show Source of Selected Element Only
\ No newline at end of file
index 89e8568..94fce9a 100644 (file)
@@ -18,7 +18,6 @@
       <import plugin="org.eclipse.swt"/>
       <import plugin="org.eclipse.debug.ui"/>
       <import plugin="org.apache.xerces"/>
-      <import plugin="org.junit"/>
       <import plugin="org.eclipse.update.ui"/>
    </requires>
 
@@ -85,7 +84,8 @@
       </category>
 <!--    
 Temporarily replaced until errors can be ironed out...
-  <wizard
+-->
+      <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
@@ -96,8 +96,9 @@ Temporarily replaced until errors can be ironed out...
             Create a new PHP project.
          </description>
       </wizard>
+<!--
 <this wizard replaces it as it works - maybe not as pretty but still>
--->
+
       <wizard
             name="%newWizardPHPProject.name"
             icon="icons/obj16/php.gif"
@@ -108,7 +109,7 @@ Temporarily replaced until errors can be ironed out...
          <description>
             Create a new PHP project.
          </description>
-      </wizard>
+      </wizard> -->
       <wizard
             name="%newWizardPHPFile.name"
             icon="icons/obj16/phpedit.gif"
@@ -124,7 +125,7 @@ Temporarily replaced until errors can be ironed out...
             name="Xaraya Module"
             icon="icons/obj16/php.gif"
             category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class=" com.xaraya.wizard.NewXarayaResourceWizard"
+            class="com.xaraya.wizard.NewXarayaResourceWizard"
             project="true"
             id="net.sourceforge.phpeclipse.wizards.NewXarayaModuleWizard">
          <description>
@@ -153,7 +154,7 @@ Temporarily replaced until errors can be ironed out...
          </filter>
       </page>
       <page
-            objectClass="net.sourceforge.phpeclipse.PHPProject"
+            objectClass="net.sourceforge.phpeclipse.resourcesview.PHPProject"
             name="%propertyPagePHPProject.name"
             class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
             id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject">
@@ -176,7 +177,6 @@ Temporarily replaced until errors can be ironed out...
          point="org.eclipse.ui.actionSets">
       <actionSet
             label="PHP/Apache"
-            description="Starting MySQL and Apache."
             visible="true"
             id="net.sourceforge.phpeclipse.PHPActionSet">
          <menu
@@ -193,7 +193,6 @@ Temporarily replaced until errors can be ironed out...
                class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
                toolbarPath="Normal"
-               start="true"
                id="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction">
          </action>
          <action
@@ -203,7 +202,6 @@ Temporarily replaced until errors can be ironed out...
                class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
                toolbarPath="Normal"
-               start="true"
                id="net.sourceforge.phpeclipse.actions.PHPStopApacheAction">
          </action>
          <action
@@ -213,7 +211,6 @@ Temporarily replaced until errors can be ironed out...
                class="net.sourceforge.phpeclipse.actions.PHPStartApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
                toolbarPath="Normal"
-               start="true"
                id="net.sourceforge.phpeclipse.actions.PHPStartApacheAction">
          </action>
          <action
@@ -223,32 +220,43 @@ Temporarily replaced until errors can be ironed out...
                class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
                toolbarPath="Normal"
-               start="true"
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
       <actionSet
             label="%CodingActionSet.label"
-            description="%CodingActionSet.description"
             visible="false"
             id="net.sourceforge.phpeclipse.ui.CodingActionSet">
-         <!-- =========================================================================== -->
-         <!-- Source Menu                                                                 -->
-         <!-- =========================================================================== -->
+<!-- =========================================================================== -->
+<!-- Source Menu                                                                 -->
+<!-- =========================================================================== -->
          <menu
                label="%SourceMenu.label"
                path="edit"
                id="net.sourceforge.phpeclipse.ui.source.menu">
-            <separator name="editGroup"/>
-         </menu>       
-       
-         <action 
-                       definitionId="net.sourceforge.phpeclipse.phpeditor.format"
-                       label="%FormatAction.label"
-                       retarget="true"
-                       menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-                       id="net.sourceforge.phpeclipse.phpeditor.Format" >
-            </action>
+            <separator
+                  name="editGroup">
+            </separator>
+         </menu>
+         <action
+               definitionId="net.sourceforge.phpeclipse.phpeditor.format"
+               label="%FormatAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.phpeditor.Format">
+         </action>
+         <action
+               label="%ShiftLeftAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.ui.actions.ShiftLeft">
+         </action>
+         <action
+               label="%ShiftRightAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.ui.actions.ShiftRight">
+         </action>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
                label="%UncommentAction.label"
@@ -265,6 +273,15 @@ Temporarily replaced until errors can be ironed out...
          </action>
       </actionSet>
    </extension>
+   <extension
+         point="org.eclipse.ui.actionSetPartAssociations">
+      <actionSetPartAssociation
+            targetID="net.sourceforge.phpeclipse.ui.CodingActionSet">
+         <part
+               id="net.sourceforge.phpeclipse.PHPUnitEditor">
+         </part>
+      </actionSetPartAssociation>
+   </extension>
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
@@ -272,26 +289,30 @@ Temporarily replaced until errors can be ironed out...
          point="org.eclipse.ui.actionDefinitions">
 <!-- edit -->
       <actionDefinition
-            name="%ActionDefinition.contentAssistProposals.name"
-            description="%ActionDefinition.contentAssistProposals.description"
             id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
       </actionDefinition>
 <!-- source -->
       <actionDefinition
-            name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
             id="net.sourceforge.phpeclipse.phpeditor.Comment">
       </actionDefinition>
       <actionDefinition
-            name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
             id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
       </actionDefinition>
-       <actionDefinition
-           name= "%ActionDefinition.format.name"
-           description= "%ActionDefinition.format.description"
-               id="net.sourceforge.phpeclipse.phpeditor.Format">
-         </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.phpeditor.Format">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.next.problem">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
+      </actionDefinition>
    </extension>
 <!--   <extension
          point="org.eclipse.ui.acceleratorSets">
@@ -312,75 +333,75 @@ Temporarily replaced until errors can be ironed out...
          point="org.eclipse.ui.editors">
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
-      </editor>  
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
+      </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="phtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
       <editor
             name="%phpEditorName"
+            default="true"
             icon="icons/obj16/xmledit.gif"
             extensions="xml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            id="net.sourceforge.phpeclipse.PHPEditor"
-            default="true">
+            id="net.sourceforge.phpeclipse.PHPUnitEditor">
       </editor>
    </extension>
    <extension
@@ -501,7 +522,6 @@ Temporarily replaced until errors can be ironed out...
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
@@ -509,7 +529,6 @@ Temporarily replaced until errors can be ironed out...
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
@@ -525,7 +544,6 @@ Temporarily replaced until errors can be ironed out...
                label="%Dummy.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
       </editorContribution>
@@ -537,7 +555,7 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
-  <!--    <page
+<!--    <page
             name="Editor2"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
@@ -555,18 +573,18 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
-      <page 
-        name="Formatter"
-               id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage"
-               class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
-               category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
-         </page>
-         <page 
-        name="Editor"
-               id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"
-               class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
-               category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
-         </page>
+      <page
+            name="Formatter"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
+      </page>
+      <page
+            name="Editor"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
+      </page>
       <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -656,8 +674,10 @@ Temporarily replaced until errors can be ironed out...
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
 <!-- edit -->
-                <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
-
+         <accelerator
+               key="Ctrl+Shift+P"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
+         </accelerator>
          <accelerator
                key="Ctrl+1"
                id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
@@ -671,16 +691,27 @@ Temporarily replaced until errors can be ironed out...
                key="Ctrl+\"
                id="net.sourceforge.phpeclipse.phpeditor.uncomment">
          </accelerator>
-         <accelerator 
-               key="Ctrl+Shift+F" 
+         <accelerator
+               key="Ctrl+Shift+F"
                id="net.sourceforge.phpeclipse.phpeditor.format">
          </accelerator>
+         <accelerator
+               key="Ctrl+O"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
+         </accelerator>
+         <accelerator
+               key="Ctrl+F3"
+               id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
+         </accelerator>
       </acceleratorSet>
       <acceleratorSet
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
 <!-- edit -->
-         <accelerator key="Ctrl+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" />
+         <accelerator
+               key="Ctrl+Shift+P"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
+         </accelerator>
          <accelerator
                key="Ctrl+Space"
                id="net.sourceforge.phpeclipse.ui.edit.text.php.content.assist.proposals">
@@ -694,17 +725,28 @@ Temporarily replaced until errors can be ironed out...
                key="Ctrl+\"
                id="net.sourceforge.phpeclipse.phpeditor.uncomment">
          </accelerator>
-         <accelerator 
-               key="Ctrl+Shift+F" 
+         <accelerator
+               key="Ctrl+Shift+F"
                id="net.sourceforge.phpeclipse.phpeditor.format">
          </accelerator>
+         <accelerator
+               key="Ctrl+F3"
+               id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
+         </accelerator>
+         <accelerator
+               key="Ctrl+O"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
+         </accelerator>
       </acceleratorSet>
       <acceleratorSet
             scopeId="org.eclipse.ui.textEditorScope"
             configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
 <!-- edit -->
-         <accelerator key="Command+Shift+P" id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket" platform="carbon" /> 
-               
+         <accelerator
+               platform="carbon"
+               key="Command+Shift+P"
+               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
+         </accelerator>
          <accelerator
                platform="carbon"
                key="Command+1"
index d0f9277..937c7e9 100644 (file)
@@ -27,7 +27,6 @@ import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.IPreferenceConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.PHPEditorEnvironment;
 import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
 import net.sourceforge.phpeclipse.preferences.ColorEditor;
 import net.sourceforge.phpeclipse.preferences.PHPPreferencesMessages;
@@ -549,7 +548,7 @@ public class PHPEditorPreferencePage extends PreferencePage implements IWorkbenc
 
     String content = loadPreviewContentFromFile("ColorSettingPreviewCode.txt"); //$NON-NLS-1$
     IDocument document = new Document(content);
-    PHPEditorEnvironment pe;
+  //  PHPEditorEnvironment pe;
     IDocumentPartitioner partitioner = fJavaTextTools.createDocumentPartitioner();
     partitioner.connect(document);
     document.setDocumentPartitioner(partitioner);
index ca44370..c250488 100644 (file)
@@ -16,7 +16,6 @@ import net.sourceforge.phpdt.internal.ui.text.template.TemplateLabelProvider;
 import net.sourceforge.phpdt.internal.ui.util.SWTUtil;
 import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.PHPEditorEnvironment;
 import net.sourceforge.phpeclipse.phpeditor.PHPSourceViewerConfiguration;
 
 import org.eclipse.core.runtime.CoreException;
@@ -96,7 +95,7 @@ public class TemplatePreferencePage
    * @see PreferencePage#createContents(Composite)
    */
   protected Control createContents(Composite ancestor) {
-    PHPEditorEnvironment.connect(this);
+ //   PHPEditorEnvironment.connect(this);
     Composite parent = new Composite(ancestor, SWT.NONE);
     GridLayout layout = new GridLayout();
     layout.numColumns = 2;
@@ -610,7 +609,7 @@ public class TemplatePreferencePage
     }
 
     PHPeclipsePlugin.getDefault().savePluginPreferences();
-    PHPEditorEnvironment.disconnect(this);
+ //   PHPEditorEnvironment.disconnect(this);
     return super.performOk();
   }
 
@@ -625,7 +624,7 @@ public class TemplatePreferencePage
       openReadErrorDialog(e);
     }
 
-    PHPEditorEnvironment.disconnect(this);
+   // PHPEditorEnvironment.disconnect(this);
     return super.performCancel();
   }
 
index b727794..4b5d76d 100644 (file)
@@ -243,11 +243,11 @@ public class JavaTextTools {
         * @since 2.0
         */
        public boolean affectsBehavior(PropertyChangeEvent event) {
-               return // fCodeScanner.affectsBehavior(event) ||
+               return fCodeScanner.affectsBehavior(event) ||
                                        fMultilineCommentScanner.affectsBehavior(event) ||
                                        fSinglelineCommentScanner.affectsBehavior(event) ||
-                                       fStringScanner.affectsBehavior(event); // ||
-//                                     fJavaDocScanner.affectsBehavior(event);
+                                       fStringScanner.affectsBehavior(event) ||
+                                       fJavaDocScanner.affectsBehavior(event);
        }
        
        /**
@@ -258,15 +258,15 @@ public class JavaTextTools {
         * @since 2.0
         */
        protected void adaptToPreferenceChange(PropertyChangeEvent event) {
-//             if (fCodeScanner.affectsBehavior(event))
-//                     fCodeScanner.adaptToPreferenceChange(event);
+               if (fCodeScanner.affectsBehavior(event))
+                       fCodeScanner.adaptToPreferenceChange(event);
                if (fMultilineCommentScanner.affectsBehavior(event))
                        fMultilineCommentScanner.adaptToPreferenceChange(event);
                if (fSinglelineCommentScanner.affectsBehavior(event))
                        fSinglelineCommentScanner.adaptToPreferenceChange(event);
                if (fStringScanner.affectsBehavior(event))
                        fStringScanner.adaptToPreferenceChange(event);
-//             if (fJavaDocScanner.affectsBehavior(event))
-//                     fJavaDocScanner.adaptToPreferenceChange(event);
+               if (fJavaDocScanner.affectsBehavior(event))
+                       fJavaDocScanner.adaptToPreferenceChange(event);
        }
 }
\ No newline at end of file
index dfd4408..e59e385 100644 (file)
@@ -20,6 +20,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
+
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -68,9 +71,7 @@ public class OverviewRuler implements IVerticalRulerInfo {
      * @see ITextListener#textChanged
      */
     public void textChanged(TextEvent e) {
-      if (fTextViewer != null
-        && e.getDocumentEvent() == null
-        && e.getViewerRedrawState()) {
+      if (fTextViewer != null && e.getDocumentEvent() == null && e.getViewerRedrawState()) {
         // handle only changes of visible document
         redraw();
       }
@@ -368,29 +369,23 @@ public class OverviewRuler implements IVerticalRulerInfo {
           Annotation a = (Annotation) e.next();
           Position p = fModel.getPosition(a);
 
-          if (p == null
-            || !p.overlapsWith(visible.getOffset(), visible.getLength()))
+          if (p == null || !p.overlapsWith(visible.getOffset(), visible.getLength()))
             continue;
 
           int problemOffset = Math.max(p.getOffset(), visible.getOffset());
-          int problemEnd =
-            Math.min(
-              p.getOffset() + p.getLength(),
-              visible.getOffset() + visible.getLength());
+          int problemEnd = Math.min(p.getOffset() + p.getLength(), visible.getOffset() + visible.getLength());
           int problemLength = problemEnd - problemOffset;
 
           try {
             if (PROBLEM_HEIGHT_SCALABLE) {
-              int numbersOfLines =
-                document.getNumberOfLines(problemOffset, problemLength);
+              int numbersOfLines = document.getNumberOfLines(problemOffset, problemLength);
               hh = (numbersOfLines * size.y) / maxLines;
               if (hh < PROBLEM_HEIGHT_MIN)
                 hh = PROBLEM_HEIGHT_MIN;
             }
             fProblemHeight = hh;
 
-            int startLine =
-              textWidget.getLineAtOffset(problemOffset - visible.getOffset());
+            int startLine = textWidget.getLineAtOffset(problemOffset - visible.getOffset());
             yy = Math.min((startLine * size.y) / maxLines, size.y - hh);
 
             if (fill != null) {
@@ -458,24 +453,20 @@ public class OverviewRuler implements IVerticalRulerInfo {
           if (p == null)
             continue;
 
-          IRegion widgetRegion =
-            extension.modelRange2WidgetRange(
-              new Region(p.getOffset(), p.getLength()));
+          IRegion widgetRegion = extension.modelRange2WidgetRange(new Region(p.getOffset(), p.getLength()));
           if (widgetRegion == null)
             continue;
 
           try {
             if (PROBLEM_HEIGHT_SCALABLE) {
-              int numbersOfLines =
-                document.getNumberOfLines(p.getOffset(), p.getLength());
+              int numbersOfLines = document.getNumberOfLines(p.getOffset(), p.getLength());
               hh = (numbersOfLines * size.y) / maxLines;
               if (hh < PROBLEM_HEIGHT_MIN)
                 hh = PROBLEM_HEIGHT_MIN;
             }
             fProblemHeight = hh;
 
-            int startLine =
-              textWidget.getLineAtOffset(widgetRegion.getOffset());
+            int startLine = textWidget.getLineAtOffset(widgetRegion.getOffset());
             yy = Math.min((startLine * size.y) / maxLines, size.y - hh);
 
             if (fill != null) {
@@ -556,8 +547,7 @@ public class OverviewRuler implements IVerticalRulerInfo {
     } else {
       try {
         IRegion visible = fTextViewer.getVisibleRegion();
-        int lineNumber =
-          fTextViewer.getDocument().getLineOfOffset(visible.getOffset());
+        int lineNumber = fTextViewer.getDocument().getLineOfOffset(visible.getOffset());
         lines[0] += lineNumber;
         lines[1] += lineNumber;
       } catch (BadLocationException x) {
@@ -704,9 +694,8 @@ public class OverviewRuler implements IVerticalRulerInfo {
   }
 
   private static Color getColor(RGB rgb) {
-    //         PHPTextTools textTools= PHPeclipsePlugin.getDefault().getPHPTextTools();
-    //         return textTools.getColorManager().getColor(rgb);
-    return PHPEditorEnvironment.getPHPColorProvider().getColor(rgb);
+    JavaTextTools textTools = PHPeclipsePlugin.getDefault().getJavaTextTools();
+    return textTools.getColorManager().getColor(rgb);
   }
 
   private Color getColor(AnnotationType annotationType, double scale) {
@@ -727,15 +716,11 @@ public class OverviewRuler implements IVerticalRulerInfo {
     return getColor(interpolate(baseRGB, background, scale));
   }
 
-  private Color getStrokeColor(
-    AnnotationType annotationType,
-    boolean temporary) {
+  private Color getStrokeColor(AnnotationType annotationType, boolean temporary) {
     return getColor(annotationType, temporary ? 0.5 : 0.2);
   }
 
-  private Color getFillColor(
-    AnnotationType annotationType,
-    boolean temporary) {
+  private Color getFillColor(AnnotationType annotationType, boolean temporary) {
     return getColor(annotationType, temporary ? 0.9 : 0.6);
   }
 
index fc5da20..e1e0261 100644 (file)
@@ -317,7 +317,7 @@ public class PHPEditor
    * disposal actions required by the php editor.
    */
   public void dispose() {
-    PHPEditorEnvironment.disconnect(this);
+ //   PHPEditorEnvironment.disconnect(this);
     if (fOutlinePage != null)
       fOutlinePage.setInput(null);
 
@@ -654,7 +654,7 @@ public class PHPEditor
    */
   protected void initializeEditor() {
     IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
-    PHPEditorEnvironment.connect(this);
+ //   PHPEditorEnvironment.connect(this);
 
     //    store.addPropertyChangeListener(new IPropertyChangeListener() {
     //      public void propertyChange(PropertyChangeEvent event) {
@@ -904,4 +904,12 @@ public class PHPEditor
     int styles) {
     return super.createSourceViewer(parent, ruler, styles);
   }
+  
+  /*
+   * @see AbstractTextEditor#affectsTextPresentation(PropertyChangeEvent)
+   */
+  protected boolean affectsTextPresentation(PropertyChangeEvent event) {
+    JavaTextTools textTools= PHPeclipsePlugin.getDefault().getJavaTextTools();
+    return textTools.affectsBehavior(event);
+  }
 }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPEditorEnvironment.java
deleted file mode 100644 (file)
index 5243cfa..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-package net.sourceforge.phpeclipse.phpeditor;
-
-/**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
-
-Contributors:
-    IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
-**********************************************************************/
-
-import net.sourceforge.phpdt.internal.ui.text.JavaColorManager;
-import net.sourceforge.phpdt.internal.ui.text.phpdoc.PHPDocCodeScanner;
-import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.php.HTMLCodeScanner;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPCodeScanner;
-import net.sourceforge.phpeclipse.phpeditor.util.PHPColorProvider;
-
-/** The PHPEditorEnvironment maintains singletons used by the php editor
- */
-public class PHPEditorEnvironment {
- // PHPColorProvider
-  private static JavaColorManager fgColorProvider;
-  private static PHPCodeScanner fgPHPCodeScanner;
-  private static HTMLCodeScanner fgHTMLCodeScanner;
-  private static PHPDocCodeScanner fgDocScanner;
-
-  private static int fgRefCount = 0;
-
-  /**
-   * A connection has occured - initialize the receiver if it is the first activation.
-   */
-  public static void connect(Object client) {
-    if (++fgRefCount == 1) {
-      fgColorProvider = new JavaColorManager(); // new PHPColorProvider();
-      fgPHPCodeScanner = new PHPCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore() );
-      fgHTMLCodeScanner = new HTMLCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore());
-      fgDocScanner = new PHPDocCodeScanner(fgColorProvider, PHPeclipsePlugin.getDefault().getPreferenceStore() );
-    }
-  }
-
-  /**
-   * A disconnection has occured - clear the receiver if it is the last deactivation.
-   */
-  public static void disconnect(Object client) {
-    if (--fgRefCount == 0) {
-      fgPHPCodeScanner = null;
-      fgHTMLCodeScanner = null;
-      fgDocScanner = null;
-      fgColorProvider.dispose();
-      fgColorProvider = null;
-    }
-  }
-
-  /**
-   * Returns the singleton scanner.
-   */
-  public static PHPCodeScanner getPHPCodeScanner() {
-    return fgPHPCodeScanner;
-  }
-
-  /**
-   * Returns the singleton scanner.
-   */
-  public static HTMLCodeScanner getHTMLCodeScanner() {
-    return fgHTMLCodeScanner;
-  }
-
-  /**
-   * Returns the singleton PHPDoc scanner.
-   */
-  public static PHPDocCodeScanner getPHPDocCodeScanner() {
-    return fgDocScanner;
-  }
-
-  /**
-   * Returns the singleton color provider.
-   */
-  public static JavaColorManager getPHPColorProvider() {
-    return fgColorProvider;
-  }
-
-}
index eaaf9d5..a39d5bb 100644 (file)
@@ -384,7 +384,7 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration
     public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer)
     {
         //  PHPColorProvider provider = PHPEditorEnvironment.getPHPColorProvider();
-        JavaColorManager provider = PHPEditorEnvironment.getPHPColorProvider();
+    //    JavaColorManager provider = PHPEditorEnvironment.getPHPColorProvider();
         PresentationReconciler reconciler = new PresentationReconciler();
 
         DefaultDamagerRepairer dr =
index 01a0a96..efd93dd 100644 (file)
@@ -12,6 +12,7 @@ import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI.ExitFlags;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
+import net.sourceforge.phpdt.ui.text.JavaTextTools;
 import net.sourceforge.phpeclipse.PHPCore;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
@@ -1138,9 +1139,8 @@ public class PHPUnitEditor extends PHPEditor {
   }
 
   private Color getColor(RGB rgb) {
-    //    JavaTextTools textTools = JavaPlugin.getDefault().getJavaTextTools();
-    //    return textTools.getColorManager().getColor(rgb);
-    return PHPEditorEnvironment.getPHPColorProvider().getColor(rgb);
+    JavaTextTools textTools = PHPeclipsePlugin.getDefault().getJavaTextTools();
+    return textTools.getColorManager().getColor(rgb);
   }
 
   private Color getColor(AnnotationType annotationType) {