LANG: Rename packages to prevent conflict with CDT/JDT.

Minor EclipsePreferencesAdapter change.

plugin_ide.ui/src-lang/org/eclipse/cdt/internal/ui/editor/EclipsePreferencesAdapter.java → plugin_ide.core/src-lang/melnorme/lang/ide/core/utils/prefs/EclipsePreferencesAdapter.java

@@ -8,17 +8,17 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.ui.editor;
+package melnorme.lang.ide.core.utils.prefs;
 
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.widgets.Display;
 import org.osgi.service.prefs.BackingStoreException;
 
+//BM: changed PreferenceChangeListener to not use Display
 /**
  * Adapts an options {@link IEclipsePreferences} to {@link org.eclipse.jface.preference.IPreferenceStore}.
  * <p>
@@ -40,16 +40,7 @@ private class PreferenceChangeListener implements IEclipsePreferences.IPreferenc
 		 */
 		@Override
 		public void preferenceChange(final IEclipsePreferences.PreferenceChangeEvent event) {
-			if (Display.getCurrent() == null) {
-				Display.getDefault().asyncExec(new Runnable() {
-					@Override
-					public void run() {
-						firePropertyChangeEvent(event.getKey(), event.getOldValue(), event.getNewValue());
-					}
-				});
-			} else {
-				firePropertyChangeEvent(event.getKey(), event.getOldValue(), event.getNewValue());
-			}
+			firePropertyChangeEvent(event.getKey(), event.getOldValue(), event.getNewValue());
 		}
 	}
 

plugin_ide.ui/src-lang/org/eclipse/cdt/internal/ui/text/TokenStore.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/internal/ui/text/TokenStore.java

@@ -10,7 +10,7 @@
  *     QNX Software System
  *     Andrew Ferguson (Symbian) - refactored to TokenStore (previously part of AbstractCScanner)
  *******************************************************************************/
-package org.eclipse.cdt.internal.ui.text;
+package _org.eclipse.cdt.internal.ui.text;
 
 import static melnorme.utilbox.core.Assert.AssertNamespace.assertNotNull;
 
@@ -28,9 +28,10 @@
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.cdt.ui.PreferenceConstants;
-import org.eclipse.cdt.ui.text.IColorManager;
-import org.eclipse.cdt.ui.text.ITokenStore;
+
+import _org.eclipse.cdt.ui.PreferenceConstants;
+import _org.eclipse.cdt.ui.text.IColorManager;
+import _org.eclipse.cdt.ui.text.ITokenStore;
 
 
 /**

plugin_ide.ui/src-lang/org/eclipse/cdt/internal/ui/text/util/CColorManager.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/internal/ui/text/util/CColorManager.java

@@ -10,7 +10,7 @@
  *     QNX Software System
  *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
-package org.eclipse.cdt.internal.ui.text.util;
+package _org.eclipse.cdt.internal.ui.text.util;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -20,7 +20,7 @@
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
 
-import org.eclipse.cdt.ui.text.IColorManager;
+import _org.eclipse.cdt.ui.text.IColorManager;
 
 
 /**

plugin_ide.ui/src-lang/org/eclipse/cdt/ui/IPropertyChangeParticipant.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/ui/IPropertyChangeParticipant.java

@@ -8,7 +8,7 @@
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial Implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui;
+package _org.eclipse.cdt.ui;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 

plugin_ide.ui/src-lang/org/eclipse/cdt/ui/PreferenceConstants.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/ui/PreferenceConstants.java

@@ -1,4 +1,4 @@
-package org.eclipse.cdt.ui;
+package _org.eclipse.cdt.ui;
 
 import melnorme.lang.ide.ui.text.coloring.TextColoringConstants;
 

plugin_ide.ui/src-lang/org/eclipse/cdt/ui/text/IColorManager.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/ui/text/IColorManager.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     QNX Software System
  *******************************************************************************/
-package org.eclipse.cdt.ui.text;
+package _org.eclipse.cdt.ui.text;
 
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
@@ -30,7 +30,7 @@
  * 
  * @since 5.1
  */
