Fix #61: Texlipse preferences crash in Eclipse Photon Release (#62)

Task-Url: #61
eclipse-texlipse · Jul 24, 2018 · e218dee · e218dee
1 parent 98fe7b7
commit e218dee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git a/default.target b/default.target
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
-<target name="Eclipse TeXlipse Target Platform" sequenceNumber="1499707086">
+<target name="Eclipse TeXlipse Target Platform" sequenceNumber="1532417233">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.sdk.feature.group" version="4.6.3.v20170301-0400"/>
-      <repository location="http://download.eclipse.org/releases/neon/"/>
+      <unit id="org.eclipse.sdk.feature.group" version="4.8.0.v20180611-0826"/>
+      <repository location="http://download.eclipse.org/releases/photon/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+      <unit id="org.eclipse.license.feature.group" version="2.0.1.v20180423-1114"/>
       <repository location="http://download.eclipse.org/cbi/updates/license"/>
     </location>
   </locations>

diff --git a/default.tpd b/default.tpd
@@ -1,6 +1,6 @@
 target "Eclipse TeXlipse Target Platform" with source requirements
 
-location "http://download.eclipse.org/releases/neon/" {
+location "http://download.eclipse.org/releases/photon/" {
     org.eclipse.sdk.feature.group
 }
 location "http://download.eclipse.org/cbi/updates/license" {

diff --git a/...clipse.texlipse/source/org/eclipse/texlipse/properties/BuilderSettingsPreferencePage.java b/...clipse.texlipse/source/org/eclipse/texlipse/properties/BuilderSettingsPreferencePage.java
@@ -31,8 +31,7 @@
 import org.eclipse.texlipse.builder.ProgramRunner;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-
+import org.eclipse.ui.PlatformUI;
 
 /**
  * Builder preferences.
@@ -135,7 +134,7 @@ private void addTexInstallDir(Composite contents) {
         texDirField = new Text(parent, SWT.SINGLE | SWT.BORDER);
         texDirField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
         texDirField.setText("");
-        WorkbenchHelp.setHelp(texDirField, TexlipseHelpIds.BUILDER_TEX_DIR);
+        PlatformUI.getWorkbench().getHelpSystem().setHelp(texDirField, TexlipseHelpIds.BUILDER_TEX_DIR);
 
         Button button = new Button(parent, SWT.PUSH);
         button.setText(JFaceResources.getString("openBrowse"));
@@ -182,7 +181,7 @@ public void widgetSelected(SelectionEvent event) {
                 int index = builderList.getSelectionIndex();
                 editButton.setEnabled(index >= 0);
             }});
-        WorkbenchHelp.setHelp(builderList, TexlipseHelpIds.BUILDER_LIST);
+        PlatformUI.getWorkbench().getHelpSystem().setHelp(builderList, TexlipseHelpIds.BUILDER_LIST);
 
         Composite rightPart = new Composite(contents, SWT.NULL);
         rightPart.setLayout(new GridLayout());

diff --git a/...eclipse.texlipse/source/org/eclipse/texlipse/properties/ViewerSettingsPreferencePage.java b/...eclipse.texlipse/source/org/eclipse/texlipse/properties/ViewerSettingsPreferencePage.java
@@ -17,8 +17,7 @@
 import org.eclipse.texlipse.viewer.util.FileLocationServer;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.help.WorkbenchHelp;
-
+import org.eclipse.ui.PlatformUI;
 
 /**
  * Viewer preferences.
@@ -49,12 +48,7 @@ protected void createFieldEditors() {
         TexlipsePreferencePage.addSpacer(2, getFieldEditorParent());
         ViewerListFieldEditor vfe = new ViewerListFieldEditor(TexlipsePlugin.getResourceString("preferenceViewerConfigsLabel"), getFieldEditorParent());
         addField(vfe);
-        WorkbenchHelp.setHelp(vfe.getListControl(getFieldEditorParent()), TexlipseHelpIds.VIEWER_LIST);
-
-        // Depricated. Eclipse has it's own mechanism for auto rebuild.
-        //TexlipsePreferencePage.addSpacer(2, getFieldEditorParent());
-        //TexlipsePreferencePage.addSeparator(2, getFieldEditorParent());
-        //addField(new BooleanFieldEditor(TexlipseProperties.BUILD_BEFORE_VIEW, TexlipsePlugin.getResourceString("preferenceViewerBuildLabel"), getFieldEditorParent()));
+        PlatformUI.getWorkbench().getHelpSystem().setHelp(vfe.getListControl(getFieldEditorParent()), TexlipseHelpIds.VIEWER_LIST);
 
         TexlipsePreferencePage.addSpacer(2, getFieldEditorParent());
         TexlipsePreferencePage.addSeparator(2, getFieldEditorParent());
@@ -71,7 +65,7 @@ protected void createFieldEditors() {
 
         addField(new BooleanFieldEditor(TexlipseProperties.BUILDER_RETURN_FOCUS, TexlipsePlugin.getResourceString("preferenceViewerReturnFocusLabel"), getFieldEditorParent()));
 
-        WorkbenchHelp.setHelp(port.getTextControl(getFieldEditorParent()), TexlipseHelpIds.VIEWER_PORT);
+        PlatformUI.getWorkbench().getHelpSystem().setHelp(port.getTextControl(getFieldEditorParent()), TexlipseHelpIds.VIEWER_PORT);
     }
 
     /**