[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[Dltk-dev] FW: [dltk-commits] apanchenkorg.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/uiIDLTKUILanguageToolkit.java AbstractDLTKUILanguageToolkit.java
|
Hi,
The following commit causes a small API change (getUIPLugin). Can you
publish a new integration build?
Thank you for your time,
- Roy
-----Original Message-----
From: dltk-commits-bounces@xxxxxxxxxxx
[mailto:dltk-commits-bounces@xxxxxxxxxxx] On Behalf Of Eclipse CVS Genie
Sent: Sunday, April 12, 2009 6:57 PM
To: dltk-commits@xxxxxxxxxxx
Subject: [dltk-commits]
apanchenkorg.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/src/org/eclip
se/dltk/uiIDLTKUILanguageToolkit.java AbstractDLTKUILanguageToolkit.java
Update of
/cvsroot/technology/org.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/sr
c/org/eclipse/dltk/ui
In directory node4:/tmp/cvs-serv178836/src/org/eclipse/dltk/ui
Modified Files:
IDLTKUILanguageToolkit.java AbstractDLTKUILanguageToolkit.java
Log Message:
IPreferenceStore getCombinedPreferenceStore() method added
Index: IDLTKUILanguageToolkit.java
===================================================================
RCS file:
/cvsroot/technology/org.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/sr
c/org/eclipse/dltk/ui/IDLTKUILanguageToolkit.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** IDLTKUILanguageToolkit.java 28 Feb 2008 07:17:43 -0000 1.13
--- IDLTKUILanguageToolkit.java 12 Apr 2009 15:56:44 -0000 1.14
***************
*** 21,29 ****
ScriptUILabelProvider createScriptUILabelProvider();
!
IDLTKLanguageToolkit getCoreToolkit();
IPreferenceStore getPreferenceStore();
String getPartitioningId();
--- 21,31 ----
ScriptUILabelProvider createScriptUILabelProvider();
!
IDLTKLanguageToolkit getCoreToolkit();
IPreferenceStore getPreferenceStore();
+ IPreferenceStore getCombinedPreferenceStore();
+
String getPartitioningId();
***************
*** 31,46 ****
String getInterpreterContainerId();
!
ScriptTextTools getTextTools();
!
ScriptSourceViewerConfiguration
createSourceViewerConfiguration();
!
// Per module script explorer show children way.
boolean getProvideMembers(ISourceModule element);
!
String getInterpreterPreferencePage();
!
String getDebugPreferencePage();
!
String[] getEditorPreferencePages();
}
--- 33,48 ----
String getInterpreterContainerId();
!
ScriptTextTools getTextTools();
!
ScriptSourceViewerConfiguration
createSourceViewerConfiguration();
!
// Per module script explorer show children way.
boolean getProvideMembers(ISourceModule element);
!
String getInterpreterPreferencePage();
!
String getDebugPreferencePage();
!
String[] getEditorPreferencePages();
}
Index: AbstractDLTKUILanguageToolkit.java
===================================================================
RCS file:
/cvsroot/technology/org.eclipse.dltk/core/plugins/org.eclipse.dltk.ui/sr
c/org/eclipse/dltk/ui/AbstractDLTKUILanguageToolkit.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractDLTKUILanguageToolkit.java 20 Jun 2008 03:56:15 -0000
1.5
--- AbstractDLTKUILanguageToolkit.java 12 Apr 2009 15:56:44 -0000
1.6
***************
*** 5,8 ****
--- 5,11 ----
import org.eclipse.core.runtime.content.IContentType;
import org.eclipse.core.runtime.content.IContentTypeManager;
+ import org.eclipse.core.runtime.preferences.InstanceScope;
+ import org.eclipse.dltk.compiler.CharOperation;
+ import org.eclipse.dltk.core.DLTKCore;
import org.eclipse.dltk.core.IDLTKLanguageToolkit;
import org.eclipse.dltk.core.ISourceModule;
***************
*** 17,21 ****
import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.PlatformUI;
! import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.eclipse.ui.texteditor.ITextEditor;
--- 20,25 ----
import org.eclipse.ui.IEditorRegistry;
import org.eclipse.ui.PlatformUI;
! import org.eclipse.ui.editors.text.EditorsUI;
! import org.eclipse.ui.texteditor.ChainedPreferenceStore;
import org.eclipse.ui.texteditor.ITextEditor;
***************
*** 36,41 ****
}
! public IPreferenceStore getPreferenceStore() {
! return getUIPLugin().getPreferenceStore();
}
--- 40,67 ----
}
! /**
! * The combined preference store.
! */
! private IPreferenceStore fCombinedPreferenceStore;
!
! /**
! * Returns a combined preference store, this store is read-only.
! *
! * @return the combined preference store
! */
! public IPreferenceStore getCombinedPreferenceStore() {
! if (fCombinedPreferenceStore == null) {
! final InstanceScope instanceScope = new
InstanceScope();
! fCombinedPreferenceStore = new
ChainedPreferenceStore(
! new IPreferenceStore[] {
!
getPreferenceStore(),
! new
EclipsePreferencesAdapter(instanceScope,
!
getCoreToolkit().getPreferenceQualifier()),
!
DLTKUIPlugin.getDefault().getPreferenceStore(),
! new
EclipsePreferencesAdapter(instanceScope,
!
DLTKCore.PLUGIN_ID),
!
EditorsUI.getPreferenceStore() });
! }
! return fCombinedPreferenceStore;
}
***************
*** 48,52 ****
}
! protected abstract AbstractUIPlugin getUIPLugin();
public String getEditorId(Object inputElement) {
--- 74,83 ----
}
! /**
! * @deprecated
! */
! protected final Object getUIPLugin() {
! return null;
! }
public String getEditorId(Object inputElement) {
***************
*** 69,79 ****
if (inputElement instanceof ISourceModule) {
fileName = ((ISourceModule)
inputElement).getPath().toString();
! }
! else if( inputElement instanceof IResource ) {
! fileName = ((IResource)
inputElement).getFullPath().toString();
}
! IEditorDescriptor editor =
editorRegistry.getDefaultEditor(fileName, contentType);
! if( editor != null ) {
return editor.getId();
}
--- 100,110 ----
if (inputElement instanceof ISourceModule) {
fileName = ((ISourceModule)
inputElement).getPath().toString();
! } else if (inputElement instanceof IResource) {
! fileName = ((IResource)
inputElement).getFullPath().toString();
}
! IEditorDescriptor editor =
editorRegistry.getDefaultEditor(fileName,
! contentType);
! if (editor != null) {
return editor.getId();
}
***************
*** 94,98 ****
public ScriptTextTools getTextTools() {
! return new ScriptTextTools(getPartitioningId(), new
String[0], true) {
public ScriptSourceViewerConfiguration
createSourceViewerConfiguraton(
IPreferenceStore
preferenceStore, ITextEditor editor,
--- 125,130 ----
public ScriptTextTools getTextTools() {
! return new ScriptTextTools(getPartitioningId(),
! CharOperation.NO_STRINGS, true) {
public ScriptSourceViewerConfiguration
createSourceViewerConfiguraton(
IPreferenceStore
preferenceStore, ITextEditor editor,
_______________________________________________
dltk-commits mailing list
dltk-commits@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/dltk-commits