-public interface IColorManager extends org.eclipse.jdt.ui.text.IColorManagerExtension {
+public interface IColorManager extends _org.eclipse.jdt.ui.text.IColorManagerExtension {
 
 	/**
 	 * Returns a color object for the given key. The color objects 

plugin_ide.ui/src-lang/org/eclipse/cdt/ui/text/ITokenStore.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/ui/text/ITokenStore.java

@@ -8,13 +8,13 @@
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.text;
+package _org.eclipse.cdt.ui.text;
 
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.rules.IToken;
 
-import org.eclipse.cdt.ui.IPropertyChangeParticipant;
-import org.eclipse.cdt.ui.PreferenceConstants;
+import _org.eclipse.cdt.ui.IPropertyChangeParticipant;
+import _org.eclipse.cdt.ui.PreferenceConstants;
 
 /**
  * An ITokenStore manages a set of tokens for a specified set of color property identifiers. Responsibilities include

plugin_ide.ui/src-lang/org/eclipse/cdt/ui/text/ITokenStoreFactory.java → plugin_ide.ui/src-lang/_org/eclipse/cdt/ui/text/ITokenStoreFactory.java

@@ -8,7 +8,7 @@
  * Contributors:
  * Andrew Ferguson (Symbian) - Initial implementation
  *******************************************************************************/
-package org.eclipse.cdt.ui.text;
+package _org.eclipse.cdt.ui.text;
 
 /**
  * A means of obtaining ITokenStore objects.

plugin_ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java

@@ -16,7 +16,6 @@
 import melnorme.lang.ide.ui.LangUIPlugin;
 import melnorme.lang.ide.ui.editor.LangSourceViewer;
 
-import org.eclipse.cdt.ui.text.IColorManager;
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
@@ -52,6 +51,8 @@
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
+import _org.eclipse.cdt.ui.text.IColorManager;
+
 /**
  * Source viewer based implementation of <code>IInformationControl</code>.
  * Displays information in a source viewer.

plugin_ide.ui/src-lang/org/eclipse/jdt/ui/text/IColorManagerExtension.java → plugin_ide.ui/src-lang/_org/eclipse/jdt/ui/text/IColorManagerExtension.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-package org.eclipse.jdt.ui.text;
+package _org.eclipse.jdt.ui.text;
 
 import org.eclipse.swt.graphics.RGB;
 

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangUIPlugin.java

@@ -20,7 +20,6 @@
 import melnorme.util.swt.jface.resources.ImageDescriptorRegistry;
 import melnorme.utilbox.misc.MiscUtil;
 
-import org.eclipse.cdt.internal.ui.text.util.CColorManager;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -39,6 +38,7 @@
 import org.osgi.framework.BundleContext;
 import org.osgi.service.prefs.BackingStoreException;
 
+import _org.eclipse.cdt.internal.ui.text.util.CColorManager;
 import _org.eclipse.jdt.internal.ui.viewsupport.ProblemMarkerManager;
 
 public abstract class LangUIPlugin extends AbstractUIPlugin {
@@ -199,7 +199,7 @@ public IPreferenceStore getCorePreferenceStore() {
 
 	protected CColorManager fColorManager = new CColorManager(true);
 
-	public org.eclipse.cdt.ui.text.IColorManager getColorManager() {
+	public _org.eclipse.cdt.ui.text.IColorManager getColorManager() {
 		return fColorManager;
 	}
 

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/AbstractLangEditor.java

@@ -18,6 +18,7 @@
 import java.util.List;
 
 import melnorme.lang.ide.core.TextSettings_Actual;
+import melnorme.lang.ide.core.utils.prefs.EclipsePreferencesAdapter;
 import melnorme.lang.ide.ui.EditorSettings_Actual;
 import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
 import melnorme.lang.ide.ui.LangImages;
@@ -29,7 +30,6 @@
 import melnorme.lang.ide.ui.utils.PluginImagesHelper.ImageHandle;
 import melnorme.utilbox.misc.ArrayUtil;
 
-import org.eclipse.cdt.internal.ui.editor.EclipsePreferencesAdapter;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.runtime.CoreException;

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/templates/LangTemplatePreferencePage.java

@@ -17,7 +17,6 @@
 import melnorme.lang.ide.ui.LangUIPlugin;
 import melnorme.lang.ide.ui.editor.LangSourceViewer;
 
-import org.eclipse.cdt.ui.text.IColorManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.Document;
 import org.eclipse.jface.text.IDocument;
@@ -35,6 +34,8 @@
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
 
+import _org.eclipse.cdt.ui.text.IColorManager;
+
 public abstract class LangTemplatePreferencePage extends TemplatePreferencePage implements IWorkbenchPreferencePage {
 
 	public LangTemplatePreferencePage() {

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/AbstractLangSourceViewerConfiguration.java

@@ -35,7 +35,6 @@
 import melnorme.lang.ide.ui.text.util.AutoEditUtils;
 import melnorme.utilbox.collections.Indexable;
 
-import org.eclipse.cdt.ui.text.IColorManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.AbstractInformationControlManager;
 import org.eclipse.jface.text.DefaultInformationControl;
@@ -61,6 +60,7 @@
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
 import org.eclipse.ui.texteditor.ITextEditor;
 
+import _org.eclipse.cdt.ui.text.IColorManager;
 import _org.eclipse.jdt.internal.ui.text.CompositeReconcilingStrategy;
 import _org.eclipse.jdt.internal.ui.text.HTMLAnnotationHover;
 

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/SimpleLangSourceViewerConfiguration.java

@@ -28,10 +28,6 @@
 import melnorme.lang.ide.ui.text.coloring.AbstractLangScanner;
 import melnorme.lang.ide.ui.text.coloring.SingleTokenScanner;
 
-import org.eclipse.cdt.internal.ui.text.TokenStore;
-import org.eclipse.cdt.ui.text.IColorManager;
-import org.eclipse.cdt.ui.text.ITokenStore;
-import org.eclipse.cdt.ui.text.ITokenStoreFactory;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.DefaultInformationControl;
@@ -54,6 +50,11 @@
 import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
 
+import _org.eclipse.cdt.internal.ui.text.TokenStore;
+import _org.eclipse.cdt.ui.text.IColorManager;
+import _org.eclipse.cdt.ui.text.ITokenStore;
+import _org.eclipse.cdt.ui.text.ITokenStoreFactory;
+
 /**
  * Abstract SourceViewConfiguration
  * Has code to help manage the configured scanners, and let respond to preference changes.

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/coloring/AbstractLangScanner.java

@@ -23,8 +23,9 @@
 import org.eclipse.jface.text.rules.IWhitespaceDetector;
 import org.eclipse.jface.text.rules.IWordDetector;
 import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.cdt.ui.IPropertyChangeParticipant;
-import org.eclipse.cdt.ui.text.ITokenStore;
+
+import _org.eclipse.cdt.ui.IPropertyChangeParticipant;
+import _org.eclipse.cdt.ui.text.ITokenStore;
 
 /**
  * Convenience implementation for {@link ILangTokenScanner}.

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/coloring/AbstractSourceColoringConfigurationBlock.java

@@ -40,7 +40,6 @@
 import melnorme.utilbox.tree.SimpleTreeElement;
 import melnorme.utilbox.tree.TreeVisitor;
 
-import org.eclipse.cdt.internal.ui.text.util.CColorManager;
 import org.eclipse.jface.layout.GridLayoutFactory;
 import org.eclipse.jface.layout.PixelConverter;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -57,6 +56,8 @@
 import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.texteditor.ChainedPreferenceStore;
 
+import _org.eclipse.cdt.internal.ui.text.util.CColorManager;
+
 /**
  * A configuration component for syntax (and possibly semantic) source highlighting options.
  */

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/coloring/ILangTokenScanner.java

@@ -11,7 +11,8 @@
 package melnorme.lang.ide.ui.text.coloring;
 
 import org.eclipse.jface.text.rules.ITokenScanner;
-import org.eclipse.cdt.ui.IPropertyChangeParticipant;
+
+import _org.eclipse.cdt.ui.IPropertyChangeParticipant;
 
 /**
  * Interface for CDT Scanners. Scanners used in CDT must additionally be

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/coloring/SingleTokenScanner.java

@@ -12,7 +12,7 @@
  *******************************************************************************/
 package melnorme.lang.ide.ui.text.coloring;
 
-import org.eclipse.cdt.ui.text.ITokenStoreFactory;
+import _org.eclipse.cdt.ui.text.ITokenStoreFactory;
 
 /**
  * 

plugin_ide.ui/src-lang/melnorme/lang/ide/ui/text/completion/ContentAssistPreferenceHandler.java

@@ -17,7 +17,6 @@
 import melnorme.lang.ide.ui.editor.ProjectionViewerExt;
 import melnorme.lang.ide.ui.editor.SourceViewerConfigurer;
 
-import org.eclipse.cdt.ui.text.IColorManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.IDocument;
@@ -27,6 +26,8 @@
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 
+import _org.eclipse.cdt.ui.text.IColorManager;
+
 
 public class ContentAssistPreferenceHandler extends SourceViewerConfigurer 
 	implements ContentAssistConstants, ContentAssistPreferences {

plugin_ide.ui/src/melnorme/lang/ide/ui/EditorSettings_Actual.java

@@ -15,14 +15,14 @@
 import melnorme.lang.ide.ui.editor.LangEditorContextMenuContributor;
 import melnorme.lang.ide.ui.editor.text.EditorPrefConstants_Common;
 
-import org.eclipse.cdt.ui.text.IColorManager;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.contentassist.ContentAssistant;
 import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.jface.text.source.SourceViewerConfiguration;
 import org.eclipse.ui.services.IServiceLocator;
 
+import _org.eclipse.cdt.ui.text.IColorManager;
 import LANG_PROJECT_ID.ide.ui.editor.LANGUAGE_Editor;
 import LANG_PROJECT_ID.ide.ui.editor.LANGUAGE_SimpleSourceViewerConfiguration;
 import LANG_PROJECT_ID.ide.ui.text.LANGUAGE_ColorPreferences;